Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 02:44:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added initialisation of gpgmeKeySelected.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-01 20:42:17 +00:00
parent 7b183f41a1
commit 1904c05bf9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretroshare/src/pqi/authgpg.cc
View File

@ -124,7 +124,7 @@ static char *PgpPassword = NULL;
AuthGPG::AuthGPG() AuthGPG::AuthGPG()
:gpgmeInit(false) , p3Config(CONFIG_TYPE_AUTHGPG) :gpgmeInit(false),gpgmeKeySelected(false),p3Config(CONFIG_TYPE_AUTHGPG)
{ {
RsStackMutex stack(pgpMtx); /******* LOCKED ******/ RsStackMutex stack(pgpMtx); /******* LOCKED ******/
@ -746,14 +746,17 @@ bool AuthGPG::VerifySignature_locked(const void *data, int datalen, const void *
gpgme_data_t gpgmeData; gpgme_data_t gpgmeData;
#ifdef GPG_DEBUG #ifdef GPG_DEBUG
std::cerr << "VerifySignature: datalen: " << datalen << " siglen: " << siglen << std::endl; std::cerr << "VerifySignature: datalen: " << datalen << " siglen: " << siglen << std::endl;
#endif #endif
if(siglen==73) if(!(gpgmeInit || gpgmeKeySelected))
{ return false ;
//std::cerr << "Reducing to 72 to overcome an old bug." << std::endl ;
siglen=72 ; // if(siglen==73)
} // {
// //std::cerr << "Reducing to 72 to overcome an old bug." << std::endl ;
// siglen=72 ;
// }
if (GPG_ERR_NO_ERROR != gpgme_data_new_from_mem(&gpgmeData, (const char *) data, datalen, 1)) if (GPG_ERR_NO_ERROR != gpgme_data_new_from_mem(&gpgmeData, (const char *) data, datalen, 1))
{ {