com php-src: Remove SSLv3 test dependencies SSLv3 is going away. Debian8 already ships with an openssl with no SSLv3 support which was causing these
tests to fail.: ext/openssl/tests/session_meta_capture.ph pt ext/openssl/tests/stream_crypto_flags_001.ph pt
ext/openssl/tests/stream_crypto_flags_003.ph pt ext/openssl/tests/streams_crypto_method.phpt

Commit: 32484e3f5fc04f127199399a0ee52594912fa66a Author: Rasmus Lerdorf <rasmus@lerdorf.com> Wed, 8 Apr 2015 09:55:55 -0700 Parents: 151b4ea3cd6f4b6b431284daf8a90c51765f22fa Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=32484e3f5fc04f127199399a0ee52594912fa66a Log: Remove SSLv3 test dependencies SSLv3 is going away. Debian8 already ships with an openssl with no SSLv3 support which was causing these tests to fail. Changed paths: M ext/openssl/tests/session_meta_capture.phpt M ext/openssl/tests/stream_crypto_flags_001.phpt M ext/openssl/tests/stream_crypto_flags_003.phpt M ext/openssl/tests/streams_crypto_method.phpt Diff: diff --git a/ext/openssl/tests/session_meta_capture.phpt b/ext/openssl/tests/session_meta_capture.phpt index f1f9610..a09d7e8 100644 --- a/ext/openssl/tests/session_meta_capture.phpt +++ b/ext/openssl/tests/session_meta_capture.phpt @@ -35,11 +35,6 @@ $clientCode = <<<'CODE' phpt_wait(); - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT); - @stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); - $meta = stream_context_get_options($clientCtx)['ssl']['session_meta']; - var_dump($meta['protocol']); - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT); @stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); $meta = stream_context_get_options($clientCtx)['ssl']['session_meta']; @@ -59,7 +54,6 @@ CODE; include 'ServerClientTestCase.inc'; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); --EXPECTF-- -string(5) "SSLv3" string(5) "TLSv1" string(7) "TLSv1.1" string(7) "TLSv1.2" diff --git a/ext/openssl/tests/stream_crypto_flags_001.phpt b/ext/openssl/tests/stream_crypto_flags_001.phpt index f988886..1ba9309 100644 --- a/ext/openssl/tests/stream_crypto_flags_001.phpt +++ b/ext/openssl/tests/stream_crypto_flags_001.phpt @@ -32,9 +32,6 @@ $clientCode = <<<'CODE' phpt_wait(); - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT); var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); @@ -47,4 +44,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode); --EXPECTF-- resource(%d) of type (stream) resource(%d) of type (stream) -resource(%d) of type (stream) diff --git a/ext/openssl/tests/stream_crypto_flags_003.phpt b/ext/openssl/tests/stream_crypto_flags_003.phpt index 30ca7a7..28cb640 100644 --- a/ext/openssl/tests/stream_crypto_flags_003.phpt +++ b/ext/openssl/tests/stream_crypto_flags_003..phpt @@ -13,7 +13,7 @@ $serverCode = <<<'CODE' $serverCtx = stream_context_create(['ssl' => [ 'local_cert' => __DIR__ . '/bug54992.pem', - // Only accept SSLv3 and TLSv1.2 connections + // Only accept TLSv1.2 connections 'crypto_method' => STREAM_CRYPTO_METHOD_SSLv3_SERVER | STREAM_CRYPTO_METHOD_TLSv1_2_SERVER, ]]); @@ -40,9 +40,6 @@ $clientCode = <<<'CODE' stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT); var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT); var_dump(@stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); @@ -54,7 +51,6 @@ include 'ServerClientTestCase.inc'; ServerClientTestCase::getInstance()->run($clientCode, $serverCode); --EXPECTF-- resource(%d) of type (stream) -resource(%d) of type (stream) bool(false) bool(false) diff --git a/ext/openssl/tests/streams_crypto_method.phpt b/ext/openssl/tests/streams_crypto_method.phpt index 84f7934..f8ec864 100644 --- a/ext/openssl/tests/streams_crypto_method.phpt +++ b/ext/openssl/tests/streams_crypto_method.phpt @@ -4,6 +4,7 @@ Specific crypto method for ssl:// transports. <?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); if (!function_exists("proc_open")) die("skip no proc_open"); +if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSLv1.0.1 required"); --FILE-- <?php $serverCode = <<<'CODE' @@ -37,7 +38,7 @@ $clientCode = <<<'CODE' $serverUri = "https://127.0.0.1:64321/"; $clientFlags = STREAM_CLIENT_CONNECT; $clientCtx = stream_context_create(['ssl' => [ - 'crypto_method' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT, + 'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT, 'verify_peer' => false, 'verify_peer_name' => false ]]);