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

Fix past commit for p3idservice.cc

Browse Source
This commit is contained in:
Phenom 2017-07-21 15:31:53 +02:00
parent 733f81269c
commit 8ce10ea6a8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/services/p3idservice.cc
View File

@ -1207,7 +1207,7 @@ bool p3IdService::encryptData( const uint8_t* decrypted_data,
for( int i=0; i < maxRounds; ++i ) for( int i=0; i < maxRounds; ++i )
{ {
for( std::set<const RsGxsId*>::iterator it = keyNotYetFoundIds.begin(); for( std::set<const RsGxsId*>::iterator it = keyNotYetFoundIds.begin();
it !=keyNotYetFoundIds.end(); ++it ) it !=keyNotYetFoundIds.end(); )
{ {
RsTlvPublicRSAKey encryption_key; RsTlvPublicRSAKey encryption_key;
if(getKey(**it, encryption_key) && !encryption_key.keyId.isNull()) if(getKey(**it, encryption_key) && !encryption_key.keyId.isNull())
@ -1215,6 +1215,10 @@ bool p3IdService::encryptData( const uint8_t* decrypted_data,
encryption_keys.push_back(encryption_key); encryption_keys.push_back(encryption_key);
it = keyNotYetFoundIds.erase(it); it = keyNotYetFoundIds.erase(it);
} }
else
{
++it;
}
} }
if(keyNotYetFoundIds.empty()) break; if(keyNotYetFoundIds.empty()) break;
@ -1336,7 +1340,7 @@ bool p3IdService::decryptData( const uint8_t* encrypted_data,
for( int i=0; i < maxRounds; ++i ) for( int i=0; i < maxRounds; ++i )
{ {
for( std::set<const RsGxsId*>::iterator it = keyNotYetFoundIds.begin(); for( std::set<const RsGxsId*>::iterator it = keyNotYetFoundIds.begin();
it !=keyNotYetFoundIds.end(); ++it ) it !=keyNotYetFoundIds.end(); )
{ {
RsTlvPrivateRSAKey decryption_key; RsTlvPrivateRSAKey decryption_key;
if( getPrivateKey(**it, decryption_key) if( getPrivateKey(**it, decryption_key)
@ -1345,6 +1349,10 @@ bool p3IdService::decryptData( const uint8_t* encrypted_data,
decryption_keys.push_back(decryption_key); decryption_keys.push_back(decryption_key);
it = keyNotYetFoundIds.erase(it); it = keyNotYetFoundIds.erase(it);
} }
else
{
++it;
}
} }
if(keyNotYetFoundIds.empty()) break; if(keyNotYetFoundIds.empty()) break;