Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 08:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added parsing of short invites in connect friend wizard (not working yet)

Browse source
This commit is contained in:
csoler 2019-06-09 15:03:48 +02:00
parent 3a799bae37
commit 4bd5aaa9b2
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
6 changed files with 69 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libretroshare/src/rsserver/p3peers.cc
View file

@ -1536,11 +1536,20 @@ bool p3Peers::loadDetailsFromStringCert( const std::string &certstr,
return true;
}
bool p3Peers::cleanCertificate(const std::string &certstr, std::string &cleanCert,int& error_code)
bool p3Peers::cleanCertificate(const std::string &certstr, std::string &cleanCert,bool& is_short_format,int& error_code)
{
RsCertificate::Format format ;
return RsCertificate::cleanCertificate(certstr,cleanCert,format,error_code,true) ;
bool res = RsCertificate::cleanCertificate(certstr,cleanCert,format,error_code,true) ;
if(format == RsCertificate::RS_CERTIFICATE_RADIX)
is_short_format = false;
else if(format == RsCertificate::RS_CERTIFICATE_SHORT_RADIX)
is_short_format = true;
else
return false ;
return res;
}
bool p3Peers::saveCertificateToFile(const RsPeerId &id, const std::string &/*fname*/)

2
libretroshare/src/rsserver/p3peers.h
View file

@ -157,7 +157,7 @@ public:
virtual bool loadCertificateFromString(const std::string& cert, RsPeerId& ssl_id,RsPgpId& pgp_id, std::string& error_string);
virtual bool loadDetailsFromStringCert(const std::string &cert, RsPeerDetails &pd, uint32_t& error_code);
virtual bool cleanCertificate(const std::string &certstr, std::string &cleanCert,int& error_code);
virtual bool cleanCertificate(const std::string &certstr, std::string &cleanCert, bool &is_short_format, int& error_code) override;
virtual bool saveCertificateToFile(const RsPeerId &id, const std::string &fname);
virtual std::string saveCertificateToString(const RsPeerId &id);