Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 16:27:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug with key exchange

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5267 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-07-01 22:24:37 +00:00
parent 419c8eafb5
commit d5675a0d59
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,6 +304,8 @@ bool PGPHandler::availableGPGCertificatesWithPrivateKeys(std::list<PGPIdType>& i
bool PGPHandler::GeneratePGPCertificate(const std::string& name, const std::string& email, const std::string& passphrase, PGPIdType& pgpId, std::string& errString) bool PGPHandler::GeneratePGPCertificate(const std::string& name, const std::string& email, const std::string& passphrase, PGPIdType& pgpId, std::string& errString)
{ {
RsStackFileLock flck(_pgp_lock_filename) ; // lock access to PGP directory.
static const int KEY_NUMBITS = 2048 ; static const int KEY_NUMBITS = 2048 ;
// 1 - generate keypair - RSA-2048 // 1 - generate keypair - RSA-2048
@ -357,9 +359,6 @@ bool PGPHandler::GeneratePGPCertificate(const std::string& name, const std::stri
// 5 - add key to secret keyring on disk. // 5 - add key to secret keyring on disk.
{
RsStackFileLock flck(_pgp_lock_filename) ; // lock access to PGP directory.
cinfo = NULL ; cinfo = NULL ;
int fd=ops_setup_file_append(&cinfo, _secring_path.c_str()); int fd=ops_setup_file_append(&cinfo, _secring_path.c_str());
@ -369,7 +368,6 @@ bool PGPHandler::GeneratePGPCertificate(const std::string& name, const std::stri
return false ; return false ;
} }
ops_teardown_file_write(cinfo,fd) ; ops_teardown_file_write(cinfo,fd) ;
}
// 6 - copy the public key to the public keyring // 6 - copy the public key to the public keyring
@ -390,8 +388,11 @@ bool PGPHandler::GeneratePGPCertificate(const std::string& name, const std::stri
} }
ops_teardown_memory_write(cinfo,buf2); // cleanup memory ops_teardown_memory_write(cinfo,buf2); // cleanup memory
addNewKeyToOPSKeyring(_pubring,tmp_pubring->keys[0]) ; if(!addOrMergeKey(_pubring,_public_keyring_map,&tmp_pubring->keys[0]))
initCertificateInfo(_public_keyring_map[ pgpId.toStdString() ],&tmp_pubring->keys[0],_pubring->nkeys-1) ; {
std::cerr << "(EE) Cannot add new key to keyring. Conflict in GPG ids?" << std::endl;
return false ;
}
ops_keyring_free(tmp_pubring) ; ops_keyring_free(tmp_pubring) ;
free(tmp_pubring) ; free(tmp_pubring) ;
@ -402,7 +403,7 @@ bool PGPHandler::GeneratePGPCertificate(const std::string& name, const std::stri
// 7 - clean // 7 - clean
ops_keydata_free(key) ; ops_keydata_free(key) ;
// 8 - Update flags. // 8 - Update some flags.
_pubring_changed = true ; _pubring_changed = true ;
privateTrustCertificate(pgpId,PGPCertificateInfo::PGP_CERTIFICATE_TRUST_ULTIMATE) ; privateTrustCertificate(pgpId,PGPCertificateInfo::PGP_CERTIFICATE_TRUST_ULTIMATE) ;
@ -505,11 +506,16 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,PGPIdType
while( (keydata = ops_keyring_get_key_by_index(tmp_keyring,i++)) != NULL ) while( (keydata = ops_keyring_get_key_by_index(tmp_keyring,i++)) != NULL )
if(addOrMergeKey(_pubring,_public_keyring_map,keydata)) if(addOrMergeKey(_pubring,_public_keyring_map,keydata))
{
_pubring_changed = true ; _pubring_changed = true ;
#ifdef DEBUG_PGPHANDLER #ifdef DEBUG_PGPHANDLER
std::cerr << " Added the key in the main public keyring." << std::endl; std::cerr << " Added the key in the main public keyring." << std::endl;
#endif #endif
}
else
std::cerr << "Key already in public keyring." << std::endl;
id = PGPIdType(tmp_keyring->keys[0].key_id) ;
ops_keyring_free(tmp_keyring) ; ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ; free(tmp_keyring) ;