mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-28 08:07:31 -04:00
* Added Sourashis' work on certificate cleanup.
* Added call to function when loading certificate from a string. (ie when the user cut n pastes it). * added return 1 call to pqipersongrp.cc git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@714 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
dcd88a8af4
commit
174c3f7377
5 changed files with 408 additions and 2 deletions
|
@ -24,6 +24,7 @@
|
|||
*/
|
||||
|
||||
#include "authxpgp.h"
|
||||
#include "cleanupxpgp.h"
|
||||
|
||||
#include "pqinetwork.h"
|
||||
|
||||
|
@ -465,7 +466,14 @@ bool AuthXPGP::LoadCertificateFromString(std::string pem, std::string &id)
|
|||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
XPGP *xpgp = loadXPGPFromPEM(pem);
|
||||
#ifdef AUTHXPGP_DEBUG
|
||||
std::cerr << "AuthXPGP::LoadCertificateFromString() Cleaning up Certificate First!";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
std::string cleancert = cleanUpCertificate(pem);
|
||||
|
||||
XPGP *xpgp = loadXPGPFromPEM(cleancert);
|
||||
if (!xpgp)
|
||||
return false;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue