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

fixed parsing error handling in pgp key parsing

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-08-14 19:49:50 +00:00
parent b714d68523
commit 5d289b520b
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -607,6 +607,12 @@ bool PGPHandler::getGPGDetailsFromBinaryBlock(const unsigned char *mem_block,siz
free(mem) ; free(mem) ;
//error_string.clear() ; //error_string.clear() ;
if(tmp_keyring->nkeys != 1)
{
std::cerr << "No or incomplete/invalid key in supplied pgp block." << std::endl;
return false ;
}
key_id = PGPIdType(tmp_keyring->keys[0].key_id).toStdString() ; key_id = PGPIdType(tmp_keyring->keys[0].key_id).toStdString() ;
name = std::string((char *)tmp_keyring->keys[0].uids[0].user_id) ; name = std::string((char *)tmp_keyring->keys[0].uids[0].user_id) ;
@ -823,7 +829,10 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,PGPIdType
else else
std::cerr << "Key already in public keyring." << std::endl; std::cerr << "Key already in public keyring." << std::endl;
id = PGPIdType(tmp_keyring->keys[0].key_id) ; if(tmp_keyring->nkeys > 0)
id = PGPIdType(tmp_keyring->keys[0].key_id) ;
else
return false ;
ops_keyring_free(tmp_keyring) ; ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ; free(tmp_keyring) ;