From b0847ccd7748316ef11e876dc6a8e1814997793b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 3 Sep 2018 13:31:50 +0200
Subject: add upstream patch for openssl failing test

---
 cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch

(limited to 'cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch')

diff --git a/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch b/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch
new file mode 100644
index 0000000..0cb89c8
--- /dev/null
+++ b/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch
@@ -0,0 +1,38 @@
+From cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a Mon Sep 17 00:00:00 2001
+From: Jakub Zelenka <bukka@php.net>
+Date: Sun, 2 Sep 2018 20:00:08 +0100
+Subject: [PATCH] Fix stream_security_level.phpt with OpenSSL 1.1.1
+
+---
+ ext/openssl/tests/stream_security_level.phpt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ext/openssl/tests/stream_security_level.phpt b/ext/openssl/tests/stream_security_level.phpt
+index fb1d36a58624..26fedcf670e9 100644
+--- a/ext/openssl/tests/stream_security_level.phpt
++++ b/ext/openssl/tests/stream_security_level.phpt
+@@ -5,6 +5,7 @@ security_level setting to prohibit cert
+ if (!extension_loaded("openssl")) die("skip openssl not loaded");
+ if (OPENSSL_VERSION_NUMBER < 0x10100000) die("skip OpenSSL >= v1.1.0 required");
+ if (!function_exists("proc_open")) die("skip no proc_open");
++?>
+ --FILE--
+ <?php
+ $serverCode = <<<'CODE'
+@@ -24,7 +25,7 @@ $clientCode = <<<'CODE'
+ 	$serverUri = "ssl://127.0.0.1:64322";
+ 	$clientFlags = STREAM_CLIENT_CONNECT;
+ 	$clientCtx = stream_context_create(['ssl' => [
+-		'security_level' => 3,
++		'security_level' => 2,
+ 		'verify_peer' => true,
+ 		'cafile' => __DIR__ . '/bug54992-ca.pem',
+ 		'verify_peer_name' => false
+@@ -38,6 +39,7 @@ CODE;
+ 
+ include 'ServerClientTestCase.inc';
+ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
++?>
+ --EXPECTF--
+ Warning: stream_socket_client(): SSL operation failed with code 1. OpenSSL Error messages:
+ error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed in %s : eval()'d code on line %d
-- 
cgit