Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Enabled compile on Windows (bzip2 library needed).

Browse source 
- Fixed crash after the second call to RsInit::InitRetroShare when keyring does not exist.
The instance of AuthSSL was created twice and AuthGPG was deleted without stopping the thread. Stopped the AuthGPG thread on exit of RetroShare.
- Added the correct path to the keyring for Windows in RsInit::copyGnuPGKeyrings.
- Changed the detection of the portable version on Windows from the file "gpg.exe" to the file "portable".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5211 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-06-10 00:29:46 +00:00
parent a91e859b66
commit 1885fb66c4
14 changed files with 92 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/pqi/authgpg.cc
View file

@ -90,7 +90,7 @@ void AuthGPG::init(const std::string& path_to_public_keyring,const std::string&
{
if(_instance != NULL)
{
delete _instance ;
exit();
std::cerr << "AuthGPG::init() called twice!" << std::endl ;
}
@ -98,6 +98,16 @@ void AuthGPG::init(const std::string& path_to_public_keyring,const std::string&
_instance = new AuthGPG(path_to_public_keyring,path_to_secret_keyring) ;
}
void AuthGPG::exit()
{
if(_instance != NULL)
{
_instance->join();
delete _instance ;
_instance = NULL;
}
}
AuthGPG::AuthGPG(const std::string& path_to_public_keyring,const std::string& path_to_secret_keyring)
:p3Config(CONFIG_TYPE_AUTHGPG),
PGPHandler(path_to_public_keyring,path_to_secret_keyring),