Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-22 05:14:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/pqi/pqihash.h
View file

@ -26,7 +26,7 @@
#ifndef PQI_HASH_
#define PQI_HASH_
#include <util/rsid.h>
#include <retroshare/rsids.h>
#include <openssl/sha.h>
#include <string>
#include <iomanip>
@ -63,7 +63,7 @@ void addData(const void *data, uint32_t len)
}
}
void Complete(std::string &hash)
void Complete(RsFileHash &hash)
{
if (!doHash)
{
@ -74,8 +74,7 @@ void Complete(std::string &hash)
SHA1_Final(sha_hash, sha_ctx);
endHash.clear();
endHash = hash = Sha1CheckSum(sha_hash).toStdString() ;
endHash = hash = Sha1CheckSum(sha_hash);
// for(int i = 0; i < SHA_DIGEST_LENGTH; i++)
// {
@ -90,7 +89,7 @@ void Complete(std::string &hash)
private:
bool doHash;
std::string endHash;
RsFileHash endHash;
uint8_t *sha_hash;
SHA_CTX *sha_ctx;
};