mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-12 16:09:37 -05:00
Tweaked rscertificate to return empty sslid, if only_pgp is set.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0608f67d71
commit
5dffde209a
@ -314,6 +314,19 @@ bool RsCertificate::initFromString(const std::string& instr,uint32_t& err_code)
|
||||
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::ostringstream os ;
|
||||
|
@ -35,7 +35,7 @@ class RsCertificate
|
||||
std::string ext_ip_string() const ;
|
||||
std::string loc_ip_string() const ;
|
||||
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 ;
|
||||
|
||||
unsigned short ext_port_us() const ;
|
||||
|
Loading…
Reference in New Issue
Block a user