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

Port to PHP 7, only 33.3% of the tests pass though (same as PHP 5). May be as stable

Browse source 
as the last release, but more work may be needed.
This commit is contained in:
Sean DuBois 2015-12-27 06:44:02 +00:00
parent 9edf765b60
commit f7d42c6bc3
4 changed files with 230 additions and 284 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

351
gnupg.c
View file

@ -23,25 +23,19 @@
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "php_gnupg.h" #include "php_gnupg.h"
#ifdef ZEND_ENGINE_2
#include "php_gnupg_keylistiterator.h" #include "php_gnupg_keylistiterator.h"
#endif
static int le_gnupg; static int le_gnupg;
#ifdef ZEND_ENGINE_2
static zend_object_handlers gnupg_object_handlers; static zend_object_handlers gnupg_object_handlers;
#endif
/* {{{ defs */ /* {{{ defs */
#ifdef ZEND_ENGINE_2
#define GNUPG_GETOBJ() \ #define GNUPG_GETOBJ() \
zval *this = getThis(); \ zval *this = getThis(); \
gnupg_object *intern; \ gnupg_object *intern; \
zval *res; \ zval *res; \
if(this){ \ if(this){ \
intern = (gnupg_object*) zend_object_store_get_object(getThis() TSRMLS_CC); \ intern = Z_GNUPGO_P(this); \
if(!intern){ \ if(!intern){ \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized gnupg object"); \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized gnupg object"); \
RETURN_FALSE; \ RETURN_FALSE; \
@ -66,23 +60,6 @@ static zend_object_handlers gnupg_object_handlers;
if(return_value){ \ if(return_value){ \
RETVAL_FALSE; \ RETVAL_FALSE; \
} }
#else
#define GNUPG_ERR(error) \
if(intern && intern->errormode!=1) { \
intern->errortxt = (char*)error; \
}else{ \
php_error_docref(NULL TSRMLS_CC, E_WARNING, (char*)error); \
} \
if(return_value){ \
RETVAL_FALSE; \
}
#define GNUPG_GETOBJ() \
zval *this = NULL; \
zval *res; \
gnupg_object *intern;
#endif
/* }}} */ /* }}} */
/* {{{ free encryptkeys */ /* {{{ free encryptkeys */
@ -124,10 +101,9 @@ static void gnupg_free_resource_ptr(gnupg_object *intern TSRMLS_DC){
/* }}} */ /* }}} */
/* {{{ gnupg_res_dtor */ /* {{{ gnupg_res_dtor */
static void gnupg_res_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { ZEND_RSRC_DTOR_FUNC(gnupg_res_dtor) {
gnupg_object *intern; gnupg_object *intern = res->ptr;
intern = (gnupg_object *) rsrc->ptr; gnupg_free_resource_ptr(intern);
gnupg_free_resource_ptr(intern TSRMLS_CC);
efree(intern); efree(intern);
} }
/* }}} */ /* }}} */
@ -159,47 +135,29 @@ static void gnupg_res_init(gnupg_object *intern TSRMLS_DC){
} }
/* }}} */ /* }}} */
#ifdef ZEND_ENGINE_2
/* {{{ free_storage */ /* {{{ free_storage */
static void gnupg_obj_dtor(gnupg_object *intern TSRMLS_DC){ static void gnupg_obj_dtor(zend_object *intern TSRMLS_DC){
if(!intern){ gnupg_object *gnupg_o;
return; gnupg_o = gnupg_object_from_obj(intern);
}
gnupg_free_resource_ptr(intern TSRMLS_CC); gnupg_free_resource_ptr(gnupg_o);
if(intern->zo.properties){ zend_object_std_dtor(&gnupg_o->zo);
zend_hash_destroy(intern->zo.properties);
FREE_HASHTABLE(intern->zo.properties);
}
efree(intern);
} }
/* }}} */ /* }}} */
/* {{{ objects_new */ /* {{{ objects_new */
zend_object_value gnupg_obj_new(zend_class_entry *class_type TSRMLS_DC){ static zend_object* gnupg_obj_new(zend_class_entry *class_type TSRMLS_DC){
gnupg_object *intern; gnupg_object *intern;
#if PHP_VERSION_ID < 50399
zval *tmp;
#endif
zend_object_value retval;
intern = ecalloc(1, sizeof(gnupg_object)); intern = ecalloc(1, sizeof(gnupg_object) + zend_object_properties_size(class_type));
intern->zo.ce = class_type; zend_object_std_init(&intern->zo, class_type);
#if PHP_VERSION_ID < 50399
intern->zo.properties = NULL;
ALLOC_HASHTABLE (intern->zo.properties);
zend_hash_init (intern->zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy (intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
#else
object_properties_init(&intern->zo, class_type); object_properties_init(&intern->zo, class_type);
#endif intern->zo.handlers = &gnupg_object_handlers;
retval.handle = zend_objects_store_put(intern,NULL,(zend_objects_free_object_storage_t) gnupg_obj_dtor,NULL TSRMLS_CC);
retval.handlers = (zend_object_handlers *) & gnupg_object_handlers;
gnupg_res_init (intern TSRMLS_CC); gnupg_res_init (intern TSRMLS_CC);
return retval; return &intern->zo;
} }
/* }}} */ /* }}} */
@ -234,18 +192,10 @@ static zend_function_entry gnupg_methods[] = {
/* {{{ class constants */ /* {{{ class constants */
static void gnupg_declare_long_constant(const char *const_name, long value TSRMLS_DC){ static void gnupg_declare_long_constant(const char *const_name, long value TSRMLS_DC){
#if PHP_MAJOR_VERSION > 5 || PHP_MINOR_VERSION >= 1
zend_declare_class_constant_long(gnupg_class_entry, (char*)const_name, strlen(const_name), value TSRMLS_CC); zend_declare_class_constant_long(gnupg_class_entry, (char*)const_name, strlen(const_name), value TSRMLS_CC);
#else
zval *constant = malloc(sizeof(*constant));
ZVAL_LONG(constant,value);
INIT_PZVAL(constant);
zend_hash_update(&gnupg_class_entry->constants_table, (char*)const_name, strlen(const_name)+1, &constant, sizeof(zval*), NULL);
#endif
} }
/* }}} */ /* }}} */
#endif /* ZEND_ENGINE_2 */
/* {{{ functionlist gnupg */ /* {{{ functionlist gnupg */
static zend_function_entry gnupg_functions[] = { static zend_function_entry gnupg_functions[] = {
@ -280,9 +230,7 @@ static zend_function_entry gnupg_functions[] = {
/* {{{ gnupg_module_entry /* {{{ gnupg_module_entry
*/ */
zend_module_entry gnupg_module_entry = { zend_module_entry gnupg_module_entry = {
#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
#endif
"gnupg", "gnupg",
gnupg_functions, gnupg_functions,
PHP_MINIT(gnupg), PHP_MINIT(gnupg),
@ -290,9 +238,7 @@ zend_module_entry gnupg_module_entry = {
NULL, NULL,
NULL, NULL,
PHP_MINFO(gnupg), PHP_MINFO(gnupg),
#if ZEND_MODULE_API_NO >= 20010901
PHP_GNUPG_VERSION, PHP_GNUPG_VERSION,
#endif
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };
/* }}} */ /* }}} */
@ -306,12 +252,15 @@ ZEND_GET_MODULE(gnupg)
PHP_MINIT_FUNCTION(gnupg) PHP_MINIT_FUNCTION(gnupg)
{ {
le_gnupg = zend_register_list_destructors_ex(gnupg_res_dtor, NULL, "ctx", module_number); le_gnupg = zend_register_list_destructors_ex(gnupg_res_dtor, NULL, "ctx", module_number);
#ifdef ZEND_ENGINE_2
zend_class_entry ce; zend_class_entry ce;
INIT_CLASS_ENTRY(ce, "gnupg", gnupg_methods); INIT_CLASS_ENTRY(ce, "gnupg", gnupg_methods);
ce.create_object = gnupg_obj_new; ce.create_object = gnupg_obj_new;
gnupg_class_entry = zend_register_internal_class(&ce TSRMLS_CC); gnupg_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
memcpy(&gnupg_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); memcpy(&gnupg_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
gnupg_object_handlers.offset = XtOffsetOf(gnupg_object, zo);
gnupg_object_handlers.free_obj = gnupg_obj_dtor;
if (SUCCESS != gnupg_keylistiterator_init()){ if (SUCCESS != gnupg_keylistiterator_init()){
return FAILURE; return FAILURE;
} }
@ -340,7 +289,6 @@ PHP_MINIT_FUNCTION(gnupg)
gnupg_declare_long_constant("ERROR_WARNING", 1 TSRMLS_CC); gnupg_declare_long_constant("ERROR_WARNING", 1 TSRMLS_CC);
gnupg_declare_long_constant("ERROR_EXCEPTION", 2 TSRMLS_CC); gnupg_declare_long_constant("ERROR_EXCEPTION", 2 TSRMLS_CC);
gnupg_declare_long_constant("ERROR_SILENT", 3 TSRMLS_CC); gnupg_declare_long_constant("ERROR_SILENT", 3 TSRMLS_CC);
#endif
REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_NORMAL", GPGME_SIG_MODE_NORMAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_DETACH", GPGME_SIG_MODE_DETACH, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_CLEAR", GPGME_SIG_MODE_CLEAR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("GNUPG_SIG_MODE_CLEAR", GPGME_SIG_MODE_CLEAR, CONST_CS | CONST_PERSISTENT);
@ -406,7 +354,7 @@ gpgme_error_t passphrase_cb (gnupg_object *intern, const char *uid_hint, const c
uid[idx] = uid_hint[idx]; uid[idx] = uid_hint[idx];
} }
uid[16] = '\0'; uid[16] = '\0';
if(zend_hash_find(intern->signkeys,(char *) uid,17,(void **) &passphrase)==FAILURE){ if((passphrase = zend_hash_str_find_ptr(intern->signkeys,(char *) uid, 16)) == NULL){
GNUPG_ERR("no passphrase set"); GNUPG_ERR("no passphrase set");
return 1; return 1;
} }
@ -437,7 +385,7 @@ gpgme_error_t passphrase_decrypt_cb (gnupg_object *intern, const char *uid_hint,
uid[idx] = uid_hint[idx]; uid[idx] = uid_hint[idx];
} }
uid[16] = '\0'; uid[16] = '\0';
if(zend_hash_find(intern->decryptkeys,(char *) uid,17,(void **) &passphrase)==FAILURE){ if((passphrase = zend_hash_str_find_ptr(intern->decryptkeys,(char *) uid, 16)) == NULL){
GNUPG_ERR("no passphrase set"); GNUPG_ERR("no passphrase set");
return 1; return 1;
} }
@ -457,18 +405,17 @@ gpgme_error_t passphrase_decrypt_cb (gnupg_object *intern, const char *uid_hint,
/* {{{ gnupg_fetchsignatures */ /* {{{ gnupg_fetchsignatures */
int gnupg_fetchsignatures(gpgme_signature_t gpgme_signatures, zval *main_arr){ int gnupg_fetchsignatures(gpgme_signature_t gpgme_signatures, zval *main_arr){
zval *sig_arr; zval sig_arr;
array_init (main_arr); array_init (main_arr);
while(gpgme_signatures){ while(gpgme_signatures){
ALLOC_INIT_ZVAL (sig_arr); array_init (&sig_arr);
array_init (sig_arr); add_assoc_string (&sig_arr, "fingerprint", gpgme_signatures->fpr );
add_assoc_string (sig_arr, "fingerprint", gpgme_signatures->fpr, 1); add_assoc_long (&sig_arr, "validity", gpgme_signatures->validity );
add_assoc_long (sig_arr, "validity", gpgme_signatures->validity ); add_assoc_long (&sig_arr, "timestamp", gpgme_signatures->timestamp );
add_assoc_long (sig_arr, "timestamp", gpgme_signatures->timestamp ); add_assoc_long (&sig_arr, "status", gpgme_signatures->status );
add_assoc_long (sig_arr, "status", gpgme_signatures->status ); add_assoc_long (&sig_arr, "summary", gpgme_signatures->summary );
add_assoc_long (sig_arr, "summary", gpgme_signatures->summary ); add_next_index_zval (main_arr, &sig_arr);
add_next_index_zval (main_arr, sig_arr);
gpgme_signatures = gpgme_signatures->next; gpgme_signatures = gpgme_signatures->next;
} }
@ -483,7 +430,7 @@ PHP_FUNCTION(gnupg_init){
gnupg_object *intern; gnupg_object *intern;
intern = emalloc(sizeof(gnupg_object)); intern = emalloc(sizeof(gnupg_object));
gnupg_res_init(intern TSRMLS_CC); gnupg_res_init(intern TSRMLS_CC);
ZEND_REGISTER_RESOURCE(return_value,intern,le_gnupg); RETURN_RES(zend_register_resource(intern,le_gnupg));
} }
/* }}} */ /* }}} */
@ -493,7 +440,7 @@ PHP_FUNCTION(gnupg_init){
* >0 = on * >0 = on
* */ * */
PHP_FUNCTION(gnupg_setarmor){ PHP_FUNCTION(gnupg_setarmor){
long armor; zend_long armor;
GNUPG_GETOBJ(); GNUPG_GETOBJ();
@ -505,7 +452,7 @@ PHP_FUNCTION(gnupg_setarmor){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &res, &armor) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &res, &armor) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if(armor > 1){ if(armor > 1){
@ -519,7 +466,7 @@ PHP_FUNCTION(gnupg_setarmor){
/* {{{ proto bool gnupg_seterrormode(int errormde) */ /* {{{ proto bool gnupg_seterrormode(int errormde) */
PHP_FUNCTION(gnupg_seterrormode){ PHP_FUNCTION(gnupg_seterrormode){
long errormode; zend_long errormode;
GNUPG_GETOBJ(); GNUPG_GETOBJ();
@ -531,7 +478,7 @@ PHP_FUNCTION(gnupg_seterrormode){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &res, &errormode) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &res, &errormode) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
switch(errormode){ switch(errormode){
@ -539,11 +486,9 @@ PHP_FUNCTION(gnupg_seterrormode){
case 3: /* silent */ case 3: /* silent */
intern->errormode = errormode; intern->errormode = errormode;
break; break;
#ifdef ZEND_ENGINE_2
case 2: /* exception */ case 2: /* exception */
intern->errormode = errormode; intern->errormode = errormode;
break; break;
#endif
default: default:
GNUPG_ERR("invalid errormode"); GNUPG_ERR("invalid errormode");
} }
@ -554,7 +499,7 @@ PHP_FUNCTION(gnupg_seterrormode){
* sets the mode for signing operations * sets the mode for signing operations
*/ */
PHP_FUNCTION(gnupg_setsignmode){ PHP_FUNCTION(gnupg_setsignmode){
long signmode; zend_long signmode;
GNUPG_GETOBJ(); GNUPG_GETOBJ();
@ -566,7 +511,7 @@ PHP_FUNCTION(gnupg_setsignmode){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &res, &signmode) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &res, &signmode) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
switch(signmode){ switch(signmode){
case GPGME_SIG_MODE_NORMAL: case GPGME_SIG_MODE_NORMAL:
@ -593,12 +538,12 @@ PHP_FUNCTION(gnupg_geterror){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if(!intern->errortxt){ if(!intern->errortxt){
RETURN_FALSE; RETURN_FALSE;
}else{ }else{
RETURN_STRINGL(intern->errortxt, strlen(intern->errortxt), 1); RETURN_STRINGL(intern->errortxt, strlen(intern->errortxt));
} }
} }
/* }}} */ /* }}} */
@ -619,12 +564,12 @@ PHP_FUNCTION(gnupg_getprotocol){
PHP_FUNCTION(gnupg_keyinfo) PHP_FUNCTION(gnupg_keyinfo)
{ {
char *searchkey = NULL; char *searchkey = NULL;
int *searchkey_len; size_t searchkey_len;
zval *subarr; zval subarr;
zval *userid; zval userid;
zval *userids; zval userids;
zval *subkey; zval subkey;
zval *subkeys; zval subkeys;
gpgme_key_t gpgme_key; gpgme_key_t gpgme_key;
gpgme_subkey_t gpgme_subkey; gpgme_subkey_t gpgme_subkey;
@ -640,7 +585,7 @@ PHP_FUNCTION(gnupg_keyinfo)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &searchkey, &searchkey_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &searchkey, &searchkey_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_op_keylist_start(intern->ctx, searchkey, 0)) != GPG_ERR_NO_ERROR){ if((intern->err = gpgme_op_keylist_start(intern->ctx, searchkey, 0)) != GPG_ERR_NO_ERROR){
GNUPG_ERR("could not init keylist"); GNUPG_ERR("could not init keylist");
@ -650,69 +595,64 @@ PHP_FUNCTION(gnupg_keyinfo)
array_init(return_value); array_init(return_value);
while(!(intern->err = gpgme_op_keylist_next(intern->ctx, &gpgme_key))){ while(!(intern->err = gpgme_op_keylist_next(intern->ctx, &gpgme_key))){
ALLOC_INIT_ZVAL (subarr); array_init (&subarr);
array_init (subarr);
ALLOC_INIT_ZVAL (subkeys); array_init (&subkeys);
array_init (subkeys);
ALLOC_INIT_ZVAL (userids); array_init (&userids);
array_init (userids);
add_assoc_bool (subarr, "disabled", gpgme_key->disabled ); add_assoc_bool (&subarr, "disabled", gpgme_key->disabled );
add_assoc_bool (subarr, "expired", gpgme_key->expired ); add_assoc_bool (&subarr, "expired", gpgme_key->expired );
add_assoc_bool (subarr, "revoked", gpgme_key->revoked ); add_assoc_bool (&subarr, "revoked", gpgme_key->revoked );
add_assoc_bool (subarr, "is_secret", gpgme_key->secret ); add_assoc_bool (&subarr, "is_secret", gpgme_key->secret );
add_assoc_bool (subarr, "can_sign", gpgme_key->can_sign ); add_assoc_bool (&subarr, "can_sign", gpgme_key->can_sign );
add_assoc_bool (subarr, "can_encrypt", gpgme_key->can_encrypt ); add_assoc_bool (&subarr, "can_encrypt", gpgme_key->can_encrypt );
gpgme_userid = gpgme_key->uids; gpgme_userid = gpgme_key->uids;
while(gpgme_userid){ while(gpgme_userid){
ALLOC_INIT_ZVAL (userid); array_init (&userid);
array_init (userid);
add_assoc_string (userid, "name", gpgme_userid->name, 1); add_assoc_string (&userid, "name", gpgme_userid->name );
add_assoc_string (userid, "comment", gpgme_userid->comment, 1); add_assoc_string (&userid, "comment", gpgme_userid->comment );
add_assoc_string (userid, "email", gpgme_userid->email, 1); add_assoc_string (&userid, "email", gpgme_userid->email );
add_assoc_string (userid, "uid", gpgme_userid->uid, 1); add_assoc_string (&userid, "uid", gpgme_userid->uid );
add_assoc_bool (userid, "revoked", gpgme_userid->revoked ); add_assoc_bool (&userid, "revoked", gpgme_userid->revoked );
add_assoc_bool (userid, "invalid", gpgme_userid->invalid ); add_assoc_bool (&userid, "invalid", gpgme_userid->invalid );
add_next_index_zval (userids, userid); add_next_index_zval (&userids, &userid);
gpgme_userid = gpgme_userid->next; gpgme_userid = gpgme_userid->next;
} }
add_assoc_zval (subarr, "uids", userids); add_assoc_zval (&subarr, "uids", &userids);
gpgme_subkey = gpgme_key->subkeys; gpgme_subkey = gpgme_key->subkeys;
while(gpgme_subkey){ while(gpgme_subkey){
ALLOC_INIT_ZVAL (subkey); array_init (&subkey);
array_init (subkey);
if(gpgme_subkey->fpr){ if(gpgme_subkey->fpr){
add_assoc_string (subkey, "fingerprint", gpgme_subkey->fpr, 1); add_assoc_string (&subkey, "fingerprint", gpgme_subkey->fpr );
} }
add_assoc_string (subkey, "keyid", gpgme_subkey->keyid, 1); add_assoc_string (&subkey, "keyid", gpgme_subkey->keyid );
add_assoc_long (subkey, "timestamp", gpgme_subkey->timestamp ); add_assoc_long (&subkey, "timestamp", gpgme_subkey->timestamp );
add_assoc_long (subkey, "expires", gpgme_subkey->expires ); add_assoc_long (&subkey, "expires", gpgme_subkey->expires );
add_assoc_bool (subkey, "is_secret", gpgme_subkey->secret ); add_assoc_bool (&subkey, "is_secret", gpgme_subkey->secret );
add_assoc_bool (subkey, "invalid", gpgme_subkey->invalid ); add_assoc_bool (&subkey, "invalid", gpgme_subkey->invalid );
add_assoc_bool (subkey, "can_encrypt", gpgme_subkey->can_encrypt ); add_assoc_bool (&subkey, "can_encrypt", gpgme_subkey->can_encrypt );
add_assoc_bool (subkey, "can_sign", gpgme_subkey->can_sign ); add_assoc_bool (&subkey, "can_sign", gpgme_subkey->can_sign );
add_assoc_bool (subkey, "disabled", gpgme_subkey->disabled ); add_assoc_bool (&subkey, "disabled", gpgme_subkey->disabled );
add_assoc_bool (subkey, "expired", gpgme_subkey->expired ); add_assoc_bool (&subkey, "expired", gpgme_subkey->expired );
add_assoc_bool (subkey, "revoked", gpgme_subkey->revoked ); add_assoc_bool (&subkey, "revoked", gpgme_subkey->revoked );
add_next_index_zval (subkeys, subkey); add_next_index_zval (&subkeys, &subkey);
gpgme_subkey = gpgme_subkey->next; gpgme_subkey = gpgme_subkey->next;
} }
add_assoc_zval (subarr, "subkeys", subkeys); add_assoc_zval (&subarr, "subkeys", &subkeys);
add_next_index_zval (return_value, subarr); add_next_index_zval (return_value, &subarr);
gpgme_key_unref (gpgme_key); gpgme_key_unref (gpgme_key);
} }
return; return;
@ -722,9 +662,9 @@ PHP_FUNCTION(gnupg_keyinfo)
/* {{{ proto bool gnupg_addsignkey(string key) */ /* {{{ proto bool gnupg_addsignkey(string key) */
PHP_FUNCTION(gnupg_addsignkey){ PHP_FUNCTION(gnupg_addsignkey){
char *key_id = NULL; char *key_id = NULL;
int key_id_len; size_t key_id_len;
char *passphrase = NULL; char *passphrase = NULL;
int passphrase_len; size_t passphrase_len;
gpgme_key_t gpgme_key; gpgme_key_t gpgme_key;
gpgme_subkey_t gpgme_subkey; gpgme_subkey_t gpgme_subkey;
@ -739,7 +679,7 @@ PHP_FUNCTION(gnupg_addsignkey){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|s", &res, &key_id, &key_id_len, &passphrase, &passphrase_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|s", &res, &key_id, &key_id_len, &passphrase, &passphrase_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_get_key(intern->ctx, key_id, &gpgme_key, 1)) != GPG_ERR_NO_ERROR){ if((intern->err = gpgme_get_key(intern->ctx, key_id, &gpgme_key, 1)) != GPG_ERR_NO_ERROR){
GNUPG_ERR("get_key failed"); GNUPG_ERR("get_key failed");
@ -749,7 +689,7 @@ PHP_FUNCTION(gnupg_addsignkey){
gpgme_subkey = gpgme_key->subkeys; gpgme_subkey = gpgme_key->subkeys;
while(gpgme_subkey){ while(gpgme_subkey){
if(gpgme_subkey->can_sign == 1){ if(gpgme_subkey->can_sign == 1){
zend_hash_add(intern->signkeys, (char *) gpgme_subkey->keyid, (uint) strlen(gpgme_subkey->keyid)+1, passphrase, (uint) passphrase_len+1, NULL); zend_hash_str_add_ptr(intern->signkeys, (char *) gpgme_subkey->keyid, (uint) strlen(gpgme_subkey->keyid), passphrase);
} }
gpgme_subkey = gpgme_subkey->next; gpgme_subkey = gpgme_subkey->next;
} }
@ -766,9 +706,9 @@ PHP_FUNCTION(gnupg_addsignkey){
/* {{{ proto bool gnupg_adddecryptkey(string key) */ /* {{{ proto bool gnupg_adddecryptkey(string key) */
PHP_FUNCTION(gnupg_adddecryptkey){ PHP_FUNCTION(gnupg_adddecryptkey){
char *key_id = NULL; char *key_id = NULL;
int key_id_len; size_t key_id_len;
char *passphrase = NULL; char *passphrase = NULL;
int passphrase_len; size_t passphrase_len;
gpgme_key_t gpgme_key; gpgme_key_t gpgme_key;
gpgme_subkey_t gpgme_subkey; gpgme_subkey_t gpgme_subkey;
@ -783,7 +723,7 @@ PHP_FUNCTION(gnupg_adddecryptkey){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &res, &key_id, &key_id_len, &passphrase, &passphrase_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &res, &key_id, &key_id_len, &passphrase, &passphrase_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_get_key(intern->ctx, key_id, &gpgme_key, 1)) != GPG_ERR_NO_ERROR){ if((intern->err = gpgme_get_key(intern->ctx, key_id, &gpgme_key, 1)) != GPG_ERR_NO_ERROR){
GNUPG_ERR("get_key failed"); GNUPG_ERR("get_key failed");
@ -792,7 +732,7 @@ PHP_FUNCTION(gnupg_adddecryptkey){
gpgme_subkey = gpgme_key->subkeys; gpgme_subkey = gpgme_key->subkeys;
while(gpgme_subkey){ while(gpgme_subkey){
if(gpgme_subkey->secret == 1){ if(gpgme_subkey->secret == 1){
zend_hash_add(intern->decryptkeys, (char *) gpgme_subkey->keyid, (uint) strlen(gpgme_subkey->keyid)+1, passphrase, (uint) passphrase_len+1, NULL); zend_hash_str_add_ptr(intern->decryptkeys, (char *) gpgme_subkey->keyid, strlen(gpgme_subkey->keyid), passphrase);
} }
gpgme_subkey = gpgme_subkey->next; gpgme_subkey = gpgme_subkey->next;
} }
@ -804,7 +744,7 @@ PHP_FUNCTION(gnupg_adddecryptkey){
/* {{{ proto bool gnupg_addencryptkey(string key) */ /* {{{ proto bool gnupg_addencryptkey(string key) */
PHP_FUNCTION(gnupg_addencryptkey){ PHP_FUNCTION(gnupg_addencryptkey){
char *key_id = NULL; char *key_id = NULL;
int key_id_len; size_t key_id_len;
gpgme_key_t gpgme_key = NULL; gpgme_key_t gpgme_key = NULL;
@ -818,7 +758,7 @@ PHP_FUNCTION(gnupg_addencryptkey){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &key_id, &key_id_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &key_id, &key_id_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_get_key(intern->ctx, key_id, &gpgme_key, 0)) != GPG_ERR_NO_ERROR){ if((intern->err = gpgme_get_key(intern->ctx, key_id, &gpgme_key, 0)) != GPG_ERR_NO_ERROR){
@ -843,7 +783,7 @@ PHP_FUNCTION(gnupg_clearsignkeys){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
gpgme_signers_clear (intern->ctx); gpgme_signers_clear (intern->ctx);
@ -862,7 +802,7 @@ PHP_FUNCTION(gnupg_clearencryptkeys){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
gnupg_free_encryptkeys(intern TSRMLS_CC); gnupg_free_encryptkeys(intern TSRMLS_CC);
@ -880,7 +820,7 @@ PHP_FUNCTION(gnupg_cleardecryptkeys){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
zend_hash_clean(intern->decryptkeys); zend_hash_clean(intern->decryptkeys);
@ -895,7 +835,7 @@ PHP_FUNCTION(gnupg_cleardecryptkeys){
*/ */
PHP_FUNCTION(gnupg_sign){ PHP_FUNCTION(gnupg_sign){
char *value = NULL; char *value = NULL;
int value_len; size_t value_len;
char *userret; char *userret;
size_t ret_size; size_t ret_size;
@ -913,7 +853,7 @@ PHP_FUNCTION(gnupg_sign){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &value, &value_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &value, &value_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
gpgme_set_passphrase_cb (intern->ctx, (void*) passphrase_cb, intern); gpgme_set_passphrase_cb (intern->ctx, (void*) passphrase_cb, intern);
@ -952,7 +892,7 @@ PHP_FUNCTION(gnupg_sign){
if(ret_size < 1){ if(ret_size < 1){
RETVAL_FALSE; RETVAL_FALSE;
}else{ }else{
RETVAL_STRINGL (userret,ret_size,1); RETVAL_STRINGL (userret,ret_size);
} }
gpgme_data_release (in); gpgme_data_release (in);
free (userret); free (userret);
@ -966,7 +906,7 @@ PHP_FUNCTION(gnupg_sign){
*/ */
PHP_FUNCTION(gnupg_encrypt){ PHP_FUNCTION(gnupg_encrypt){
char *value = NULL; char *value = NULL;
int value_len; size_t value_len;
char *userret = NULL; char *userret = NULL;
size_t ret_size; size_t ret_size;
@ -983,7 +923,7 @@ PHP_FUNCTION(gnupg_encrypt){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &value, &value_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &value, &value_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if(!intern->encryptkeys){ if(!intern->encryptkeys){
GNUPG_ERR("no key for encryption set"); GNUPG_ERR("no key for encryption set");
@ -1013,7 +953,7 @@ PHP_FUNCTION(gnupg_encrypt){
} }
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);
RETVAL_STRINGL (userret,ret_size,1); RETVAL_STRINGL (userret,ret_size);
free (userret); free (userret);
if(ret_size < 1){ if(ret_size < 1){
RETURN_FALSE; RETURN_FALSE;
@ -1027,7 +967,7 @@ PHP_FUNCTION(gnupg_encrypt){
*/ */
PHP_FUNCTION(gnupg_encryptsign){ PHP_FUNCTION(gnupg_encryptsign){
char *value = NULL; char *value = NULL;
int value_len; size_t value_len;
char *userret = NULL; char *userret = NULL;
size_t ret_size; size_t ret_size;
@ -1045,7 +985,7 @@ PHP_FUNCTION(gnupg_encryptsign){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &value, &value_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &value, &value_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if(!intern->encryptkeys){ if(!intern->encryptkeys){
@ -1096,7 +1036,7 @@ PHP_FUNCTION(gnupg_encryptsign){
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);
RETVAL_STRINGL (userret,ret_size,1); RETVAL_STRINGL (userret,ret_size);
free (userret); free (userret);
if(ret_size < 1){ if(ret_size < 1){
RETURN_FALSE; RETURN_FALSE;
@ -1128,7 +1068,7 @@ PHP_FUNCTION(gnupg_verify){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzz|z", &res, &signed_text, &signature, &plain_text) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzz|z", &res, &signed_text, &signature, &plain_text) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if(Z_STRVAL_P(signature)){ /* detached signature */ if(Z_STRVAL_P(signature)){ /* detached signature */
/* setup signature-databuffer for gpgme */ /* setup signature-databuffer for gpgme */
@ -1180,7 +1120,7 @@ PHP_FUNCTION(gnupg_verify){
/* get a 'plain' version of the text without a signature */ /* get a 'plain' version of the text without a signature */
gpg_plain = gpgme_data_release_and_get_mem(gpgme_text,&gpg_plain_len); gpg_plain = gpgme_data_release_and_get_mem(gpgme_text,&gpg_plain_len);
if(gpg_plain && gpg_plain_len > 0 && plain_text){ if(gpg_plain && gpg_plain_len > 0 && plain_text){
ZVAL_STRINGL (plain_text, gpg_plain,gpg_plain_len,1); ZVAL_STRINGL (plain_text, gpg_plain,gpg_plain_len);
} }
free (gpg_plain); free (gpg_plain);
} }
@ -1193,7 +1133,7 @@ PHP_FUNCTION(gnupg_verify){
*/ */
PHP_FUNCTION(gnupg_decrypt){ PHP_FUNCTION(gnupg_decrypt){
char *enctxt; char *enctxt;
int enctxt_len; size_t enctxt_len;
char *userret; char *userret;
size_t ret_size; size_t ret_size;
@ -1211,7 +1151,7 @@ PHP_FUNCTION(gnupg_decrypt){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &enctxt, &enctxt_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &enctxt, &enctxt_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
gpgme_set_passphrase_cb (intern->ctx, (void*) passphrase_decrypt_cb, intern); gpgme_set_passphrase_cb (intern->ctx, (void*) passphrase_decrypt_cb, intern);
@ -1242,7 +1182,7 @@ PHP_FUNCTION(gnupg_decrypt){
} }
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);
RETVAL_STRINGL (userret,ret_size,1); RETVAL_STRINGL (userret,ret_size);
free (userret); free (userret);
if(ret_size < 1){ if(ret_size < 1){
RETVAL_FALSE; RETVAL_FALSE;
@ -1255,7 +1195,7 @@ PHP_FUNCTION(gnupg_decrypt){
*/ */
PHP_FUNCTION(gnupg_decryptverify){ PHP_FUNCTION(gnupg_decryptverify){
char *enctxt; char *enctxt;
int enctxt_len; size_t enctxt_len;
zval *plaintext; zval *plaintext;
char *userret; char *userret;
@ -1275,7 +1215,7 @@ PHP_FUNCTION(gnupg_decryptverify){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz", &res, &enctxt, &enctxt_len, &plaintext) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsz", &res, &enctxt, &enctxt_len, &plaintext) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
gpgme_set_passphrase_cb (intern->ctx, (void*) passphrase_decrypt_cb, intern); gpgme_set_passphrase_cb (intern->ctx, (void*) passphrase_decrypt_cb, intern);
@ -1298,7 +1238,7 @@ PHP_FUNCTION(gnupg_decryptverify){
return; return;
} }
userret = gpgme_data_release_and_get_mem(out,&ret_size); userret = gpgme_data_release_and_get_mem(out,&ret_size);
ZVAL_STRINGL (plaintext,userret,ret_size,1); ZVAL_STRINGL (plaintext,userret,ret_size);
free (userret); free (userret);
decrypt_result = gpgme_op_decrypt_result (intern->ctx); decrypt_result = gpgme_op_decrypt_result (intern->ctx);
if (decrypt_result->unsupported_algorithm){ if (decrypt_result->unsupported_algorithm){
@ -1322,7 +1262,7 @@ PHP_FUNCTION(gnupg_decryptverify){
*/ */
PHP_FUNCTION(gnupg_export){ PHP_FUNCTION(gnupg_export){
char *searchkey = NULL; char *searchkey = NULL;
int *searchkey_len; size_t searchkey_len;
char *userret; char *userret;
size_t ret_size; size_t ret_size;
@ -1338,7 +1278,7 @@ PHP_FUNCTION(gnupg_export){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &searchkey, &searchkey_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &searchkey, &searchkey_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_data_new (&out))!=GPG_ERR_NO_ERROR){ if((intern->err = gpgme_data_new (&out))!=GPG_ERR_NO_ERROR){
GNUPG_ERR("could not create data buffer"); GNUPG_ERR("could not create data buffer");
@ -1350,7 +1290,7 @@ PHP_FUNCTION(gnupg_export){
return; return;
} }
userret = gpgme_data_release_and_get_mem(out,&ret_size); userret = gpgme_data_release_and_get_mem(out,&ret_size);
RETVAL_STRINGL (userret,ret_size,1); RETVAL_STRINGL (userret,ret_size);
if(ret_size < 1){ if(ret_size < 1){
RETVAL_FALSE; RETVAL_FALSE;
} }
@ -1363,7 +1303,7 @@ PHP_FUNCTION(gnupg_export){
*/ */
PHP_FUNCTION(gnupg_import){ PHP_FUNCTION(gnupg_import){
char *importkey = NULL; char *importkey = NULL;
int importkey_len; size_t importkey_len;
gpgme_data_t in; gpgme_data_t in;
gpgme_import_result_t result; gpgme_import_result_t result;
@ -1378,7 +1318,7 @@ PHP_FUNCTION(gnupg_import){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &importkey, &importkey_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &importkey, &importkey_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_data_new_from_mem (&in, importkey, importkey_len, 0))!=GPG_ERR_NO_ERROR){ if((intern->err = gpgme_data_new_from_mem (&in, importkey, importkey_len, 0))!=GPG_ERR_NO_ERROR){
GNUPG_ERR("could not create in-data buffer"); GNUPG_ERR("could not create in-data buffer");
@ -1405,7 +1345,7 @@ PHP_FUNCTION(gnupg_import){
add_assoc_long (return_value, "newsignatures", result->new_signatures); add_assoc_long (return_value, "newsignatures", result->new_signatures);
add_assoc_long (return_value, "skippedkeys", result->skipped_new_keys); add_assoc_long (return_value, "skippedkeys", result->skipped_new_keys);
if(result->imports && result->imports->fpr){ if(result->imports && result->imports->fpr){
add_assoc_string (return_value, "fingerprint", result->imports->fpr, 1); add_assoc_string (return_value, "fingerprint", result->imports->fpr);
} }
} }
/* }}} */ /* }}} */
@ -1415,8 +1355,8 @@ PHP_FUNCTION(gnupg_import){
*/ */
PHP_FUNCTION(gnupg_deletekey){ PHP_FUNCTION(gnupg_deletekey){
char *key; char *key;
int key_len; size_t key_len;
long allow_secret = 0; zend_long allow_secret = 0;
gpgme_key_t gpgme_key; gpgme_key_t gpgme_key;
@ -1430,7 +1370,7 @@ PHP_FUNCTION(gnupg_deletekey){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &res, &key, &key_len, &allow_secret) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &res, &key, &key_len, &allow_secret) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_get_key(intern->ctx, key, &gpgme_key, 0)) != GPG_ERR_NO_ERROR){ if((intern->err = gpgme_get_key(intern->ctx, key, &gpgme_key, 0)) != GPG_ERR_NO_ERROR){
@ -1452,8 +1392,8 @@ PHP_FUNCTION(gnupg_deletekey){
*/ */
PHP_FUNCTION(gnupg_gettrustlist){ PHP_FUNCTION(gnupg_gettrustlist){
char *pattern; char *pattern;
int pattern_len; size_t pattern_len;
zval *sub_arr; zval sub_arr;
gpgme_trust_item_t item; gpgme_trust_item_t item;
@ -1467,7 +1407,7 @@ PHP_FUNCTION(gnupg_gettrustlist){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &pattern, &pattern_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &pattern, &pattern_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_op_trustlist_start (intern->ctx, pattern, 0))!=GPG_ERR_NO_ERROR){ if((intern->err = gpgme_op_trustlist_start (intern->ctx, pattern, 0))!=GPG_ERR_NO_ERROR){
GNUPG_ERR("could not start trustlist"); GNUPG_ERR("could not start trustlist");
@ -1475,17 +1415,16 @@ PHP_FUNCTION(gnupg_gettrustlist){
} }
array_init(return_value); array_init(return_value);
while (!(intern->err = gpgme_op_trustlist_next (intern->ctx, &item))){ while (!(intern->err = gpgme_op_trustlist_next (intern->ctx, &item))){
ALLOC_INIT_ZVAL (sub_arr); array_init (&sub_arr);
array_init (sub_arr);
add_assoc_long (sub_arr, "level", item->level ); add_assoc_long (&sub_arr, "level", item->level );
add_assoc_long (sub_arr, "type", item->type ); add_assoc_long (&sub_arr, "type", item->type );
add_assoc_string (sub_arr, "keyid", item->keyid, 1); add_assoc_string (&sub_arr, "keyid", item->keyid );
add_assoc_string (sub_arr, "ownertrust", item->owner_trust, 1); add_assoc_string (&sub_arr, "ownertrust", item->owner_trust );
add_assoc_string (sub_arr, "validity", item->validity, 1); add_assoc_string (&sub_arr, "validity", item->validity );
add_assoc_string (sub_arr, "name", item->name, 1); add_assoc_string (&sub_arr, "name", item->name );
gpgme_trust_item_unref (item); gpgme_trust_item_unref (item);
add_next_index_zval (return_value, sub_arr); add_next_index_zval (return_value, &sub_arr);
} }
} }
/* }}} */ /* }}} */
@ -1493,10 +1432,10 @@ PHP_FUNCTION(gnupg_gettrustlist){
/* {{{ proto array gnupg_listsignatures(string keyid) */ /* {{{ proto array gnupg_listsignatures(string keyid) */
PHP_FUNCTION(gnupg_listsignatures){ PHP_FUNCTION(gnupg_listsignatures){
char *keyid; char *keyid;
int keyid_len; size_t keyid_len;
zval *sub_arr; zval sub_arr;
zval *sig_arr; zval sig_arr;
gpgme_key_t gpgme_key; gpgme_key_t gpgme_key;
gpgme_user_id_t gpgme_userid; gpgme_user_id_t gpgme_userid;
@ -1512,7 +1451,7 @@ PHP_FUNCTION(gnupg_listsignatures){
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &keyid, &keyid_len) == FAILURE){ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &res, &keyid, &keyid_len) == FAILURE){
return; return;
} }
ZEND_FETCH_RESOURCE(intern,gnupg_object *, &res, -1, "ctx", le_gnupg); intern = (gnupg_object *) zend_fetch_resource(Z_RES_P(res), "ctx", le_gnupg);
} }
if((intern->err = gpgme_set_keylist_mode(intern->ctx,GPGME_KEYLIST_MODE_SIGS))!=GPG_ERR_NO_ERROR){ if((intern->err = gpgme_set_keylist_mode(intern->ctx,GPGME_KEYLIST_MODE_SIGS))!=GPG_ERR_NO_ERROR){
GNUPG_ERR("could not switch to sigmode"); GNUPG_ERR("could not switch to sigmode");
@ -1530,25 +1469,23 @@ PHP_FUNCTION(gnupg_listsignatures){
array_init(return_value); array_init(return_value);
gpgme_userid = gpgme_key->uids; gpgme_userid = gpgme_key->uids;
while(gpgme_userid){ while(gpgme_userid){
ALLOC_INIT_ZVAL (sub_arr); array_init (&sub_arr);
array_init (sub_arr);
gpgme_signature = gpgme_userid->signatures; gpgme_signature = gpgme_userid->signatures;
while(gpgme_signature){ while(gpgme_signature){
ALLOC_INIT_ZVAL (sig_arr); array_init (&sig_arr);
array_init (sig_arr);
add_assoc_string (sig_arr, "uid", gpgme_signature->uid, 1); add_assoc_string (&sig_arr, "uid", gpgme_signature->uid );
add_assoc_string (sig_arr, "name", gpgme_signature->name, 1); add_assoc_string (&sig_arr, "name", gpgme_signature->name );
add_assoc_string (sig_arr, "email", gpgme_signature->email, 1); add_assoc_string (&sig_arr, "email", gpgme_signature->email );
add_assoc_string (sig_arr, "comment", gpgme_signature->comment, 1); add_assoc_string (&sig_arr, "comment", gpgme_signature->comment );
add_assoc_long (sig_arr, "expires", gpgme_signature->expires ); add_assoc_long (&sig_arr, "expires", gpgme_signature->expires );
add_assoc_bool (sig_arr, "revoked", gpgme_signature->revoked ); add_assoc_bool (&sig_arr, "revoked", gpgme_signature->revoked );
add_assoc_bool (sig_arr, "expired", gpgme_signature->expired ); add_assoc_bool (&sig_arr, "expired", gpgme_signature->expired );
add_assoc_bool (sig_arr, "invalid", gpgme_signature->invalid ); add_assoc_bool (&sig_arr, "invalid", gpgme_signature->invalid );
add_assoc_zval (sub_arr,gpgme_signature->keyid,sig_arr); add_assoc_zval (&sub_arr, gpgme_signature->keyid, &sig_arr);
gpgme_signature = gpgme_signature->next; gpgme_signature = gpgme_signature->next;
} }
add_assoc_zval (return_value,gpgme_userid->uid,sub_arr); add_assoc_zval (return_value,gpgme_userid->uid, &sub_arr);
gpgme_userid = gpgme_userid->next; gpgme_userid = gpgme_userid->next;
} }
gpgme_key_unref(gpgme_key); gpgme_key_unref(gpgme_key);

41
gnupg_keylistiterator.c
View file

@ -19,8 +19,6 @@
#include "php.h" #include "php.h"
#ifdef ZEND_ENGINE_2
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "zend_interfaces.h" #include "zend_interfaces.h"
@ -37,7 +35,7 @@ static zend_object_handlers gnupg_keylistiterator_object_handlers;
zval *this = getThis(); \ zval *this = getThis(); \
gnupg_keylistiterator_object *intern = NULL; \ gnupg_keylistiterator_object *intern = NULL; \
if(this){ \ if(this){ \
intern = (gnupg_keylistiterator_object*) zend_object_store_get_object(getThis() TSRMLS_CC); \ intern = Z_KEYLISTITERATORO_P(getThis() TSRMLS_CC); \
if(!intern){ \ if(!intern){ \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized gnupg object"); \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or unitialized gnupg object"); \
RETURN_FALSE; \ RETURN_FALSE; \
@ -46,44 +44,36 @@ static zend_object_handlers gnupg_keylistiterator_object_handlers;
/* }}} */ /* }}} */
/* {{{ free_iterator_storage */ /* {{{ free_iterator_storage */
static void gnupg_keylistiterator_dtor(gnupg_keylistiterator_object *intern TSRMLS_DC){ static void gnupg_keylistiterator_dtor(zend_object *z_obj TSRMLS_DC){
if(!intern){ gnupg_keylistiterator_object *intern;
return; intern = keylistiterator_object_from_obj(z_obj);
}
gpgme_op_keylist_end(intern->ctx); gpgme_op_keylist_end(intern->ctx);
gpgme_key_release(intern->gpgkey); gpgme_key_release(intern->gpgkey);
gpgme_release(intern->ctx); gpgme_release(intern->ctx);
/* /*
zval_dtor(&intern->pattern); zval_dtor(&intern->pattern);
*/ */
#if ZEND_MODULE_API_NO >= 20100525 zend_object_std_dtor(&intern->zo);
intern->zo.properties_table = NULL;
#endif
if(intern->zo.properties){
zend_hash_destroy(intern->zo.properties);
FREE_HASHTABLE(intern->zo.properties);
}
efree(intern); efree(intern);
} }
/* }}} */ /* }}} */
/* {{{ keylistiterator_objects_new */ /* {{{ keylistiterator_objects_new */
zend_object_value gnupg_keylistiterator_objects_new(zend_class_entry *class_type TSRMLS_DC){ static zend_object* gnupg_keylistiterator_objects_new(zend_class_entry *class_type TSRMLS_DC){
gnupg_keylistiterator_object *intern; gnupg_keylistiterator_object *intern;
zend_object_value retval;
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
intern = emalloc(sizeof(gnupg_keylistiterator_object)); intern = ecalloc(1, sizeof(gnupg_keylistiterator_object) + zend_object_properties_size(class_type));
intern->zo.ce = class_type;
zend_object_std_init(&intern->zo, class_type TSRMLS_CC); zend_object_std_init(&intern->zo, class_type);
retval.handle = zend_objects_store_put(intern,NULL,(zend_objects_free_object_storage_t) gnupg_keylistiterator_dtor,NULL TSRMLS_CC); object_properties_init(&intern->zo, class_type);
retval.handlers = (zend_object_handlers *) & gnupg_keylistiterator_object_handlers; intern->zo.handlers = &gnupg_keylistiterator_object_handlers;
gpgme_check_version(NULL); gpgme_check_version(NULL);
gpgme_new(&ctx); gpgme_new(&ctx);
intern->ctx = ctx; intern->ctx = ctx;
return retval; return &intern->zo;
} }
/* }}} */ /* }}} */
@ -120,7 +110,7 @@ int _gnupg_keylistiterator_init(INIT_FUNC_ARGS)
PHP_METHOD(gnupg_keylistiterator,__construct){ PHP_METHOD(gnupg_keylistiterator,__construct){
zval *pattern; zval *pattern = NULL;
int args = ZEND_NUM_ARGS(); int args = ZEND_NUM_ARGS();
@ -139,13 +129,13 @@ PHP_METHOD(gnupg_keylistiterator,__construct){
PHP_METHOD(gnupg_keylistiterator,current){ PHP_METHOD(gnupg_keylistiterator,current){
GNUPG_GET_ITERATOR(); GNUPG_GET_ITERATOR();
RETURN_STRING(intern->gpgkey->uids[0].uid,1); RETURN_STRING(intern->gpgkey->uids[0].uid);
} }
PHP_METHOD(gnupg_keylistiterator,key){ PHP_METHOD(gnupg_keylistiterator,key){
GNUPG_GET_ITERATOR(); GNUPG_GET_ITERATOR();
RETURN_STRING(intern->gpgkey->subkeys[0].fpr,1); RETURN_STRING(intern->gpgkey->subkeys[0].fpr);
} }
PHP_METHOD(gnupg_keylistiterator,next){ PHP_METHOD(gnupg_keylistiterator,next){
@ -183,7 +173,6 @@ PHP_METHOD(gnupg_keylistiterator,valid){
RETURN_FALSE; RETURN_FALSE;
} }
} }
#endif /* ZEND_ENGINE_2 */
/* /*
* Local variables: * Local variables:

12
php_gnupg.h
View file

@ -34,7 +34,6 @@ extern zend_module_entry gnupg_module_entry;
#include <gpgme.h> #include <gpgme.h>
typedef struct gnupg_object{ typedef struct gnupg_object{
zend_object zo;
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
gpgme_error_t err; gpgme_error_t err;
int errormode; int errormode;
@ -44,10 +43,21 @@ typedef struct gnupg_object{
unsigned int encrypt_size; unsigned int encrypt_size;
HashTable *signkeys; HashTable *signkeys;
HashTable *decryptkeys; HashTable *decryptkeys;
zend_object zo;
} gnupg_object; } gnupg_object;
static zend_class_entry *gnupg_class_entry; static zend_class_entry *gnupg_class_entry;
static inline gnupg_object *gnupg_object_from_obj(zend_object *obj) /* {{{ */ {
return (gnupg_object*)((char*)(obj) - XtOffsetOf(gnupg_object, zo));
}
/* }}} */
static inline gnupg_object *Z_GNUPGO_P(zval *zv) /* {{{ */ {
return gnupg_object_from_obj(Z_OBJ_P((zv)));
}
/* }}} */
PHP_MINIT_FUNCTION(gnupg); PHP_MINIT_FUNCTION(gnupg);
PHP_MSHUTDOWN_FUNCTION(gnupg); PHP_MSHUTDOWN_FUNCTION(gnupg);
PHP_MINFO_FUNCTION(gnupg); PHP_MINFO_FUNCTION(gnupg);

12
php_gnupg_keylistiterator.h
View file

@ -34,15 +34,25 @@ extern zend_module_entry gnupg_keyiterator_module_entry;
extern int _gnupg_keylistiterator_init(INIT_FUNC_ARGS); extern int _gnupg_keylistiterator_init(INIT_FUNC_ARGS);
typedef struct _gnupg_keylistiterator_object{ typedef struct _gnupg_keylistiterator_object{
zend_object zo;
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
gpgme_error_t err; gpgme_error_t err;
gpgme_key_t gpgkey; gpgme_key_t gpgkey;
zval pattern; zval pattern;
zend_object zo;
} gnupg_keylistiterator_object; } gnupg_keylistiterator_object;
static zend_class_entry *gnupg_keylistiterator_class_entry; static zend_class_entry *gnupg_keylistiterator_class_entry;
static inline gnupg_keylistiterator_object *keylistiterator_object_from_obj(zend_object *obj) /* {{{ */ {
return (gnupg_keylistiterator_object*)((char*)(obj) - XtOffsetOf(gnupg_keylistiterator_object, zo));
}
/* }}} */
static inline gnupg_keylistiterator_object *Z_KEYLISTITERATORO_P(zval *zv) /* {{{ */ {
return keylistiterator_object_from_obj(Z_OBJ_P((zv)));
}
/* }}} */
PHP_METHOD(gnupg_keylistiterator, __construct); PHP_METHOD(gnupg_keylistiterator, __construct);
PHP_METHOD(gnupg_keylistiterator, current); PHP_METHOD(gnupg_keylistiterator, current);
PHP_METHOD(gnupg_keylistiterator, next); PHP_METHOD(gnupg_keylistiterator, next);