mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-15 02:44:20 -05:00
added initialisation of gpgmeKeySelected.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
7b183f41a1
commit
1904c05bf9
@ -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 ******/
|
||||||
|
|
||||||
@ -749,11 +749,14 @@ bool AuthGPG::VerifySignature_locked(const void *data, int datalen, const void *
|
|||||||
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))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user