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

error checking and ensure we check version

Browse source
This commit is contained in:
Jim Jagielski 2013-07-17 12:54:49 +00:00
parent 0bfb5d8a50
commit 48472e9516
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnupg.c
View file

@ -136,12 +136,15 @@ static void gnupg_res_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
static void gnupg_res_init(gnupg_object *intern TSRMLS_DC){ static void gnupg_res_init(gnupg_object *intern TSRMLS_DC){
/* init the gpgme-lib and set the default values */ /* init the gpgme-lib and set the default values */
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
gpgme_error_t err;
gpgme_check_version (NULL); gpgme_check_version (NULL);
gpgme_new (&ctx); err = gpgme_new(&ctx);
if(err == GPG_ERR_NO_ERROR) {
#ifdef GNUPG_PATH #ifdef GNUPG_PATH
gpgme_ctx_set_engine_info(ctx, GPGME_PROTOCOL_OpenPGP, GNUPG_PATH, NULL); gpgme_ctx_set_engine_info(ctx, GPGME_PROTOCOL_OpenPGP, GNUPG_PATH, NULL);
#endif #endif
gpgme_set_armor (ctx,1); gpgme_set_armor (ctx,1);
}
intern->ctx = ctx; intern->ctx = ctx;
intern->encryptkeys = NULL; intern->encryptkeys = NULL;
intern->encrypt_size = 0; intern->encrypt_size = 0;

1
gnupg_keylistiterator.c
View file

@ -80,6 +80,7 @@ zend_object_value gnupg_keylistiterator_objects_new(zend_class_entry *class_type
retval.handle = zend_objects_store_put(intern,NULL,(zend_objects_free_object_storage_t) gnupg_keylistiterator_dtor,NULL TSRMLS_CC); retval.handle = zend_objects_store_put(intern,NULL,(zend_objects_free_object_storage_t) gnupg_keylistiterator_dtor,NULL TSRMLS_CC);
retval.handlers = (zend_object_handlers *) & gnupg_keylistiterator_object_handlers; retval.handlers = (zend_object_handlers *) & gnupg_keylistiterator_object_handlers;
gpgme_check_version(NULL);
gpgme_new(&ctx); gpgme_new(&ctx);
intern->ctx = ctx; intern->ctx = ctx;
return retval; return retval;