From 94fb7d2d357e703fb68109af2734c64aa67f5014 Mon Sep 17 00:00:00 2001 From: Paul Tarjan Date: Wed, 16 Apr 2014 13:39:42 -0700 Subject: [PATCH] allow either company for openssl They had to change their default. We shouln't care. Reviewed By: @fredemmott Differential Revision: D1280158 --- hphp/test/slow/ext_openssl/ext_openssl.php | 4 +++- hphp/test/slow/ext_openssl/ext_openssl.php.expectf | 24 +++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/hphp/test/slow/ext_openssl/ext_openssl.php b/hphp/test/slow/ext_openssl/ext_openssl.php index 7a36e8ad1a4..764dc3d5fda 100644 --- a/hphp/test/slow/ext_openssl/ext_openssl.php +++ b/hphp/test/slow/ext_openssl/ext_openssl.php @@ -32,7 +32,9 @@ function test_openssl_csr_get_public_key() { function test_openssl_csr_get_subject() { $csr = openssl_csr_new(null, $ignore); VERIFY($csr != null); - VERIFY(openssl_csr_get_subject($csr)['O'] == "Internet Widgits Pty Ltd"); + $subject = openssl_csr_get_subject($csr)['O']; + VERIFY($subject == "Internet Widgits Pty Ltd" || + $subject == "Default Company Ltd"); } function test_openssl_csr_sign() { diff --git a/hphp/test/slow/ext_openssl/ext_openssl.php.expectf b/hphp/test/slow/ext_openssl/ext_openssl.php.expectf index 2733bb4c6c3..68eeb0d04a6 100644 --- a/hphp/test/slow/ext_openssl/ext_openssl.php.expectf +++ b/hphp/test/slow/ext_openssl/ext_openssl.php.expectf @@ -10,19 +10,19 @@ bool(true) bool(true) bool(true) -Warning: dn: 0 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 54 +Warning: dn: 0 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 56 -Warning: dn: 1 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 54 +Warning: dn: 1 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 56 -Warning: dn: 2 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 54 +Warning: dn: 2 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 56 -Warning: dn: 3 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 54 +Warning: dn: 3 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 56 -Warning: dn: 4 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 54 +Warning: dn: 4 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 56 -Warning: dn: 5 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 54 +Warning: dn: 5 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 56 -Warning: dn: 6 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 54 +Warning: dn: 6 is not a recognized name in %s/test/slow/ext_openssl/ext_openssl.php on line 56 bool(true) bool(true) bool(true) @@ -33,7 +33,7 @@ bool(true) bool(true) bool(true) -Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 88 +Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 90 bool(true) bool(true) bool(true) @@ -46,12 +46,12 @@ bool(true) bool(true) bool(true) -Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 130 +Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 132 bool(true) bool(true) bool(true) -Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 142 +Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 144 bool(true) bool(true) bool(true) @@ -105,8 +105,7 @@ bool(true) bool(true) bool(true) -Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 277 -bool(true) +Warning: No such file or directory in %s/test/slow/ext_openssl/ext_openssl.php on line 279 bool(true) bool(true) bool(true) @@ -117,3 +116,4 @@ bool(true) bool(true) bool(true) bool(true) +bool(true) \ No newline at end of file -- 2.11.4.GIT