Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-15 17:37:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1578 from G10h4ck/hotfix_missing_location_name

Browse Source 
Fix missing location regression interoduced in 41d4599f
This commit is contained in:
csoler 2019-06-10 22:25:53 +02:00 committed by GitHub
commit ee9c240fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/pqi/authssl.cc
View File

@ -311,7 +311,7 @@ bool AuthSSLimpl::active() { return init; }
int AuthSSLimpl::InitAuth( int AuthSSLimpl::InitAuth(
const char* cert_file, const char* priv_key_file, const char* passwd, const char* cert_file, const char* priv_key_file, const char* passwd,
std::string /*alternative_location_name*/ ) std::string locationName )
{ {
/* single call here si don't need to invoke mutex yet */ /* single call here si don't need to invoke mutex yet */
static int initLib = 0; static int initLib = 0;
@ -520,6 +520,8 @@ int AuthSSLimpl::InitAuth(
else else
std::cerr << std::endl; std::cerr << std::endl;
mOwnLocationName = locationName;
init = 1; init = 1;
return 1; return 1;
} }
@ -575,7 +577,7 @@ const RsPeerId& AuthSSLimpl::OwnId()
} }
std::string AuthSSLimpl::getOwnLocation() std::string AuthSSLimpl::getOwnLocation()
{ return RsX509Cert::getCertLocation(*mOwnCert); } { return mOwnLocationName; }
std::string AuthSSLimpl::SaveOwnCertificateToString() std::string AuthSSLimpl::SaveOwnCertificateToString()
{ return saveX509ToPEM(mOwnCert); } { return saveX509ToPEM(mOwnCert); }

12
libretroshare/src/pqi/authssl.h
View File

@ -98,7 +98,7 @@ public:
virtual bool active() = 0; virtual bool active() = 0;
virtual int InitAuth( virtual int InitAuth(
const char* srvr_cert, const char* priv_key, const char* passwd, const char* srvr_cert, const char* priv_key, const char* passwd,
std::string alternative_location_name ) = 0; std::string locationName ) = 0;
virtual bool CloseAuth() = 0; virtual bool CloseAuth() = 0;
/*********** Overloaded Functions from p3AuthMgr **********/ /*********** Overloaded Functions from p3AuthMgr **********/
@ -198,7 +198,7 @@ public:
bool active() override; bool active() override;
int InitAuth( const char *srvr_cert, const char *priv_key, int InitAuth( const char *srvr_cert, const char *priv_key,
const char *passwd, std::string alternative_location_name ) const char *passwd, std::string locationName )
override; override;
bool CloseAuth() override; bool CloseAuth() override;
@ -278,6 +278,14 @@ private:
RsPeerId mOwnId; RsPeerId mOwnId;
X509* mOwnCert; X509* mOwnCert;
/**
* If the location name is included in SSL certificate it becomes a public
* information, because anyone able to open an SSL connection to the host is
* able to read it. To avoid that location name is now stored separately and
* and not included in the SSL certificate.
*/
std::string mOwnLocationName;
RsMutex sslMtx; /* protects all below */ RsMutex sslMtx; /* protects all below */
EVP_PKEY* mOwnPrivateKey; EVP_PKEY* mOwnPrivateKey;