com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/openssl/openssl.c

From: Date: Mon, 01 Dec 2014 02:24:23 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/openssl/openssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83408@lists.php.net to get a copy of this message
Commit: 8c08124c0ea18bc45c1b64a33953029c2c91d658 Author: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 18:18:30 -0800 Parents: aae5d4d9db27a11f9118546fa16c57132704b889 6048ac32b4e8fc5dacb89af7e4408e3116609317 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8c08124c0ea18bc45c1b64a33953029c2c91d658 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Adds test cases for openssl EC improvements Adds better handling of EC keys: OPENSSL_KEYTYPE_EC Changed paths: MM NEWS MM ext/openssl/openssl.c Diff: diff --cc NEWS index 51387f6,10e84d0..fddedb5 --- a/NEWS +++ b/NEWS @@@ -10,6 -10,6 +10,9 @@@ PH . Fixed bug #68504 (--with-libmbfl configure option not present on Windows). (Ashesh Vashi) ++- OpenSSL: ++ . Improved handling of OPENSSL_KEYTYPE_EC keys. (Dominic Luechinger) ++ - pcntl: . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler when setting SIG_DFL). (Julien) diff --cc ext/openssl/openssl.c index 686fade,b221d96...00fd444 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -3881,7 -3484,44 +3910,41 @@@ PHP_FUNCTION(openssl_pkey_get_details #ifdef HAVE_EVP_PKEY_EC case EVP_PKEY_EC: ktype = OPENSSL_KEYTYPE_EC; - if (pkey->pkey.ec == NULL) { - break; - } - { - zval *ec; - const EC_GROUP *ec_group; - int nid; - char *crv_sn; - ASN1_OBJECT *obj; - // openssl recommends a buffer length of 80 - char oir_buf[80]; - - ec_group = EC_KEY_get0_group(EVP_PKEY_get1_EC_KEY(pkey)); - - // Curve nid (numerical identifier) used for ASN1 mapping - nid = EC_GROUP_get_curve_name(ec_group); - if (nid == NID_undef) { - break; - } - ALLOC_INIT_ZVAL(ec); - array_init(ec); ++ if (pkey->pkey.ec != NULL) { ++ zval *ec; ++ const EC_GROUP *ec_group; ++ int nid; ++ char *crv_sn; ++ ASN1_OBJECT *obj; ++ // openssl recommends a buffer length of 80 ++ char oir_buf[80]; + - // Short object name - crv_sn = (char*) OBJ_nid2sn(nid); - if (crv_sn != NULL) { - add_assoc_string(ec, "curve_name", crv_sn, 1); - } ++ ec_group = EC_KEY_get0_group(EVP_PKEY_get1_EC_KEY(pkey)); + - obj = OBJ_nid2obj(nid); - if (obj != NULL) { - int oir_len = OBJ_obj2txt(oir_buf, sizeof(oir_buf), obj, 1); - add_assoc_stringl(ec, "curve_oid", (char*)oir_buf, oir_len, 1); - ASN1_OBJECT_free(obj); - } ++ // Curve nid (numerical identifier) used for ASN1 mapping ++ nid = EC_GROUP_get_curve_name(ec_group); ++ if (nid == NID_undef) { ++ break; ++ } ++ ALLOC_INIT_ZVAL(ec); ++ array_init(ec); ++ ++ // Short object name ++ crv_sn = (char*) OBJ_nid2sn(nid); ++ if (crv_sn != NULL) { ++ add_assoc_string(ec, "curve_name", crv_sn, 1); ++ } ++ ++ obj = OBJ_nid2obj(nid); ++ if (obj != NULL) { ++ int oir_len = OBJ_obj2txt(oir_buf, sizeof(oir_buf), obj, 1); ++ add_assoc_stringl(ec, "curve_oid", (char*)oir_buf, oir_len, 1); ++ ASN1_OBJECT_free(obj); ++ } + - add_assoc_zval(return_value, "ec", ec); ++ add_assoc_zval(return_value, "ec", ec); ++ } break; - } #endif default: ktype = -1;

« previous php.cvs (#83408) next »