mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-15 20:25:17 +03:00
103 lines
4.7 KiB
Diff
103 lines
4.7 KiB
Diff
Patch-Source: https://github.com/php/php-src/commit/0a530d7650c6f9cb7c1b55755c8bf5961052039c
|
|
From 0a530d7650c6f9cb7c1b55755c8bf5961052039c Mon Sep 17 00:00:00 2001
|
|
From: Nikita Popov <nikita.ppv@gmail.com>
|
|
Date: Wed, 4 Aug 2021 09:57:40 +0200
|
|
Subject: [PATCH] Adjust some tests for whitespace differences in OpenSSL 3
|
|
|
|
A trailing newline is no longer present in OpenSSL 3.
|
|
---
|
|
ext/openssl/tests/bug28382.phpt | 17 +++++++----------
|
|
ext/openssl/tests/cve2013_4073.phpt | 5 ++---
|
|
ext/openssl/tests/openssl_x509_parse_basic.phpt | 10 ++++------
|
|
3 files changed, 13 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt
|
|
index 1d503ec8993d..e2842023135c 100644
|
|
--- a/ext/openssl/tests/bug28382.phpt
|
|
+++ b/ext/openssl/tests/bug28382.phpt
|
|
@@ -7,11 +7,10 @@ openssl
|
|
$cert = file_get_contents(__DIR__ . "/bug28382cert.txt");
|
|
$ext = openssl_x509_parse($cert);
|
|
var_dump($ext['extensions']);
|
|
-/* openssl 1.0 prepends the string "Full Name:" to the crlDistributionPoints array key.
|
|
- For now, as this is the one difference only between 0.9.x and 1.x, it's handled with
|
|
- placeholders to not to duplicate the test. When more diffs come, a duplication would
|
|
- be probably a better solution.
|
|
-*/
|
|
+/*
|
|
+ * The reason for %A at the end of crlDistributionPoints and authorityKeyIdentifier is that
|
|
+ * OpenSSL 3.0 removes new lines which were present in previous versions.
|
|
+ */
|
|
?>
|
|
--EXPECTF--
|
|
array(11) {
|
|
@@ -22,8 +21,7 @@ array(11) {
|
|
["nsCertType"]=>
|
|
string(30) "SSL Client, SSL Server, S/MIME"
|
|
["crlDistributionPoints"]=>
|
|
- string(%d) "%AURI:http://mobile.blue-software.ro:90/ca/crl.shtml
|
|
-"
|
|
+ string(%d) "%AURI:http://mobile.blue-software.ro:90/ca/crl.shtml%A"
|
|
["nsCaPolicyUrl"]=>
|
|
string(38) "http://mobile.blue-software.ro:90/pub/"
|
|
["subjectAltName"]=>
|
|
@@ -31,9 +29,8 @@ array(11) {
|
|
["subjectKeyIdentifier"]=>
|
|
string(59) "B0:A7:FF:F9:41:15:DE:23:39:BD:DD:31:0F:97:A0:B2:A2:74:E0:FC"
|
|
["authorityKeyIdentifier"]=>
|
|
- string(115) "DirName:/C=RO/ST=Romania/L=Craiova/O=Sergiu/OU=Sergiu SRL/CN=Sergiu CA/emailAddress=n_sergiu@hotmail.com
|
|
-serial:00
|
|
-"
|
|
+ string(%d) "DirName:/C=RO/ST=Romania/L=Craiova/O=Sergiu/OU=Sergiu SRL/CN=Sergiu CA/emailAddress=n_sergiu@hotmail.com
|
|
+serial:00%A"
|
|
["keyUsage"]=>
|
|
string(71) "Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment"
|
|
["nsBaseUrl"]=>
|
|
diff --git a/ext/openssl/tests/cve2013_4073.phpt b/ext/openssl/tests/cve2013_4073.phpt
|
|
index f403676ab795..6c08e47eb751 100644
|
|
--- a/ext/openssl/tests/cve2013_4073.phpt
|
|
+++ b/ext/openssl/tests/cve2013_4073.phpt
|
|
@@ -9,11 +9,10 @@ $info = openssl_x509_parse($cert);
|
|
var_export($info['extensions']);
|
|
|
|
?>
|
|
---EXPECT--
|
|
+--EXPECTF--
|
|
array (
|
|
'basicConstraints' => 'CA:FALSE',
|
|
'subjectKeyIdentifier' => '88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C',
|
|
'keyUsage' => 'Digital Signature, Non Repudiation, Key Encipherment',
|
|
- 'subjectAltName' => 'DNS:altnull.python.org' . "\0" . 'example.com, email:null@python.org' . "\0" . 'user@example.org, URI:http://null.python.org' . "\0" . 'http://example.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
|
|
-',
|
|
+ 'subjectAltName' => 'DNS:altnull.python.org' . "\0" . 'example.com, email:null@python.org' . "\0" . 'user@example.org, URI:http://null.python.org' . "\0" . 'http://example.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1%A',
|
|
)
|
|
diff --git a/ext/openssl/tests/openssl_x509_parse_basic.phpt b/ext/openssl/tests/openssl_x509_parse_basic.phpt
|
|
index 7416673dbecb..f9181dd65d5a 100644
|
|
--- a/ext/openssl/tests/openssl_x509_parse_basic.phpt
|
|
+++ b/ext/openssl/tests/openssl_x509_parse_basic.phpt
|
|
@@ -153,10 +153,9 @@ array(16) {
|
|
["subjectKeyIdentifier"]=>
|
|
string(59) "DB:7E:40:72:BD:5C:35:85:EC:29:29:81:12:E8:62:68:6A:B7:3F:7D"
|
|
["authorityKeyIdentifier"]=>
|
|
- string(202) "keyid:DB:7E:40:72:BD:5C:35:85:EC:29:29:81:12:E8:62:68:6A:B7:3F:7D
|
|
+ string(%d) "keyid:DB:7E:40:72:BD:5C:35:85:EC:29:29:81:12:E8:62:68:6A:B7:3F:7D
|
|
DirName:/C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. Angelo/emailAddress=hnangelo@php.net
|
|
-serial:AE:C5:56:CC:72:37:50:A2
|
|
-"
|
|
+serial:AE:C5:56:CC:72:37:50:A2%A"
|
|
["basicConstraints"]=>
|
|
string(7) "CA:TRUE"
|
|
}
|
|
@@ -301,10 +300,9 @@ array(16) {
|
|
["subjectKeyIdentifier"]=>
|
|
string(59) "DB:7E:40:72:BD:5C:35:85:EC:29:29:81:12:E8:62:68:6A:B7:3F:7D"
|
|
["authorityKeyIdentifier"]=>
|
|
- string(202) "keyid:DB:7E:40:72:BD:5C:35:85:EC:29:29:81:12:E8:62:68:6A:B7:3F:7D
|
|
+ string(%d) "keyid:DB:7E:40:72:BD:5C:35:85:EC:29:29:81:12:E8:62:68:6A:B7:3F:7D
|
|
DirName:/C=BR/ST=Rio Grande do Sul/L=Porto Alegre/CN=Henrique do N. Angelo/emailAddress=hnangelo@php.net
|
|
-serial:AE:C5:56:CC:72:37:50:A2
|
|
-"
|
|
+serial:AE:C5:56:CC:72:37:50:A2%A"
|
|
["basicConstraints"]=>
|
|
string(7) "CA:TRUE"
|
|
}
|