|
 |
68c1c4 |
From 46cd5a7d9434ed104093152bdf0a55404e6a1c6b Mon Sep 17 00:00:00 2001
|
|
|
68c1c4 |
From: Rob Crittenden <rcritten@redhat.com>
|
|
|
68c1c4 |
Date: Tue, 5 Oct 2021 11:04:10 -0400
|
|
|
68c1c4 |
Subject: [PATCH] Update csrgen test to understand OpenSSL 3.0.0 output
|
|
|
68c1c4 |
|
|
|
68c1c4 |
OpenSSL 3.0.0 change a lot of output messages. When verifying
|
|
|
68c1c4 |
a certificate instead of printing just "verify OK" it prints
|
|
|
68c1c4 |
"Certificate request self-signature verify OK"
|
|
|
68c1c4 |
|
|
|
68c1c4 |
Modify the check to match both OpenSSL 1.x and 3.x
|
|
|
68c1c4 |
|
|
|
68c1c4 |
Related: https://pagure.io/certmonger/issue/223
|
|
|
68c1c4 |
|
|
|
68c1c4 |
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
|
|
|
68c1c4 |
---
|
|
|
68c1c4 |
tests/003-csrgen-ec/run.sh | 4 ++--
|
|
|
68c1c4 |
tests/003-csrgen-rsa/run.sh | 4 ++--
|
|
|
68c1c4 |
tests/003-csrgen/run.sh | 4 ++--
|
|
|
68c1c4 |
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
68c1c4 |
|
|
|
68c1c4 |
diff --git a/tests/003-csrgen-ec/run.sh b/tests/003-csrgen-ec/run.sh
|
|
|
68c1c4 |
index 91117ec8..7c0505f8 100755
|
|
|
68c1c4 |
--- a/tests/003-csrgen-ec/run.sh
|
|
|
68c1c4 |
+++ b/tests/003-csrgen-ec/run.sh
|
|
|
68c1c4 |
@@ -42,8 +42,8 @@ grep ^minicert= entry.nss.$size | sed s,^minicert=,, | base64 -d > minicert.nss.
|
|
|
68c1c4 |
openssl x509 -out minicert.nss.$size.pem -in minicert.nss.$size -inform der
|
|
|
68c1c4 |
# The RSA tests already verify the contents of the requests, so we really only
|
|
|
68c1c4 |
# need to care about the signatures passing verification.
|
|
|
68c1c4 |
-openssl req -verify -noout < csr.nss.$size 2>&1
|
|
|
68c1c4 |
-openssl req -verify -noout < csr.openssl.$size 2>&1
|
|
|
68c1c4 |
+openssl req -verify -noout -noenc < csr.nss.$size 2>&1 | sed 's/Certificate request self-signature //'
|
|
|
68c1c4 |
+openssl req -verify -noout -noenc < csr.openssl.$size 2>&1 | sed 's/Certificate request self-signature //'
|
|
|
68c1c4 |
openssl spkac -verify -noout < spkac.nss.$size 2>&1
|
|
|
68c1c4 |
openssl spkac -verify -noout < spkac.openssl.$size 2>&1
|
|
|
68c1c4 |
openssl verify -CAfile minicert.openssl.$size.pem minicert.openssl.$size.pem 2>&1
|
|
|
68c1c4 |
diff --git a/tests/003-csrgen-rsa/run.sh b/tests/003-csrgen-rsa/run.sh
|
|
|
68c1c4 |
index bb8ebecb..4f0c0ef0 100755
|
|
|
68c1c4 |
--- a/tests/003-csrgen-rsa/run.sh
|
|
|
68c1c4 |
+++ b/tests/003-csrgen-rsa/run.sh
|
|
|
68c1c4 |
@@ -118,14 +118,14 @@ iterate() {
|
|
|
68c1c4 |
echo key_pubkey=616263 >> entry.openssl.$size
|
|
|
68c1c4 |
$toolsdir/csrgen entry.nss.$size > csr.nss.$size
|
|
|
68c1c4 |
# Both should verify.
|
|
|
68c1c4 |
- if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout 2>&1`" != "verify OK" ; then
|
|
|
68c1c4 |
+ if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout -noenc 2>&1 | grep -c "verify OK"`" != "1" ; then
|
|
|
68c1c4 |
echo Signature failed for OpenSSL:
|
|
|
68c1c4 |
cat csr.openssl.$size
|
|
|
68c1c4 |
echo Private key:
|
|
|
68c1c4 |
awk '/BEGIN PRIVATE KEY/,/END PRIVATE KEY/{print}{;}' $tmpdir/key.$size
|
|
|
68c1c4 |
exit 1
|
|
|
68c1c4 |
fi
|
|
|
68c1c4 |
- if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout 2>&1`" != "verify OK" ; then
|
|
|
68c1c4 |
+ if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout -noenc 2>&1 | grep -c "verify OK"`" != "1" ; then
|
|
|
68c1c4 |
echo Signature failed for NSS:
|
|
|
68c1c4 |
cat csr.nss.$size
|
|
|
68c1c4 |
echo Private key:
|
|
|
68c1c4 |
diff --git a/tests/003-csrgen/run.sh b/tests/003-csrgen/run.sh
|
|
|
68c1c4 |
index d3dfbaf0..093beabf 100755
|
|
|
68c1c4 |
--- a/tests/003-csrgen/run.sh
|
|
|
68c1c4 |
+++ b/tests/003-csrgen/run.sh
|
|
|
68c1c4 |
@@ -170,14 +170,14 @@ iterate() {
|
|
|
68c1c4 |
echo key_pubkey=616263 >> entry.openssl.$size
|
|
|
68c1c4 |
$toolsdir/csrgen entry.nss.$size > csr.nss.$size
|
|
|
68c1c4 |
# Both should verify.
|
|
|
68c1c4 |
- if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout 2>&1`" != "verify OK" ; then
|
|
|
68c1c4 |
+ if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout -noenc 2>&1 | grep -c "verify OK"`" != "1" ; then
|
|
|
68c1c4 |
echo Signature failed for OpenSSL:
|
|
|
68c1c4 |
cat csr.openssl.$size
|
|
|
68c1c4 |
echo Private key:
|
|
|
68c1c4 |
awk '/BEGIN PRIVATE KEY/,/END PRIVATE KEY/{print}{;}' $tmpdir/key.$size
|
|
|
68c1c4 |
exit 1
|
|
|
68c1c4 |
fi
|
|
|
68c1c4 |
- if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout 2>&1`" != "verify OK" ; then
|
|
|
68c1c4 |
+ if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout -noenc 2>&1 | grep -c "verify OK"`" != "1" ; then
|
|
|
68c1c4 |
echo Signature failed for NSS:
|
|
|
68c1c4 |
cat csr.nss.$size
|
|
|
68c1c4 |
echo Private key:
|
|
|
68c1c4 |
--
|
|
|
68c1c4 |
2.31.1
|
|
|
68c1c4 |
|