mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-11-04 02:11:39 +01:00
138 lines
4.5 KiB
Diff
138 lines
4.5 KiB
Diff
Patch-Source: https://github.com/php/php-src/commit/9695936341c49ea0efec5bdf24acbcdf59e2a7f8
|
|
From 9695936341c49ea0efec5bdf24acbcdf59e2a7f8 Mon Sep 17 00:00:00 2001
|
|
From: Nikita Popov <nikita.ppv@gmail.com>
|
|
Date: Wed, 4 Aug 2021 11:58:46 +0200
|
|
Subject: [PATCH] Don't test legacy algorithms in SPKI tests
|
|
|
|
MD4 and RMD160 may not be available on newer OpenSSL versions.
|
|
---
|
|
ext/openssl/tests/openssl_spki_export_basic.phpt | 4 ----
|
|
.../tests/openssl_spki_export_challenge_basic.phpt | 14 --------------
|
|
ext/openssl/tests/openssl_spki_new_basic.phpt | 8 --------
|
|
ext/openssl/tests/openssl_spki_verify_basic.phpt | 7 -------
|
|
4 files changed, 33 deletions(-)
|
|
|
|
diff --git a/ext/openssl/tests/openssl_spki_export_basic.phpt b/ext/openssl/tests/openssl_spki_export_basic.phpt
|
|
index 8fd2cbda4691..8311e92244af 100644
|
|
--- a/ext/openssl/tests/openssl_spki_export_basic.phpt
|
|
+++ b/ext/openssl/tests/openssl_spki_export_basic.phpt
|
|
@@ -20,14 +20,12 @@ foreach ($key_sizes as $key_size) {
|
|
|
|
/* array of available hashings to test */
|
|
$algo = array(
|
|
- OPENSSL_ALGO_MD4,
|
|
OPENSSL_ALGO_MD5,
|
|
OPENSSL_ALGO_SHA1,
|
|
OPENSSL_ALGO_SHA224,
|
|
OPENSSL_ALGO_SHA256,
|
|
OPENSSL_ALGO_SHA384,
|
|
OPENSSL_ALGO_SHA512,
|
|
- OPENSSL_ALGO_RMD160
|
|
);
|
|
|
|
/* loop over key sizes for test */
|
|
@@ -57,5 +55,3 @@ function _uuid() {
|
|
\-\-\-\-\-BEGIN PUBLIC KEY\-\-\-\-\-.*\-\-\-\-\-END PUBLIC KEY\-\-\-\-\-
|
|
\-\-\-\-\-BEGIN PUBLIC KEY\-\-\-\-\-.*\-\-\-\-\-END PUBLIC KEY\-\-\-\-\-
|
|
\-\-\-\-\-BEGIN PUBLIC KEY\-\-\-\-\-.*\-\-\-\-\-END PUBLIC KEY\-\-\-\-\-
|
|
-\-\-\-\-\-BEGIN PUBLIC KEY\-\-\-\-\-.*\-\-\-\-\-END PUBLIC KEY\-\-\-\-\-
|
|
-\-\-\-\-\-BEGIN PUBLIC KEY\-\-\-\-\-.*\-\-\-\-\-END PUBLIC KEY\-\-\-\-\-
|
|
diff --git a/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt b/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt
|
|
index dea877294261..ab9076791be4 100644
|
|
--- a/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt
|
|
+++ b/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt
|
|
@@ -22,14 +22,12 @@ foreach ($key_sizes as $key_size) {
|
|
|
|
/* array of available hashings to test */
|
|
$algo = array(
|
|
- OPENSSL_ALGO_MD4,
|
|
OPENSSL_ALGO_MD5,
|
|
OPENSSL_ALGO_SHA1,
|
|
OPENSSL_ALGO_SHA224,
|
|
OPENSSL_ALGO_SHA256,
|
|
OPENSSL_ALGO_SHA384,
|
|
OPENSSL_ALGO_SHA512,
|
|
- OPENSSL_ALGO_RMD160
|
|
);
|
|
|
|
/* loop over key sizes for test */
|
|
@@ -90,15 +88,3 @@ string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
bool\(false\)
|
|
string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
bool\(false\)
|
|
-string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
-bool\(false\)
|
|
-string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
-bool\(false\)
|
|
-string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
-bool\(false\)
|
|
-string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
-bool\(false\)
|
|
-string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
-bool\(false\)
|
|
-string\(36\) \"[0-9a-f]{8}\-([0-9a-f]{4}\-){3}[0-9a-f]{12}\"
|
|
-bool\(false\)
|
|
diff --git a/ext/openssl/tests/openssl_spki_new_basic.phpt b/ext/openssl/tests/openssl_spki_new_basic.phpt
|
|
index 277bff2d1b61..1d29fe05bd81 100644
|
|
--- a/ext/openssl/tests/openssl_spki_new_basic.phpt
|
|
+++ b/ext/openssl/tests/openssl_spki_new_basic.phpt
|
|
@@ -16,14 +16,12 @@ foreach ($key_sizes as $key_size) {
|
|
|
|
/* array of available hashings to test */
|
|
$algo = array(
|
|
- OPENSSL_ALGO_MD4,
|
|
OPENSSL_ALGO_MD5,
|
|
OPENSSL_ALGO_SHA1,
|
|
OPENSSL_ALGO_SHA224,
|
|
OPENSSL_ALGO_SHA256,
|
|
OPENSSL_ALGO_SHA384,
|
|
OPENSSL_ALGO_SHA512,
|
|
- OPENSSL_ALGO_RMD160
|
|
);
|
|
|
|
/* loop over key sizes for test */
|
|
@@ -51,21 +49,15 @@ string(478) "%s"
|
|
string(478) "%s"
|
|
string(478) "%s"
|
|
string(478) "%s"
|
|
-string(478) "%s"
|
|
-string(474) "%s"
|
|
-string(830) "%s"
|
|
string(830) "%s"
|
|
string(830) "%s"
|
|
string(830) "%s"
|
|
string(830) "%s"
|
|
string(830) "%s"
|
|
string(830) "%s"
|
|
-string(826) "%s"
|
|
-string(1510) "%s"
|
|
string(1510) "%s"
|
|
string(1510) "%s"
|
|
string(1510) "%s"
|
|
string(1510) "%s"
|
|
string(1510) "%s"
|
|
string(1510) "%s"
|
|
-string(1506) "%s"
|
|
diff --git a/ext/openssl/tests/openssl_spki_verify_basic.phpt b/ext/openssl/tests/openssl_spki_verify_basic.phpt
|
|
index 5559c6b388a4..9b624a7a5f72 100644
|
|
--- a/ext/openssl/tests/openssl_spki_verify_basic.phpt
|
|
+++ b/ext/openssl/tests/openssl_spki_verify_basic.phpt
|
|
@@ -23,7 +23,6 @@ $algo = array(
|
|
OPENSSL_ALGO_SHA256,
|
|
OPENSSL_ALGO_SHA384,
|
|
OPENSSL_ALGO_SHA512,
|
|
- OPENSSL_ALGO_RMD160
|
|
);
|
|
|
|
/* loop over key sizes for test */
|
|
@@ -78,9 +77,3 @@ bool(true)
|
|
bool(false)
|
|
bool(true)
|
|
bool(false)
|
|
-bool(true)
|
|
-bool(false)
|
|
-bool(true)
|
|
-bool(false)
|
|
-bool(true)
|
|
-bool(false)
|