diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-03-30 11:36:50 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-03-30 11:36:50 +0000 |
| commit | 591852f6726a39643a45cefeb805f831686457eb (patch) | |
| tree | 6eb07a9f59ba9e8adcb669e5a2a23ee7334c449d /php-8.3.0-openssl-ec-param.patch | |
| parent | 564644fe819f351ed1aaa9773226e7e9f20ab6a9 (diff) | |
automatic import of phpopeneuler22.03_LTS_SP3
Diffstat (limited to 'php-8.3.0-openssl-ec-param.patch')
| -rw-r--r-- | php-8.3.0-openssl-ec-param.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/php-8.3.0-openssl-ec-param.patch b/php-8.3.0-openssl-ec-param.patch new file mode 100644 index 0000000..94e4037 --- /dev/null +++ b/php-8.3.0-openssl-ec-param.patch @@ -0,0 +1,47 @@ +From 21f9d16e130b412b6839494dcf30a2f1d7dcee0f Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 24 Jul 2023 10:54:49 +0200 +Subject: [PATCH] Always warn about missing curve_name + +Both Fedora and RHEL do not support arbitrary EC parameters +See https://bugzilla.redhat.com/2223953 +--- + ext/openssl/openssl.c | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c +index 33f51bfa4d..340b0467d3 100644 +--- a/ext/openssl/openssl.c ++++ b/ext/openssl/openssl.c +@@ -4299,13 +4299,8 @@ static bool php_openssl_pkey_init_legacy_ec(EC_KEY *eckey, zval *data, bool *is_ + OPENSSL_PKEY_SET_BN(data, b); + OPENSSL_PKEY_SET_BN(data, order); + ++ php_error_docref(NULL, E_WARNING, "Missing params: curve_name (params only is not supported by OpenSSL)"); + if (!(p && a && b && order)) { +- if (!p && !a && !b && !order) { +- php_error_docref(NULL, E_WARNING, "Missing params: curve_name"); +- } else { +- php_error_docref( +- NULL, E_WARNING, "Missing params: curve_name or p, a, b, order"); +- } + goto clean_exit; + } + +@@ -4455,12 +4450,8 @@ static EVP_PKEY *php_openssl_pkey_init_ec(zval *data, bool *is_private) { + OPENSSL_PKEY_SET_BN(data, b); + OPENSSL_PKEY_SET_BN(data, order); + ++ php_error_docref(NULL, E_WARNING, "Missing params: curve_name"); + if (!(p && a && b && order)) { +- if (!p && !a && !b && !order) { +- php_error_docref(NULL, E_WARNING, "Missing params: curve_name"); +- } else { +- php_error_docref(NULL, E_WARNING, "Missing params: curve_name or p, a, b, order"); +- } + goto cleanup; + } + +-- +2.41.0 + |