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

Fix a bug when adding a cert

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-04-19 11:58:34 +00:00
parent a5bc5d7aa2
commit 768b9288b5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/pqi/authgpg.cc
View File

@ -1230,7 +1230,7 @@ bool AuthGPG::LoadCertificateFromString(std::string str, std::string &gpg_id)
if(res == NULL || res->imports == NULL) if(res == NULL || res->imports == NULL)
return false ; return false ;
std::string fingerprint = std::string(res->imports->fpr); fingerprint = std::string(res->imports->fpr);
#ifdef GPG_DEBUG #ifdef GPG_DEBUG
std::cerr << "AuthGPG::LoadCertificateFromString() Importing considered folowing fpr : " << fingerprint << std::endl; std::cerr << "AuthGPG::LoadCertificateFromString() Importing considered folowing fpr : " << fingerprint << std::endl;
#endif #endif
@ -1264,8 +1264,11 @@ bool AuthGPG::LoadCertificateFromString(std::string str, std::string &gpg_id)
#ifdef GPG_DEBUG #ifdef GPG_DEBUG
std::cerr << "AuthGPG::LoadCertificateFromString() returning with gpg_id : " << gpg_id << std::endl; std::cerr << "AuthGPG::LoadCertificateFromString() returning with gpg_id : " << gpg_id << std::endl;
#endif #endif
if (gpg_id == "") {
return false;
} else {
return true; return true;
}
} }
/***************************************************************** /*****************************************************************

4
libretroshare/src/rsserver/p3peers.cc
View File

@ -981,7 +981,11 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
std::cerr << "ConnectFriendWizard : Parse ip address error." << std::endl; std::cerr << "ConnectFriendWizard : Parse ip address error." << std::endl;
} }
if (pd.gpg_id == "") {
return false;
} else {
return true; return true;
}
} }