[php-src] master: Merge branch 'PHP-8.4'
Author: Jakub Zelenka (bukka)
Date: 2025-08-12T17:30:07+02:00
Commit: https://github.com/php/php-src/commit/ba97d8636adfc6569d39100253ea9c229269290a
Raw diff: https://github.com/php/php-src/commit/ba97d8636adfc6569d39100253ea9c229269290a.diff
Merge branch 'PHP-8.4'
Changed paths:
A ext/openssl/tests/gh19245.phpt
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/tests/gh19245.phpt b/ext/openssl/tests/gh19245.phpt
new file mode 100644
index 000000000000..13433cc42a32
--- /dev/null
+++ b/ext/openssl/tests/gh19245.phpt
@@ -0,0 +1,53 @@
+--TEST--
+GH-19245: Success error message on TLS stream accept failure
+--EXTENSIONS--
+openssl
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
+--FILE--
+<?php
+include 'ServerClientTestCase.inc';
+
+$baseDir = __DIR__ . '/gh19245';
+$baseDirCertFile = $baseDir . '/cert.crt';
+$baseDirPkFile = $baseDir . '/private.key';
+
+$serverCodeTemplate = <<<'CODE'
+ ini_set('log_errors', 'On');
+ ini_set('open_basedir', __DIR__ . '/gh19245');
+ $serverUri = "ssl://127.0.0.1:0";
+ $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
+ $serverCtx = stream_context_create(['ssl' => [
+ 'local_cert' => '%s',
+ 'local_pk' => '%s',
+ ]]);
+
+ $sock = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
+ phpt_notify_server_start($sock);
+
+ $link = stream_socket_accept($sock);
+CODE;
+
+$clientCode = <<<'CODE'
+ $serverUri = "ssl://{{ ADDR }}";
+ $clientFlags = STREAM_CLIENT_CONNECT;
+
+ $clientCtx = stream_context_create(['ssl' => [
+ 'verify_peer' => false,
+ 'verify_peer_name' => false
+ ]]);
+
+ @stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
+CODE;
+
+$serverCode = sprintf($serverCodeTemplate, $baseDirCertFile . "\0test", $baseDirPkFile);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+
+?>
+--EXPECTF--
+PHP Warning: stream_socket_accept(): Path for local_cert in ssl stream context option must not
contain any null bytes in %s
+PHP Warning: stream_socket_accept(): Unable to get real path of certificate file `%scert.crt'
in %s
+PHP Warning: stream_socket_accept(): Failed to enable crypto in %s
+PHP Warning: stream_socket_accept(): Accept failed: Cannot enable crypto in %s
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 84bfe895c3c4..c1db5a78369b 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2274,6 +2274,12 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream,
php_openssl_
php_stream_close(xparam->outputs.client);
xparam->outputs.client = NULL;
xparam->outputs.returncode = -1;
+ if (xparam->want_errortext) {
+ if (xparam->outputs.error_text) {
+ zend_string_free(xparam->outputs.error_text);
+ }
+ xparam->outputs.error_text = ZSTR_INIT_LITERAL("Cannot enable crypto", 0);
+ }
}
}
}
Thread (1 message)
- Jakub Zelenka