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

- Fixed compile on Windows. Added new type "rs_lock_handle_t" for file locking functions.

Browse source 
- Added missing check of file pointer in PGPHandler::decryptTextFromFile
- Added missing fclose of the ssl passphrase file in RsLoginHandler::getSSLPasswdFromGPGFile. Is this still needed, because PGPHandler::decryptTextFromFile does the same check?
- Fixed possible memory leak in ops_decrypt_memory.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5222 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-06-14 22:53:02 +00:00
parent dba66cdd7a
commit f50edd228f
6 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/pgp/pgphandler.cc
View file

@ -509,6 +509,11 @@ bool PGPHandler::decryptTextFromFile(const PGPIdType& key_id,std::string& text,c
FILE *f = fopen(inputfile.c_str(),"rb") ;
if (f == NULL)
{
return false;
}
char c ;
while( (c = getc(f))!= EOF)
buf += c;
@ -522,6 +527,7 @@ bool PGPHandler::decryptTextFromFile(const PGPIdType& key_id,std::string& text,c
ops_boolean_t res = ops_decrypt_memory((const unsigned char *)buf.c_str(),buf.length(),&out_buf,&out_length,_secring,ops_true,cb_get_passphrase) ;
text = std::string((char *)out_buf,out_length) ;
free (out_buf);
return (bool)res ;
}