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

improved login system: do not re-ask for passphrase when user clicks cancel. Removed warning stating that maybe passphrase is wrong

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-06-11 20:31:52 +00:00
parent 3bec1f4f69
commit 74c01423f0
14 changed files with 87 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,14 +86,14 @@ bool AuthGPG::encryptTextToFile(const std::string& text,const std::string& outfi
// return PGPHandler::encryptTextToString(RsPgpId(pgp_id),text,outstr) ;
// }
std::string pgp_pwd_callback(void * /*hook*/, const char *uid_hint, const char * /*passphrase_info*/, int prev_was_bad)
std::string pgp_pwd_callback(void * /*hook*/, const char *uid_hint, const char * /*passphrase_info*/, int prev_was_bad,bool *cancelled)
{
#define GPG_DEBUG2
#ifdef GPG_DEBUG2
fprintf(stderr, "pgp_pwd_callback() called.\n");
#endif
std::string password;
RsServer::notify()->askForPassword(uid_hint, prev_was_bad, password) ;
RsServer::notify()->askForPassword(uid_hint, prev_was_bad, password,cancelled) ;
return password ;
}