Fix patch to work against PHP7

This also updates the testcases so they now return correct data
with the extra return value.

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 1efe050ab98dae2fde460510caa4307aa33a554b..0462548508053f8c4043f676a6b64417d7b560e9 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -2023,7 +2023,7 @@ PHP_FUNCTION(openssl_x509_parse)
        if (!hexserial) {
                RETURN_FALSE;
        }
-       add_assoc_string(return_value, "serialNumberHex", hexserial, 1); 
+       add_assoc_string(return_value, "serialNumberHex", hexserial); 
        OPENSSL_free(hexserial);
 
        add_assoc_asn1_string(return_value, "validFrom",        X509_get_notBefore(cert));

diff --git a/ext/openssl/tests/openssl_x509_parse_basic.phpt b/ext/openssl/tests/openssl_x509_parse_basic.phpt
index 00e32c3b6006461d4025024971d25b6ab267f0e5..59daedcc6b2bc1bc4ed653dc16b274876001c161 100644 (file)
--- a/ext/openssl/tests/openssl_x509_parse_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_parse_basic.phpt
@@ -12,7 +12,7 @@ var_dump(openssl_x509_parse($cert));
 var_dump(openssl_x509_parse($cert, false));
 ?>
 --EXPECTF--
-array(15) {
+array(16) {
   ["name"]=>
   string(96) "/C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. Angelo/emailAddress=hnangelo@php.net"
   ["subject"]=>
@@ -47,6 +47,8 @@ array(15) {
   int(2)
   ["serialNumber"]=>
   string(20) "12593567369101004962"
+  ["serialNumberHex"]=>
+  string(16) "AEC556CC723750A2"
   ["validFrom"]=>
   string(13) "080630102843Z"
   ["validTo"]=>
@@ -158,7 +160,7 @@ serial:AE:C5:56:CC:72:37:50:A2
     string(7) "CA:TRUE"
   }
 }
-array(15) {
+array(16) {
   ["name"]=>
   string(96) "/C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. Angelo/emailAddress=hnangelo@php.net"
   ["subject"]=>
@@ -193,6 +195,8 @@ array(15) {
   int(2)
   ["serialNumber"]=>
   string(20) "12593567369101004962"
+  ["serialNumberHex"]=>
+  string(16) "AEC556CC723750A2"
   ["validFrom"]=>
   string(13) "080630102843Z"
   ["validTo"]=>