Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 07:47:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaked rscertificate to return empty sslid, if only_pgp is set.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-08-26 06:56:20 +00:00
parent 0608f67d71
commit 5dffde209a
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libretroshare/src/pgp/rscertificate.cc
View File

@ -314,6 +314,19 @@ bool RsCertificate::initFromString(const std::string& instr,uint32_t& err_code)
return true ; return true ;
} }
std::string RsCertificate::sslid_string() const
{
if (only_pgp)
{
std::string empty;
return empty;
}
else
{
return location_id.toStdString(false);
}
}
std::string RsCertificate::ext_ip_string() const std::string RsCertificate::ext_ip_string() const
{ {
std::ostringstream os ; std::ostringstream os ;

2
libretroshare/src/pgp/rscertificate.h
View File

@ -35,7 +35,7 @@ class RsCertificate
std::string ext_ip_string() const ; std::string ext_ip_string() const ;
std::string loc_ip_string() const ; std::string loc_ip_string() const ;
std::string dns_string() const { return dns_name ; } std::string dns_string() const { return dns_name ; }
std::string sslid_string() const { return location_id.toStdString(false) ; } std::string sslid_string() const;
std::string armouredPGPKey() const ; std::string armouredPGPKey() const ;
unsigned short ext_port_us() const ; unsigned short ext_port_us() const ;