Skip to content

Commit 741382d

Browse files
rlerdorfremicollet
authored andcommitted
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. Conflicts: ext/openssl/tests/session_meta_capture.phpt
1 parent ba1c78c commit 741382d

File tree

4 files changed

+3
-16
lines changed

4 files changed

+3
-16
lines changed

ext/openssl/tests/session_meta_capture.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ $clientCode = <<<'CODE'
3535
3636
phpt_wait();
3737
38-
stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT);
39-
stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
40-
$meta = stream_context_get_options($clientCtx)['ssl']['session_meta'];
41-
var_dump($meta['protocol']);
42-
4338
stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
4439
stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
4540
$meta = stream_context_get_options($clientCtx)['ssl']['session_meta'];
@@ -59,7 +54,6 @@ CODE;
5954
include 'ServerClientTestCase.inc';
6055
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
6156
--EXPECTF--
62-
string(5) "SSLv3"
6357
string(5) "TLSv1"
6458
string(7) "TLSv1.1"
6559
string(7) "TLSv1.2"

ext/openssl/tests/stream_crypto_flags_001.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ $clientCode = <<<'CODE'
3232
3333
phpt_wait();
3434
35-
stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT);
36-
var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
37-
3835
stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
3936
var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
4037
@@ -47,4 +44,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
4744
--EXPECTF--
4845
resource(%d) of type (stream)
4946
resource(%d) of type (stream)
50-
resource(%d) of type (stream)

ext/openssl/tests/stream_crypto_flags_003.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $serverCode = <<<'CODE'
1313
$serverCtx = stream_context_create(['ssl' => [
1414
'local_cert' => __DIR__ . '/bug54992.pem',
1515

16-
// Only accept SSLv3 and TLSv1.2 connections
16+
// Only accept TLSv1.2 connections
1717
'crypto_method' => STREAM_CRYPTO_METHOD_SSLv3_SERVER | STREAM_CRYPTO_METHOD_TLSv1_2_SERVER,
1818
]]);
1919

@@ -40,9 +40,6 @@ $clientCode = <<<'CODE'
4040
stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
4141
var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
4242
43-
stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT);
44-
var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
45-
4643
stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
4744
var_dump(@stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
4845
@@ -54,7 +51,6 @@ include 'ServerClientTestCase.inc';
5451
ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
5552
--EXPECTF--
5653
resource(%d) of type (stream)
57-
resource(%d) of type (stream)
5854
bool(false)
5955
bool(false)
6056

ext/openssl/tests/streams_crypto_method.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Specific crypto method for ssl:// transports.
44
<?php
55
if (!extension_loaded("openssl")) die("skip openssl not loaded");
66
if (!function_exists("proc_open")) die("skip no proc_open");
7+
if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSLv1.0.1 required");
78
--FILE--
89
<?php
910
$serverCode = <<<'CODE'
@@ -37,7 +38,7 @@ $clientCode = <<<'CODE'
3738
$serverUri = "https://127.0.0.1:64321/";
3839
$clientFlags = STREAM_CLIENT_CONNECT;
3940
$clientCtx = stream_context_create(['ssl' => [
40-
'crypto_method' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
41+
'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
4142
'verify_peer' => false,
4243
'verify_peer_name' => false
4344
]]);

0 commit comments

Comments
 (0)