Skip to content

Commit d662ab5

Browse files
authored
Introduce openssl backend for v1 and v3 API separation (#16918)
The main purpose of this is to better handle the API difference and add an inital work to separate PHP and OpenSSL logic. This is really just the first step and further changes are coming after that. Closes GH-16918
1 parent cd30666 commit d662ab5

8 files changed

+4242
-3983
lines changed

ext/openssl/config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (PHP_OPENSSL != "no") {
1010
var ret = SETUP_OPENSSL("openssl", PHP_OPENSSL);
1111

1212
if (ret >= 2) {
13-
EXTENSION("openssl", "openssl.c openssl_pwhash.c xp_ssl.c");
13+
EXTENSION("openssl", "openssl.c openssl_pwhash.c openssl_backend_common.c openssl_backend_v1.c openssl_backend_v3.c xp_ssl.c");
1414
AC_DEFINE("HAVE_OPENSSL_EXT", 1, "Define to 1 if the PHP extension 'openssl' is available.");
1515
if (PHP_OPENSSL_LEGACY_PROVIDER != "no") {
1616
AC_DEFINE("LOAD_OPENSSL_LEGACY_PROVIDER", 1, "Define to 1 to load the OpenSSL legacy algorithm provider in addition to the default provider.");

ext/openssl/config0.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ PHP_ARG_WITH([openssl-argon2],
2626

2727
if test "$PHP_OPENSSL" != "no"; then
2828
PHP_NEW_EXTENSION([openssl],
29-
[openssl.c openssl_pwhash.c xp_ssl.c],
29+
[openssl.c openssl_pwhash.c openssl_backend_common.c openssl_backend_v1.c openssl_backend_v3.c xp_ssl.c],
3030
[$ext_shared])
3131
PHP_SUBST([OPENSSL_SHARED_LIBADD])
3232
PHP_SETUP_OPENSSL([OPENSSL_SHARED_LIBADD],

0 commit comments

Comments
 (0)