Skip to content

ext/openssl: Rename OpenSSLSession references to Openssl\Session #24083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adapik wants to merge 1 commit into
base: PHP-8.6
Choose a base branch
from
+7 −7
Open

ext/openssl: Rename OpenSSLSession references to Openssl\Session #24083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/openssl/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ZEND_DECLARE_MODULE_GLOBALS(openssl)

#include "openssl_arginfo.h"

/* OpenSSLException class */
/* Openssl\OpensslException class */

zend_class_entry *php_openssl_exception_ce;

Expand Down Expand Up @@ -280,7 +280,7 @@ static zend_object *php_openssl_session_create_object(zend_class_entry *class_ty
static zend_function *php_openssl_session_get_constructor(zend_object *object)
{
zend_throw_error(NULL,
"Cannot directly construct OpenSSLSession, use OpenSSLSession::import() or TLS session callbacks");
"Cannot directly construct Openssl\\Session, use Openssl\\Session::import() or TLS session callbacks");
return NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion ext/openssl/tests/session_resumption_invalid_data.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
Warning: stream_socket_client(): Failed to enable crypto in %s on line %d

Warning: stream_socket_client(): Unable to connect to %s in %s on line %d
Type error thrown: session_data must be an OpenSSLSession instance
Type error thrown: session_data must be an Openssl\Session instance
8 changes: 4 additions & 4 deletions ext/openssl/xp_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,7 @@ static SSL_SESSION *php_openssl_session_get_cb(SSL *ssl, const unsigned char *se
session = obj->session;
}
} else if (Z_TYPE(retval) != IS_NULL) {
zend_type_error("session_get_cb return type must be null or OpenSSLSession");
zend_type_error("session_get_cb return type must be null or Openssl\\Session");
}

zval_ptr_dtor(&retval);
Expand Down Expand Up @@ -2365,7 +2365,7 @@ static zend_result php_openssl_setup_client_session(php_stream *stream,
if (php_openssl_is_session_ce(val)) {
enable_client_cache = true;
} else if (Z_TYPE_P(val) != IS_NULL) {
zend_type_error("session_data must be an OpenSSLSession instance");
zend_type_error("session_data must be an Openssl\\Session instance");
return FAILURE;
}
}
Expand Down Expand Up @@ -2546,13 +2546,13 @@ static zend_result php_openssl_apply_client_session_data(php_stream *stream,
if (!session) {
// TODO: Should this be a TypeError?
php_stream_warn(stream, Generic,
"Invalid OpenSSLSession object, falling back to full handshake");
"Invalid Openssl\\Session object, falling back to full handshake");
return FAILURE;
}
/* Object owns the session, we just borrow it */
needs_free = false;
} else if (Z_TYPE_P(val) != IS_NULL) {
zend_type_error("session_data must be an OpenSSLSession instance");
zend_type_error("session_data must be an Openssl\\Session instance");
return FAILURE;
}

Expand Down
Loading