Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid sending bad gpg cert in p3disc

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2554 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-03-15 19:10:46 +00:00
parent 276ff5caea
commit f5a616519c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/services/p3disc.cc
View File

@ -383,7 +383,10 @@ void p3disc::sendPeerDetails(std::string to, std::string about) {
} }
std::string cert = AuthGPG::getAuthGPG()->SaveCertificateToString(about); std::string cert = AuthGPG::getAuthGPG()->SaveCertificateToString(about);
if (cert == "") { if (cert == "") {
cert = "No Key"; #ifdef P3DISC_DEBUG
std::cerr << "p3disc::sendPeerDetails() don't send details because the gpg cert is not good" << std::endl;
#endif
return;
} }
di -> certGPG = cert; di -> certGPG = cert;
@ -507,7 +510,7 @@ void p3disc::recvPeerDetails(RsDiscReply *item)
#endif #endif
std::string certGpgId; std::string certGpgId;
AuthGPG::getAuthGPG()->LoadCertificateFromString(item->certGPG, certGpgId); AuthGPG::getAuthGPG()->LoadCertificateFromString(item->certGPG, certGpgId);
if (item->aboutId != certGpgId) { if (item->aboutId == "" || item->aboutId != certGpgId) {
#ifdef P3DISC_DEBUG #ifdef P3DISC_DEBUG
std::cerr << "p3disc::recvPeerFriendMsg() Error : about id is not the same as gpg id." << std::endl; std::cerr << "p3disc::recvPeerFriendMsg() Error : about id is not the same as gpg id." << std::endl;
#endif #endif