rasmus Sun, 05 Feb 2012 10:08:16 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323075
Log: Another openssl test that is dependent on the openssl version. The output has changed in more recent versions. Synch with newer output and consider changing the test to only pick out the more stable fields instead of all of them. Changed paths: U php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt U php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt U php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt Modified: php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt 2012-02-05 09:59:33 UTC (rev 323074) +++ php/php-src/branches/PHP_5_3/ext/openssl/tests/openssl_x509_parse_basic.phpt 2012-02-05 10:08:16 UTC (rev 323075) @@ -9,7 +9,7 @@ var_dump(openssl_x509_parse($cert)); var_dump(openssl_x509_parse($cert, false)); ?> ---EXPECT-- +--EXPECTF-- array(12) { ["name"]=> string(96) "/C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. Angelo/emailAddress=hnang...@php.net" @@ -27,7 +27,7 @@ string(16) "hnang...@php.net" } ["hash"]=> - string(8) "088c65c2" + string(8) "%s" ["issuer"]=> array(5) { ["C"]=> @@ -54,7 +54,7 @@ ["validTo_time_t"]=> int(1217413723) ["purposes"]=> - array(8) { + array(9) { [1]=> array(3) { [0]=> @@ -127,6 +127,15 @@ [2]=> string(10) "ocsphelper" } + [9]=> + array(3) { + [0]=> + bool(false) + [1]=> + bool(true) + [2]=> + string(13) "timestampsign" + } } ["extensions"]=> array(3) { @@ -158,7 +167,7 @@ string(16) "hnang...@php.net" } ["hash"]=> - string(8) "088c65c2" + string(8) "%s" ["issuer"]=> array(5) { ["countryName"]=> @@ -185,7 +194,7 @@ ["validTo_time_t"]=> int(1217413723) ["purposes"]=> - array(8) { + array(9) { [1]=> array(3) { [0]=> @@ -258,6 +267,15 @@ [2]=> string(11) "OCSP helper" } + [9]=> + array(3) { + [0]=> + bool(false) + [1]=> + bool(true) + [2]=> + string(18) "Time Stamp signing" + } } ["extensions"]=> array(3) { Modified: php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt 2012-02-05 09:59:33 UTC (rev 323074) +++ php/php-src/branches/PHP_5_4/ext/openssl/tests/openssl_x509_parse_basic.phpt 2012-02-05 10:08:16 UTC (rev 323075) @@ -9,7 +9,7 @@ var_dump(openssl_x509_parse($cert)); var_dump(openssl_x509_parse($cert, false)); ?> ---EXPECT-- +--EXPECTF-- array(12) { ["name"]=> string(96) "/C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. Angelo/emailAddress=hnang...@php.net" @@ -27,7 +27,7 @@ string(16) "hnang...@php.net" } ["hash"]=> - string(8) "088c65c2" + string(8) "%s" ["issuer"]=> array(5) { ["C"]=> @@ -54,7 +54,7 @@ ["validTo_time_t"]=> int(1217413723) ["purposes"]=> - array(8) { + array(9) { [1]=> array(3) { [0]=> @@ -127,6 +127,15 @@ [2]=> string(10) "ocsphelper" } + [9]=> + array(3) { + [0]=> + bool(false) + [1]=> + bool(true) + [2]=> + string(13) "timestampsign" + } } ["extensions"]=> array(3) { @@ -158,7 +167,7 @@ string(16) "hnang...@php.net" } ["hash"]=> - string(8) "088c65c2" + string(8) "%s" ["issuer"]=> array(5) { ["countryName"]=> @@ -185,7 +194,7 @@ ["validTo_time_t"]=> int(1217413723) ["purposes"]=> - array(8) { + array(9) { [1]=> array(3) { [0]=> @@ -258,6 +267,15 @@ [2]=> string(11) "OCSP helper" } + [9]=> + array(3) { + [0]=> + bool(false) + [1]=> + bool(true) + [2]=> + string(18) "Time Stamp signing" + } } ["extensions"]=> array(3) { Modified: php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt =================================================================== --- php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt 2012-02-05 09:59:33 UTC (rev 323074) +++ php/php-src/trunk/ext/openssl/tests/openssl_x509_parse_basic.phpt 2012-02-05 10:08:16 UTC (rev 323075) @@ -9,7 +9,7 @@ var_dump(openssl_x509_parse($cert)); var_dump(openssl_x509_parse($cert, false)); ?> ---EXPECT-- +--EXPECTF-- array(12) { ["name"]=> string(96) "/C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. Angelo/emailAddress=hnang...@php.net" @@ -27,7 +27,7 @@ string(16) "hnang...@php.net" } ["hash"]=> - string(8) "088c65c2" + string(8) "%s" ["issuer"]=> array(5) { ["C"]=> @@ -54,7 +54,7 @@ ["validTo_time_t"]=> int(1217413723) ["purposes"]=> - array(8) { + array(9) { [1]=> array(3) { [0]=> @@ -127,6 +127,15 @@ [2]=> string(10) "ocsphelper" } + [9]=> + array(3) { + [0]=> + bool(false) + [1]=> + bool(true) + [2]=> + string(13) "timestampsign" + } } ["extensions"]=> array(3) { @@ -158,7 +167,7 @@ string(16) "hnang...@php.net" } ["hash"]=> - string(8) "088c65c2" + string(8) "%s" ["issuer"]=> array(5) { ["countryName"]=> @@ -185,7 +194,7 @@ ["validTo_time_t"]=> int(1217413723) ["purposes"]=> - array(8) { + array(9) { [1]=> array(3) { [0]=> @@ -258,6 +267,15 @@ [2]=> string(11) "OCSP helper" } + [9]=> + array(3) { + [0]=> + bool(false) + [1]=> + bool(true) + [2]=> + string(18) "Time Stamp signing" + } } ["extensions"]=> array(3) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php