mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-06 21:58:57 -04:00
- made the names consistent between ftdata, ftdatamultiplex and tests/
- added missing virtual functions in ftDataRecv - setup initSSL instance as a static member of AuthSSL, instead of an external (does not change much except the init in rsinit.cc) - changed p3PeerMgrIMPL to take SSL and PGP ids as parameters. This avoids calling AuthSSL and AuthGPG from the constructor => very helpful for tests. - added random creation function in t_RsGenericId<> - added functions setAuthSSL_debug() and setAuthGPG_debug() to manually setup the authSSL and authGPG objects to use. Used in tests. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
69859f2a43
commit
66207b81e5
12 changed files with 52 additions and 23 deletions
|
@ -59,7 +59,7 @@
|
|||
***/
|
||||
|
||||
// initialisation du pointeur de singleton
|
||||
static AuthSSL *instance_ssl = NULL;
|
||||
AuthSSL *AuthSSL::instance_ssl = NULL;
|
||||
static pthread_mutex_t *mutex_buf = NULL;
|
||||
|
||||
struct CRYPTO_dynlock_value
|
||||
|
@ -200,12 +200,12 @@ void tls_cleanup()
|
|||
}
|
||||
|
||||
/* hidden function - for testing purposes() */
|
||||
void setAuthSSL(AuthSSL *newssl)
|
||||
void AuthSSL::setAuthSSL_debug(AuthSSL *newssl)
|
||||
{
|
||||
instance_ssl = newssl;
|
||||
}
|
||||
|
||||
void AuthSSLInit()
|
||||
void AuthSSL::AuthSSLInit()
|
||||
{
|
||||
if (instance_ssl == NULL)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue