com php-src: Merge branch 'PHP-5.6': ext/date/php_date.c ext/openssl/openssl.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Dec 2014 02:32:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/date/php_date.c ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83405@lists.php.net to get a copy of this message | ||
Commit: c64949626dd21ec571f48a54d187da4c9ad312b7
Author: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 18:32:56 -0800
Parents: 25e3e78016572cf86e4dff7bb0179f639abd5603 de65eaa8c8faf6ae256aef3a2a074255b249a6f0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c64949626dd21ec571f48a54d187da4c9ad312b7
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Fixes memory leak introduced in 2b9af967
Conflicts:
ext/openssl/openssl.c
Changed paths:
MM ext/date/php_date.c
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index 147a9ec,00fd444..60d36ff
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -3879,42 -3910,40 +3879,39 @@@ 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];
+ if (pkey->pkey.ec != NULL) {
- zval *ec;
++ 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));
+ 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;
- }
+ // 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);
++ array_init(&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);
++ add_assoc_string(&ec, "curve_name", crv_sn);
+ }
- // Short object name
- crv_sn = (char*) OBJ_nid2sn(nid);
- if (crv_sn != NULL) {
- add_assoc_string(&ec, "curve_name", crv_sn);
- }
+ 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);
++ add_assoc_stringl(&ec, "curve_oid", (char*)oir_buf, oir_len);
+ ASN1_OBJECT_free(obj);
+ }
- 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);
- ASN1_OBJECT_free(obj);
- add_assoc_zval(return_value, "ec", ec);
++ add_assoc_zval(return_value, "ec", &ec);
}
-
- add_assoc_zval(return_value, "ec", &ec);
break;
#endif
default: