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

clean the cert only when manually inserted

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-19 22:06:42 +00:00
parent 045a70ab10
commit fcb92631fb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1202,7 +1202,8 @@ bool AuthGPG::LoadCertificateFromString(std::string str, std::string &gpg_id)
RsStackMutex stack(pgpMtx); /******* LOCKED ******/ RsStackMutex stack(pgpMtx); /******* LOCKED ******/
std::string cleancert = cleanUpCertificate(str); //std::string cleancert = cleanUpCertificate(str); disable for p3disc message on windows system. Move the clean cert in p3peers
std::string cleancert = str;
std::cerr << "AuthGPG::LoadCertificateFromString() cleancert : " << cleancert; std::cerr << "AuthGPG::LoadCertificateFromString() cleancert : " << cleancert;

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

@ -29,6 +29,7 @@
#include "pqi/authssl.h" #include "pqi/authssl.h"
#include "pqi/authgpg.h" #include "pqi/authgpg.h"
#include <rsiface/rsinit.h> #include <rsiface/rsinit.h>
#include "pqi/cleanupxpgp.h"
#include <iostream> #include <iostream>
@ -912,7 +913,8 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
parsePosition += pgpend.length(); parsePosition += pgpend.length();
std::string pgpCert = certstr.substr(0, parsePosition); std::string pgpCert = certstr.substr(0, parsePosition);
std::string gpg_id; std::string gpg_id;
AuthGPG::getAuthGPG()->LoadCertificateFromString(pgpCert, gpg_id); std::string cleancert = cleanUpCertificate(pgpCert);
AuthGPG::getAuthGPG()->LoadCertificateFromString(cleancert, gpg_id);
AuthGPG::getAuthGPG()->getGPGDetails(gpg_id, pd); AuthGPG::getAuthGPG()->getGPGDetails(gpg_id, pd);
if (gpg_id == "") { if (gpg_id == "") {
return false; return false;