Skip to content

Commit 3ea57cf

Browse files
nikicnikic
committed
Reduce security level in some OpenSSL tests
This allows tests using older protocols and algorithms to work under OpenSSL 3. Also account for minor changes in error reporting.
1 parent 6249172 commit 3ea57cf

11 files changed

+22
-22
lines changed

‎ext/openssl/tests/session_meta_capture.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
1717
$serverCtx = stream_context_create(['ssl' => [
1818
'local_cert' => '%s',
19-
'security_level' => 1,
19+
'security_level' => 0,
2020
]]);
2121
2222
$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
@@ -37,7 +37,7 @@ $clientCode = <<<'CODE'
3737
'verify_peer' => true,
3838
'cafile' => '%s',
3939
'peer_name' => '%s',
40-
'security_level' => 1,
40+
'security_level' => 0,
4141
]]);
4242
4343
phpt_wait();

‎ext/openssl/tests/stream_crypto_flags_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
1717
$serverCtx = stream_context_create(['ssl' => [
1818
'local_cert' => '%s',
19-
'security_level' => 1,
19+
'security_level' => 0,
2020
]]);
2121
2222
$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
@@ -36,7 +36,7 @@ $clientCode = <<<'CODE'
3636
'verify_peer' => true,
3737
'cafile' => '%s',
3838
'peer_name' => '%s',
39-
'security_level' => 1,
39+
'security_level' => 0,
4040
]]);
4141
4242
phpt_wait();

‎ext/openssl/tests/stream_crypto_flags_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
1717
$serverCtx = stream_context_create(['ssl' => [
1818
'local_cert' => '%s',
19-
'security_level' => 1,
19+
'security_level' => 0,
2020
]]);
2121
2222
$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
@@ -37,7 +37,7 @@ $clientCode = <<<'CODE'
3737
'verify_peer' => true,
3838
'cafile' => '%s',
3939
'peer_name' => '%s',
40-
'security_level' => 1,
40+
'security_level' => 0,
4141
]]);
4242
4343
phpt_wait();

‎ext/openssl/tests/stream_crypto_flags_003.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $serverCode = <<<'CODE'
2020
2121
// Only accept TLSv1.0 and TLSv1.2 connections
2222
'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_0_SERVER | STREAM_CRYPTO_METHOD_TLSv1_2_SERVER,
23-
'security_level' => 1,
23+
'security_level' => 0,
2424
]]);
2525
2626
$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
@@ -41,7 +41,7 @@ $clientCode = <<<'CODE'
4141
'verify_peer' => true,
4242
'cafile' => '%s',
4343
'peer_name' => '%s',
44-
'security_level' => 1,
44+
'security_level' => 0,
4545
]]);
4646
4747
phpt_wait();

‎ext/openssl/tests/stream_crypto_flags_004.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $serverCode = <<<'CODE'
1717
$serverCtx = stream_context_create(['ssl' => [
1818
'local_cert' => '%s',
1919
'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_0_SERVER,
20-
'security_level' => 1,
20+
'security_level' => 0,
2121
]]);
2222
2323
$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
@@ -38,7 +38,7 @@ $clientCode = <<<'CODE'
3838
'verify_peer' => true,
3939
'cafile' => '%s',
4040
'peer_name' => '%s',
41-
'security_level' => 1,
41+
'security_level' => 0,
4242
]]);
4343
4444
phpt_wait();

‎ext/openssl/tests/stream_security_level.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $serverCode = <<<'CODE'
2525
'local_cert' => '%s',
2626
// Make sure the server side starts up successfully if the default security level is
2727
// higher. We want to test the error at the client side.
28-
'security_level' => 1,
28+
'security_level' => 0,
2929
]]);
3030
3131
$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
@@ -67,7 +67,7 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
6767
?>
6868
--EXPECTF--
6969
Warning: stream_socket_client(): SSL operation failed with code 1. OpenSSL Error messages:
70-
error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed in %s : eval()'d code on line %d
70+
error:%s:SSL routines:%S:certificate verify failed in %s : eval()'d code on line %d
7171

7272
Warning: stream_socket_client(): Failed to enable crypto in %s : eval()'d code on line %d
7373

‎ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $serverCode = <<<'CODE'
1616
'local_cert' => '%s',
1717
'min_proto_version' => STREAM_CRYPTO_PROTO_TLSv1_0,
1818
'max_proto_version' => STREAM_CRYPTO_PROTO_TLSv1_1,
19-
'security_level' => 1,
19+
'security_level' => 0,
2020
]]);
2121
2222
$server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
@@ -33,7 +33,7 @@ $clientCode = <<<'CODE'
3333
$ctx = stream_context_create(['ssl' => [
3434
'verify_peer' => false,
3535
'verify_peer_name' => false,
36-
'security_level' => 1,
36+
'security_level' => 0,
3737
]]);
3838
3939
phpt_wait();

‎ext/openssl/tests/tls_wrapper.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $serverCode = <<<'CODE'
1515
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1616
$ctx = stream_context_create(['ssl' => [
1717
'local_cert' => '%s',
18-
'security_level' => 1,
18+
'security_level' => 0,
1919
]]);
2020
2121
$server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
@@ -32,7 +32,7 @@ $clientCode = <<<'CODE'
3232
$ctx = stream_context_create(['ssl' => [
3333
'verify_peer' => false,
3434
'verify_peer_name' => false,
35-
'security_level' => 1,
35+
'security_level' => 0,
3636
]]);
3737
3838
phpt_wait();

‎ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $serverCode = <<<'CODE'
1515
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1616
$ctx = stream_context_create(['ssl' => [
1717
'local_cert' => '%s',
18-
'security_level' => 1,
18+
'security_level' => 0,
1919
]]);
2020
2121
$server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
@@ -32,7 +32,7 @@ $clientCode = <<<'CODE'
3232
$ctx = stream_context_create(['ssl' => [
3333
'verify_peer' => false,
3434
'verify_peer_name' => false,
35-
'security_level' => 1,
35+
'security_level' => 0,
3636
]]);
3737
3838
phpt_wait();

‎ext/openssl/tests/tlsv1.0_wrapper.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $serverCode = <<<'CODE'
1414
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1515
$ctx = stream_context_create(['ssl' => [
1616
'local_cert' => '%s',
17-
'security_level' => 1,
17+
'security_level' => 0,
1818
]]);
1919
2020
$server = stream_socket_server('tlsv1.0://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
@@ -31,7 +31,7 @@ $clientCode = <<<'CODE'
3131
$ctx = stream_context_create(['ssl' => [
3232
'verify_peer' => false,
3333
'verify_peer_name' => false,
34-
'security_level' => 1,
34+
'security_level' => 0,
3535
]]);
3636
3737
phpt_wait();

‎ext/openssl/tests/tlsv1.1_wrapper.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $serverCode = <<<'CODE'
1414
$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
1515
$ctx = stream_context_create(['ssl' => [
1616
'local_cert' => '%s',
17-
'security_level' => 1,
17+
'security_level' => 0,
1818
]]);
1919
2020
$server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
@@ -31,7 +31,7 @@ $clientCode = <<<'CODE'
3131
$ctx = stream_context_create(['ssl' => [
3232
'verify_peer' => false,
3333
'verify_peer_name' => false,
34-
'security_level' => 1,
34+
'security_level' => 0,
3535
]]);
3636
3737
phpt_wait();

0 commit comments

Comments
 (0)