mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-22 07:41:20 -04:00
- added new certificate format in ConfCertDialog and ConnectFriendWizard, with a button to switch to old format if necessary
- added automatic cleaning of certificates in both formats - grouped all certificate cleaning/parsing code in rscertificate.cc - removed unused files cleanupxpgp.h/cc - added upper/lower case to rsid template. The new format is to be tested. It is supposed to be much more robust than the previous format, in particular, allowing any string for location names. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
64e171948c
commit
60f51c358c
21 changed files with 1037 additions and 1099 deletions
|
@ -1,7 +1,7 @@
|
|||
#include <fstream>
|
||||
|
||||
#include "argstream.h"
|
||||
#include <pqi/cleanupxpgp.h>
|
||||
//#include <pqi/cleanupxpgp.h>
|
||||
#include <pgp/rscertificate.h>
|
||||
|
||||
int main(int argc,char *argv[])
|
||||
|
@ -41,12 +41,12 @@ int main(int argc,char *argv[])
|
|||
std::string res2 ;
|
||||
int err ;
|
||||
|
||||
res2 = cleanUpCertificate(res,err) ;
|
||||
//res2 = cleanUpCertificate(res,err) ;
|
||||
|
||||
if(res2 == "")
|
||||
std::cerr << "Error while cleaning: " << err << std::endl;
|
||||
else
|
||||
res = res2 ;
|
||||
//if(res2 == "")
|
||||
// std::cerr << "Error while cleaning: " << err << std::endl;
|
||||
//else
|
||||
// res = res2 ;
|
||||
|
||||
std::cerr << "Certificate after cleaning:" << std::endl;
|
||||
std::cerr << "==========================================" << std::endl;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue