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

Fix issues for PHP 5

Browse source
This commit is contained in:
Jakub Zelenka 2016-05-22 19:19:26 +01:00
parent 643bcd1ecf
commit bc39172174
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnupg.c
View file

@ -119,7 +119,7 @@ static void gnupg_free_resource_ptr(PHPC_THIS_DECLARE(gnupg) TSRMLS_DC)
static void gnupg_res_dtor(phpc_res_entry_t *rsrc TSRMLS_DC) /* {{{ */ static void gnupg_res_dtor(phpc_res_entry_t *rsrc TSRMLS_DC) /* {{{ */
{ {
PHPC_THIS_DECLARE(gnupg) = rsrc->ptr; PHPC_THIS_DECLARE(gnupg) = rsrc->ptr;
gnupg_free_resource_ptr(PHPC_THIS); gnupg_free_resource_ptr(PHPC_THIS TSRMLS_CC);
efree(PHPC_THIS); efree(PHPC_THIS);
} }
/* }}} */ /* }}} */
@ -412,7 +412,7 @@ gpgme_error_t passphrase_cb(
uid[idx] = uid_hint[idx]; uid[idx] = uid_hint[idx];
} }
uid[16] = '\0'; uid[16] = '\0';
if ((passphrase = zend_hash_str_find_ptr(PHPC_THIS->signkeys, (char *)uid, 16)) == NULL) { if (!PHPC_HASH_CSTR_FIND_PTR_IN_COND(PHPC_THIS->signkeys, (char *)uid, passphrase)) {
GNUPG_ERR("no passphrase set"); GNUPG_ERR("no passphrase set");
return 1; return 1;
} }
@ -448,7 +448,7 @@ gpgme_error_t passphrase_decrypt_cb (
uid[idx] = uid_hint[idx]; uid[idx] = uid_hint[idx];
} }
uid[16] = '\0'; uid[16] = '\0';
if ((passphrase = zend_hash_str_find_ptr(PHPC_THIS->decryptkeys, (char *)uid, 16)) == NULL) { if (!PHPC_HASH_CSTR_FIND_PTR_IN_COND(PHPC_THIS->decryptkeys, (char *)uid, passphrase)) {
GNUPG_ERR("no passphrase set"); GNUPG_ERR("no passphrase set");
return 1; return 1;
} }
@ -693,10 +693,11 @@ PHP_FUNCTION(gnupg_keyinfo)
gpgme_userid = gpgme_userid->next; gpgme_userid = gpgme_userid->next;
} }
add_assoc_zval(PHPC_VAL_CAST_TO_PZVAL(subarr), "uids", PHPC_VAL_CAST_TO_PZVAL(userids)); PHPC_ARRAY_ADD_ASSOC_ZVAL(PHPC_VAL_CAST_TO_PZVAL(subarr), "uids", PHPC_VAL_CAST_TO_PZVAL(userids));
gpgme_subkey = gpgme_key->subkeys; gpgme_subkey = gpgme_key->subkeys;
while (gpgme_subkey) { while (gpgme_subkey) {
PHPC_VAL_MAKE(subkey);
PHPC_ARRAY_INIT(PHPC_VAL_CAST_TO_PZVAL(subkey)); PHPC_ARRAY_INIT(PHPC_VAL_CAST_TO_PZVAL(subkey));
if (gpgme_subkey->fpr) { if (gpgme_subkey->fpr) {
@ -719,7 +720,7 @@ PHP_FUNCTION(gnupg_keyinfo)
gpgme_subkey = gpgme_subkey->next; gpgme_subkey = gpgme_subkey->next;
} }
add_assoc_zval(PHPC_VAL_CAST_TO_PZVAL(subarr), "subkeys", PHPC_VAL_CAST_TO_PZVAL(subkeys)); PHPC_ARRAY_ADD_ASSOC_ZVAL(PHPC_VAL_CAST_TO_PZVAL(subarr), "subkeys", PHPC_VAL_CAST_TO_PZVAL(subkeys));
PHPC_ARRAY_ADD_NEXT_INDEX_ZVAL(return_value, PHPC_VAL_CAST_TO_PZVAL(subarr)); PHPC_ARRAY_ADD_NEXT_INDEX_ZVAL(return_value, PHPC_VAL_CAST_TO_PZVAL(subarr));
gpgme_key_unref(gpgme_key); gpgme_key_unref(gpgme_key);
@ -909,7 +910,7 @@ PHP_FUNCTION(gnupg_sign)
char *value = NULL; char *value = NULL;
phpc_str_size_t value_len; phpc_str_size_t value_len;
char *userret; char *userret;
phpc_str_size_t ret_size; size_t ret_size;
gpgme_data_t in, out; gpgme_data_t in, out;
gpgme_sign_result_t result; gpgme_sign_result_t result;
@ -979,7 +980,7 @@ PHP_FUNCTION(gnupg_encrypt)
char *value = NULL; char *value = NULL;
phpc_str_size_t value_len; phpc_str_size_t value_len;
char *userret = NULL; char *userret = NULL;
phpc_str_size_t ret_size; size_t ret_size;
gpgme_data_t in, out; gpgme_data_t in, out;
gpgme_encrypt_result_t result; gpgme_encrypt_result_t result;
@ -1040,7 +1041,7 @@ PHP_FUNCTION(gnupg_encryptsign)
char *value = NULL; char *value = NULL;
phpc_str_size_t value_len; phpc_str_size_t value_len;
char *userret = NULL; char *userret = NULL;
phpc_str_size_t ret_size; size_t ret_size;
gpgme_data_t in, out; gpgme_data_t in, out;
gpgme_encrypt_result_t result; gpgme_encrypt_result_t result;
gpgme_sign_result_t sign_result; gpgme_sign_result_t sign_result;
@ -1104,7 +1105,7 @@ PHP_FUNCTION(gnupg_encryptsign)
return; return;
} }
userret = gpgme_data_release_and_get_mem(out,&ret_size); userret = gpgme_data_release_and_get_mem(out, &ret_size);
gpgme_data_release(in); gpgme_data_release(in);
PHPC_CSTRL_RETVAL(userret, ret_size); PHPC_CSTRL_RETVAL(userret, ret_size);
free (userret); free (userret);
@ -1128,7 +1129,7 @@ PHP_FUNCTION(gnupg_verify)
/* signed_text without the signature if its not a detached sig */ /* signed_text without the signature if its not a detached sig */
zval *plain_text = NULL; zval *plain_text = NULL;
char *gpg_plain; char *gpg_plain;
phpc_str_size_t gpg_plain_len; size_t gpg_plain_len;
GNUPG_GETOBJ(); GNUPG_GETOBJ();
@ -1168,7 +1169,7 @@ PHP_FUNCTION(gnupg_verify)
return; return;
} }
/* set a NULL databuffer for gpgme */ /* set a NULL databuffer for gpgme */
if ((PHPC_THIS->err = gpgme_data_new_from_mem (&gpgme_text, NULL, 0, 0)) != GPG_ERR_NO_ERROR) { if ((PHPC_THIS->err = gpgme_data_new_from_mem(&gpgme_text, NULL, 0, 0)) != GPG_ERR_NO_ERROR) {
GNUPG_ERR("could not create text-databuffer"); GNUPG_ERR("could not create text-databuffer");
gpgme_data_release(gpgme_sig); gpgme_data_release(gpgme_sig);
gpgme_data_release(gpgme_text); gpgme_data_release(gpgme_text);
@ -1209,7 +1210,7 @@ PHP_FUNCTION(gnupg_decrypt)
char *enctxt; char *enctxt;
phpc_str_size_t enctxt_len; phpc_str_size_t enctxt_len;
char *userret; char *userret;
phpc_str_size_t ret_size; size_t ret_size;
gpgme_data_t in, out; gpgme_data_t in, out;
gpgme_decrypt_result_t result; gpgme_decrypt_result_t result;
@ -1271,7 +1272,7 @@ PHP_FUNCTION(gnupg_decryptverify)
phpc_str_size_t enctxt_len; phpc_str_size_t enctxt_len;
zval *plaintext; zval *plaintext;
char *userret; char *userret;
phpc_str_size_t ret_size; size_t ret_size;
gpgme_data_t in, out; gpgme_data_t in, out;
gpgme_decrypt_result_t decrypt_result; gpgme_decrypt_result_t decrypt_result;
gpgme_verify_result_t verify_result; gpgme_verify_result_t verify_result;
@ -1337,7 +1338,7 @@ PHP_FUNCTION(gnupg_export)
char *searchkey = NULL; char *searchkey = NULL;
phpc_str_size_t searchkey_len; phpc_str_size_t searchkey_len;
char *userret; char *userret;
phpc_str_size_t ret_size; size_t ret_size;
gpgme_data_t out; gpgme_data_t out;
GNUPG_GETOBJ(); GNUPG_GETOBJ();

2
phpc

@ -1 +1 @@
Subproject commit d549c2c50ce74a9857337ee0e697585594f29972 Subproject commit 3cc9a2fe8b23f4ff95bc650fc9ac66f92905621f