From 33caa0137d820db848381772d40549c3a57ca87c Mon Sep 17 00:00:00 2001 From: lacatoire Date: Sun, 15 Nov 2026 19:14:07 +0100 Subject: [PATCH 1/2] Fix stream_socket_sendto() sending plaintext on a stream with TLS enabled --- .../tests/stream_socket_sendto_tls.phpt | 35 +++++++++++++++++++ ext/openssl/xp_ssl.c | 9 +++++ 2 files changed, 44 insertions(+) create mode 100644 ext/openssl/tests/stream_socket_sendto_tls.phpt diff --git a/ext/openssl/tests/stream_socket_sendto_tls.phpt b/ext/openssl/tests/stream_socket_sendto_tls.phpt new file mode 100644 index 000000000000..986ff12264d0 --- /dev/null +++ b/ext/openssl/tests/stream_socket_sendto_tls.phpt @@ -0,0 +1,35 @@ +--TEST-- +stream_socket_sendto() on a stream with TLS enabled sends the data through the TLS session +--EXTENSIONS-- +openssl +--FILE-- +saveNewCertAsFileWithKey('stream_socket_sendto_tls', $pem); + +$listener = stream_socket_server('tcp://127.0.0.1:0', context: stream_context_create(['ssl' => ['local_cert' => $pem]])); +$client = stream_socket_client('tcp://' . stream_socket_get_name($listener, false), context: stream_context_create(['ssl' => ['verify_peer' => false, 'verify_peer_name' => false]])); +$server = stream_socket_accept($listener); +stream_set_blocking($client, false); +stream_set_blocking($server, false); +do { + $clientDone = stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_TLS_CLIENT); + $serverDone = stream_socket_enable_crypto($server, true, STREAM_CRYPTO_METHOD_TLS_SERVER); +} while ($clientDone === 0 || $serverDone === 0); + +var_dump(fwrite($client, 'ENCRYPTED')); +var_dump(fread($server, 8192)); +var_dump(stream_socket_sendto($client, 'SENT WITH SENDTO')); +var_dump(@fread($server, 8192)); +?> +--CLEAN-- + +--EXPECT-- +int(9) +string(9) "ENCRYPTED" +int(16) +string(16) "SENT WITH SENDTO" diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 9ae5105fea10..c838d15a5719 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2732,6 +2732,15 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val return PHP_STREAM_OPTION_RETURN_OK; + case STREAM_XPORT_OP_SEND: + if (sslsock->ssl_active) { + /* A send() on the socket would put plaintext in the middle of the TLS records */ + xparam->outputs.returncode = (int) php_openssl_sockop_write(stream, + xparam->inputs.buf, MIN(xparam->inputs.buflen, INT_MAX)); + return PHP_STREAM_OPTION_RETURN_OK; + } + break; + default: /* fall through */ break; From 372ea5d5ca0447ed27a5488cf682effb1755ac39 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Thu, 19 Nov 2026 09:10:23 +0100 Subject: [PATCH 2/2] Handle OOB, empty buffer and recv on encrypted streams in the openssl send/recv ops --- ext/openssl/xp_ssl.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index c838d15a5719..ad33a26e7adc 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2734,9 +2734,38 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val case STREAM_XPORT_OP_SEND: if (sslsock->ssl_active) { - /* A send() on the socket would put plaintext in the middle of the TLS records */ - xparam->outputs.returncode = (int) php_openssl_sockop_write(stream, - xparam->inputs.buf, MIN(xparam->inputs.buflen, INT_MAX)); + if (xparam->inputs.flags & STREAM_OOB) { + php_error_docref(NULL, E_WARNING, "Cannot write OOB data on an encrypted stream"); + xparam->outputs.returncode = -1; + } else if (xparam->inputs.buflen == 0) { + xparam->outputs.returncode = 0; + } else { + xparam->outputs.returncode = (int) php_openssl_sockop_write(stream, + xparam->inputs.buf, MIN(xparam->inputs.buflen, INT_MAX)); + } + return PHP_STREAM_OPTION_RETURN_OK; + } + break; + + case STREAM_XPORT_OP_RECV: + if (sslsock->ssl_active) { + if (xparam->inputs.flags & STREAM_OOB) { + php_error_docref(NULL, E_WARNING, "Cannot read OOB data on an encrypted stream"); + xparam->outputs.returncode = -1; + } else if (xparam->inputs.flags & STREAM_PEEK) { + int n; + + ERR_clear_error(); + n = SSL_peek(sslsock->ssl_handle, xparam->inputs.buf, + (int) MIN(xparam->inputs.buflen, INT_MAX)); + if (n <= 0) { + n = SSL_get_error(sslsock->ssl_handle, n) == SSL_ERROR_ZERO_RETURN ? 0 : -1; + } + xparam->outputs.returncode = n; + } else { + xparam->outputs.returncode = (int) php_openssl_sockop_read(stream, + xparam->inputs.buf, MIN(xparam->inputs.buflen, INT_MAX)); + } return PHP_STREAM_OPTION_RETURN_OK; } break;