Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed self-signature checking for imported keys, previously causing imported certificates with signatures to be rejected

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8053 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-03-19 21:02:14 +00:00
parent 55988a5796
commit 90427eb08b
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.txt
View File

@ -35,7 +35,7 @@ E [ ] some widgets in the GUI do not follow the system style => GUI looks
E [ ] recommended friends messages have embedded buttons of wrong size. Use RSLinks instead!
E [ ] "Friends details" should show both PGP key and RS certs in different tabs with appropriate names.
It should specify clearly which one should be used to make friends.
E [ ] addFriend does not work when the cert contains signatures.
E [X] addFriend does not work when the cert contains signatures.
E [ ] PGP signatures are not transmited by discovery2.
Messages

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

@ -987,12 +987,7 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,RsPgpId&
//
ops_validate_result_t* result=(ops_validate_result_t*)ops_mallocz(sizeof *result);
if(!ops_validate_key_signatures(result,keydata,tmp_keyring,cb_get_passphrase))
{
std::cerr << "Cannot validate self-signature for this certificate. Format error?" << std::endl;
error_string = "Cannot validate self signature for this certificate. Format error?" ;
return false ;
}
ops_validate_key_signatures(result,keydata,tmp_keyring,cb_get_passphrase) ;
bool found = false ;
@ -1265,7 +1260,7 @@ bool PGPHandler::decryptTextFromFile(const RsPgpId&,std::string& text,const std:
if (f == NULL)
{
std::cerr << "Cannot open file " << inputfile << " for read." << std::endl;
std::cerr << "Cannot open file " << inputfile << " for read." << std::endl;
return false;
}