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

fixed small error in pgphandler, potentially adding empty certs in database

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-01-15 20:15:48 +00:00
parent f7cbacdcb1
commit ba927adf1c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/pgp/pgphandler.cc
View File

@ -913,6 +913,9 @@ bool PGPHandler::importGPGKeyPair(const std::string& filename,PGPIdType& importe
// //
ops_keyring_free(tmp_keyring) ; ops_keyring_free(tmp_keyring) ;
// write public key to disk
syncDatabase();
return true ; return true ;
} }
@ -1422,6 +1425,14 @@ void PGPHandler::updateOwnSignatureFlag(const PGPIdType& own_id)
RsStackMutex mtx(pgphandlerMtx) ; // lock access to PGP memory structures. RsStackMutex mtx(pgphandlerMtx) ; // lock access to PGP memory structures.
std::string own_id_str = own_id.toStdString(); std::string own_id_str = own_id.toStdString();
if(_public_keyring_map.find(own_id_str)==_public_keyring_map.end())
{
std::cerr << __func__ << ": key with id=" << own_id_str << " not in keyring." << std::endl;
// return now, because the following operation would add an entry to _public_keyring_map
return;
}
PGPCertificateInfo& own_cert(_public_keyring_map[ own_id_str ]) ; PGPCertificateInfo& own_cert(_public_keyring_map[ own_id_str ]) ;
for(std::map<std::string,PGPCertificateInfo>::iterator it=_public_keyring_map.begin();it!=_public_keyring_map.end();++it) for(std::map<std::string,PGPCertificateInfo>::iterator it=_public_keyring_map.begin();it!=_public_keyring_map.end();++it)