mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-12 09:24:26 -05:00
avoid sending bad gpg cert in p3disc
Conflicts: libretroshare/src/services/p3disc.cc git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e9d42e1965
commit
09b2633b01
@ -383,7 +383,10 @@ void p3disc::sendPeerDetails(std::string to, std::string about) {
|
||||
}
|
||||
std::string cert = AuthGPG::getAuthGPG()->SaveCertificateToString(about);
|
||||
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;
|
||||
|
||||
@ -512,7 +515,7 @@ void p3disc::recvPeerDetails(RsDiscReply *item)
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
if (item->aboutId != certGpgId) {
|
||||
if (item->aboutId == "" || item->aboutId != certGpgId) {
|
||||
#ifdef P3DISC_DEBUG
|
||||
std::cerr << "p3disc::recvPeerFriendMsg() Error : about id is not the same as gpg id." << std::endl;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user