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

change the cert to gpg + some ssl details

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 21:29:21 +00:00
parent 3656eeb00b
commit c6edff7df8
7 changed files with 194 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/pqi/authssl.cc
View file

@ -653,6 +653,20 @@ std::string AuthSSL::OwnId()
return id;
}
std::string AuthSSL::getOwnLocation()
{
#ifdef AUTHSSL_DEBUG
std::cerr << "AuthSSL::OwnId()";
std::cerr << std::endl;
#endif
sslMtx.lock(); /***** LOCK *****/
std::string location = mOwnCert->location;
sslMtx.unlock(); /**** UNLOCK ****/
return location;
}
//bool AuthSSL::getAllList(std::list<std::string> &ids)
//{
//#ifdef AUTHSSL_DEBUG

1
libretroshare/src/pqi/authssl.h
View file

@ -104,6 +104,7 @@ SSL_CTX * getNewSslCtx();
/* get Certificate Id */
virtual std::string OwnId();
virtual std::string getOwnLocation();
//virtual bool getAllList(std::list<std::string> &ids);
//virtual bool getAuthenticatedList(std::list<std::string> &ids);
//virtual bool getUnknownList(std::list<std::string> &ids);

3
libretroshare/src/pqi/p3connmgr.cc
View file

@ -141,12 +141,13 @@ p3ConnectMgr::p3ConnectMgr()
/* setup basics of own state */
ownState.id = AuthSSL::getAuthSSL()->OwnId();
ownState.name = AuthGPG::getAuthGPG()->getGPGOwnName();
ownState.location = AuthSSL::getAuthSSL()->getOwnLocation();
ownState.netMode = RS_NET_MODE_UDP;
//use_extr_addr_finder = true ;
use_extr_addr_finder = false;
allow_tunnel_connection = true;
mExtAddrFinder = new ExtAddrFinder ;
mExtAddrFinder = new ExtAddrFinder;
return;
}