diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-18 14:21:04 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-18 14:22:20 +0200 |
| commit | 2c0d47c4b41862bd8ad9d840c728af3333125bb8 (patch) | |
| tree | c346a0490a210d92790a8cfab3a4cec2f4d42c01 /ext/openssl/tests/tlsv1.1_wrapper.phpt | |
| parent | 51e3cb39160cb3b7eb0e38562f253f39990a16e7 (diff) | |
| download | php-git-2c0d47c4b41862bd8ad9d840c728af3333125bb8.tar.gz | |
Revert "Fix tests regarding OpenSSL security_level"
This reverts commit b281493503401a2b5c45c11fcd0498d8448998c2.
Diffstat (limited to 'ext/openssl/tests/tlsv1.1_wrapper.phpt')
| -rw-r--r-- | ext/openssl/tests/tlsv1.1_wrapper.phpt | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/ext/openssl/tests/tlsv1.1_wrapper.phpt b/ext/openssl/tests/tlsv1.1_wrapper.phpt index acca3e0d9f..c1aaa04919 100644 --- a/ext/openssl/tests/tlsv1.1_wrapper.phpt +++ b/ext/openssl/tests/tlsv1.1_wrapper.phpt @@ -11,13 +11,10 @@ $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'tlsv1.1_wrapper.pem.tmp'; $serverCode = <<<'CODE' $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN; - $ssl_opts = [ + $ctx = stream_context_create(['ssl' => [ 'local_cert' => '%s', - ]; - if (OPENSSL_VERSION_NUMBER >= 0x10100000) { - $ssl_opts['security_level'] = 1; - } - $ctx = stream_context_create(['ssl' => $ssl_opts]); + 'security_level' => 1, + ]]); $server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx); phpt_notify(); @@ -30,14 +27,11 @@ $serverCode = sprintf($serverCode, $certFile); $clientCode = <<<'CODE' $flags = STREAM_CLIENT_CONNECT; - $ssl_opts = [ + $ctx = stream_context_create(['ssl' => [ 'verify_peer' => false, 'verify_peer_name' => false, - ]; - if (OPENSSL_VERSION_NUMBER >= 0x10100000) { - $ssl_opts['security_level'] = 1; - } - $ctx = stream_context_create(['ssl' => $ssl_opts]); + 'security_level' => 1, + ]]); phpt_wait(); |