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

sorted out the mess with various calls to clear/cache PGP passphrase that resulted in the passphrase staying in memory

Browse source
This commit is contained in:
csoler 2021-01-08 23:43:59 +01:00
parent 3ee9408c00
commit d7fbe29a56
4 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libretroshare/src/rsserver/rsinit.cc
View file

@ -1927,20 +1927,26 @@ RsInit::LoadCertificateStatus RsLoginHelper::attemptLogin(const RsPeerId& accoun
{
if(isLoggedIn()) return RsInit::ERR_ALREADY_RUNNING;
if(!password.empty())
{
if(!rsNotify->cachePgpPassphrase(password)) return RsInit::ERR_UNKNOWN;
if(!rsNotify->setDisableAskPassword(true)) return RsInit::ERR_UNKNOWN;
}
if(!RsAccounts::SelectAccount(account)) return RsInit::ERR_UNKNOWN;
std::string _ignore_lockFilePath;
RsInit::LoadCertificateStatus ret = RsInit::LockAndLoadCertificates(false, _ignore_lockFilePath);
{
if(!RsAccounts::SelectAccount(account))
return RsInit::ERR_UNKNOWN;
if(!rsNotify->setDisableAskPassword(false)) return RsInit::ERR_UNKNOWN;
if(!rsNotify->clearPgpPassphrase()) return RsInit::ERR_UNKNOWN;
if(ret != RsInit::OK) return ret;
if(RsControl::instance()->StartupRetroShare() == 1) return RsInit::OK;
return RsInit::ERR_UNKNOWN;
if(!password.empty())
{
rsNotify->cachePgpPassphrase(password);
rsNotify->setDisableAskPassword(true);
}
std::string _ignore_lockFilePath;
RsInit::LoadCertificateStatus ret = RsInit::LockAndLoadCertificates(false, _ignore_lockFilePath);
rsNotify->setDisableAskPassword(false) ;
rsNotify->clearPgpPassphrase() ;
if(ret == RsInit::OK && RsControl::instance()->StartupRetroShare() == 1)
return RsInit::OK;
return ret;
}
}
/*static*/ bool RsLoginHelper::collectEntropy(uint32_t bytes)