github-mirrors/php-gnupg
1
0
Fork 0
mirror of https://github.com/php-gnupg/php-gnupg.git synced 2024-11-22 14:27:09 +00:00
Code Issues Projects Releases Packages Activity

gnupg.c: fix gnupg_adddecryptkey() passphrase handling

Browse source 
This corrects an issue where the given passphrase was not being respected and
    pinentry was being called regardless.  This fix will set the pinentry_mode to loopback
    mode so that our custom passphrase_decrypt_cb() function will be called.
This commit is contained in:
Terra 2018-06-03 18:36:33 -04:00
parent 587a5f9400
commit 70cccaf58c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnupg.c
View file

@ -1048,6 +1048,7 @@ PHP_FUNCTION(gnupg_adddecryptkey)
phpc_str_size_t passphrase_len; phpc_str_size_t passphrase_len;
gpgme_key_t gpgme_key; gpgme_key_t gpgme_key;
gpgme_subkey_t gpgme_subkey; gpgme_subkey_t gpgme_subkey;
int loopback_set = 0;
GNUPG_GETOBJ(); GNUPG_GETOBJ();
@ -1073,6 +1074,10 @@ PHP_FUNCTION(gnupg_adddecryptkey)
PHPC_HASH_CSTR_ADD_PTR( PHPC_HASH_CSTR_ADD_PTR(
PHPC_THIS->decryptkeys, gpgme_subkey->keyid, PHPC_THIS->decryptkeys, gpgme_subkey->keyid,
passphrase, passphrase_len + 1); passphrase, passphrase_len + 1);
if (!loopback_set && passphrase && passphrase_len > 0) {
gpgme_set_pinentry_mode(PHPC_THIS->ctx, GPGME_PINENTRY_MODE_LOOPBACK);
loopback_set = 1;
}
} }
gpgme_subkey = gpgme_subkey->next; gpgme_subkey = gpgme_subkey->next;
} }