github-mirrors/php-gnupg
1
0
Fork 0
mirror of https://github.com/php-gnupg/php-gnupg.git synced 2026-02-04 13:21:34 +00:00
Code Issues Projects Releases Packages Activity

Fix decryption using multiple keys

Browse source 
References #32
This commit is contained in:
Francisco José Moreno Vílchez 2021-07-02 12:36:53 +02:00
parent 866c3b47a3
commit 4905e3e2a5
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnupg.c
View file

@ -715,6 +715,7 @@ gpgme_error_t passphrase_decrypt_cb (
const char *uid_hint, const char *passphrase_info, const char *uid_hint, const char *passphrase_info,
int last_was_bad, int fd) int last_was_bad, int fd)
{ {
static int passphrase_found = 0;
char uid[17]; char uid[17];
int idx; int idx;
char *passphrase = NULL; char *passphrase = NULL;
@ -722,7 +723,7 @@ gpgme_error_t passphrase_decrypt_cb (
PHPC_THIS_DECLARE(gnupg) = hook; PHPC_THIS_DECLARE(gnupg) = hook;
TSRMLS_FETCH(); TSRMLS_FETCH();
if (last_was_bad) { if (passphrase_found && last_was_bad) {
GNUPG_ERR("Incorrent passphrase"); GNUPG_ERR("Incorrent passphrase");
return 1; return 1;
} }
@ -733,9 +734,12 @@ gpgme_error_t passphrase_decrypt_cb (
if (!PHPC_HASH_CSTR_FIND_PTR_IN_COND( if (!PHPC_HASH_CSTR_FIND_PTR_IN_COND(
PHPC_THIS->decryptkeys, (char *)uid, passphrase)) { PHPC_THIS->decryptkeys, (char *)uid, passphrase)) {
GNUPG_ERR("no passphrase set"); GNUPG_ERR("no passphrase set");
return 1; passphrase_found = 0;
write(fd, "\n", 1);
return 0;
} }
if (!passphrase) { if (!passphrase) {
passphrase_found = 0;
GNUPG_ERR("no passphrase set"); GNUPG_ERR("no passphrase set");
return 1; return 1;
} }
@ -743,6 +747,8 @@ gpgme_error_t passphrase_decrypt_cb (
&& write(fd, "\n", 1) == 1) { && write(fd, "\n", 1) == 1) {
return 0; return 0;
} }
passphrase_found = 1;
GNUPG_ERR("write failed"); GNUPG_ERR("write failed");
return 1; return 1;
} }