From 91793c6a31aa587b266faa803f3eba77c1db923e Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 5 Jan 2022 15:16:44 -0500 Subject: [PATCH] Update to upstream 0.79.15 --- .gitignore | 1 + 0001-candidate-openssl-3.0-compat-fixes.patch | 573 ------------------ ...k-for-EVP_PKEY_get_id-along-with-EVP.patch | 46 -- 0003-Use-extensions-template-from-NSS.patch | 80 --- ...-implicit-empty-FALSE-for-extensions.patch | 280 --------- ...st-to-understand-OpenSSL-3.0.0-outpu.patch | 80 --- certmonger.spec | 13 +- sources | 2 +- 8 files changed, 7 insertions(+), 1068 deletions(-) delete mode 100644 0001-candidate-openssl-3.0-compat-fixes.patch delete mode 100644 0002-Add-compile-check-for-EVP_PKEY_get_id-along-with-EVP.patch delete mode 100644 0003-Use-extensions-template-from-NSS.patch delete mode 100644 0004-Use-implicit-empty-FALSE-for-extensions.patch delete mode 100644 0005-Update-csrgen-test-to-understand-OpenSSL-3.0.0-outpu.patch diff --git a/.gitignore b/.gitignore index a56070a..7f04854 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,4 @@ certmonger-0.28.tar.gz /certmonger-0.79.12.tar.gz /certmonger-0.79.13.tar.gz /certmonger-0.79.14.tar.gz +/certmonger-0.79.15.tar.gz diff --git a/0001-candidate-openssl-3.0-compat-fixes.patch b/0001-candidate-openssl-3.0-compat-fixes.patch deleted file mode 100644 index 0d4ca18..0000000 --- a/0001-candidate-openssl-3.0-compat-fixes.patch +++ /dev/null @@ -1,573 +0,0 @@ -From 3fb9420e843694567a4976c6d5fbe4551d6e0c99 Mon Sep 17 00:00:00 2001 -From: Rob Crittenden -Date: Tue, 18 May 2021 15:40:53 -0400 -Subject: [PATCH 1/3] candidate openssl 3.0 compat fixes - ---- - src/keyiread-o.c | 16 +++++-- - src/util-o.c | 2 + - tests/001-keyiread-ec/run.sh | 2 +- - tests/001-keyiread-rsa/run.sh | 2 +- - tests/001-keyiread/run.sh | 2 +- - tests/002-keygen-sql/prequal.sh | 5 +++ - tests/002-keygen/run.sh | 2 +- - tests/003-csrgen-ec/run.sh | 2 +- - tests/003-csrgen-rsa/run.sh | 2 +- - tests/003-csrgen/run.sh | 2 +- - tests/004-selfsign-ec/run.sh | 2 +- - tests/004-selfsign-rsa/run.sh | 2 +- - tests/004-selfsign/run.sh | 2 +- - tests/025-casave/run.sh | 2 +- - tests/026-local/expected.openssl1 | 73 ++++++++++++++++++++++++++++++ - tests/026-local/expected.openssl3 | 68 ++++++++++++++++++++++++++++ - tests/026-local/expected.out | 74 +------------------------------ - tests/026-local/run.sh | 11 ++++- - tests/030-rekey/expected.out | 4 -- - tests/030-rekey/run.sh | 10 +---- - tests/036-getcert/run.sh | 2 +- - 21 files changed, 184 insertions(+), 103 deletions(-) - create mode 100755 tests/002-keygen-sql/prequal.sh - create mode 100644 tests/026-local/expected.openssl1 - create mode 100644 tests/026-local/expected.openssl3 - -diff --git a/src/keyiread-o.c b/src/keyiread-o.c -index 9fceacf6..51f7f829 100644 ---- a/src/keyiread-o.c -+++ b/src/keyiread-o.c -@@ -182,9 +182,13 @@ cm_keyiread_o_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry, - pubikey = cm_store_hex_from_bin(NULL, tmp, length); - } - tmp = NULL; -- length = i2d_PublicKey(pkey, (unsigned char **) &tmp); -+ length = i2d_PublicKey(pkey, NULL); - if (length > 0) { -- pubkey = cm_store_hex_from_bin(NULL, tmp, length); -+ tmp = malloc(length); -+ if (tmp != NULL) { -+ length = i2d_PublicKey(pkey, (unsigned char **) &tmp); -+ pubkey = cm_store_hex_from_bin(NULL, tmp, length); -+ } - } - } - fprintf(fp, "%s/%d/%s/%s\n", alg, bits, pubikey, pubkey); -@@ -219,9 +223,13 @@ cm_keyiread_o_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry, - pubikey = cm_store_hex_from_bin(NULL, tmp, length); - } - tmp = NULL; -- length = i2d_PublicKey(nextpkey, (unsigned char **) &tmp); -+ length = i2d_PublicKey(nextpkey, NULL); - if (length > 0) { -- pubkey = cm_store_hex_from_bin(NULL, tmp, length); -+ tmp = malloc(length); -+ if (tmp != NULL) { -+ length = i2d_PublicKey(nextpkey, (unsigned char **) &tmp); -+ pubkey = cm_store_hex_from_bin(NULL, tmp, length); -+ } - } - fprintf(fp, "%s/%d/%s/%s\n", alg, bits, pubikey, pubkey); - } else { -diff --git a/src/util-o.c b/src/util-o.c -index 0415014a..2208ab64 100644 ---- a/src/util-o.c -+++ b/src/util-o.c -@@ -46,6 +46,7 @@ - void - util_o_init(void) - { -+#if OPENSSL_VERSION_MAJOR < 3 - #if defined(HAVE_DECL_OPENSSL_ADD_ALL_ALGORITHMS) && HAVE_DECL_OPENSSL_ADD_ALL_ALGORITHMS - OpenSSL_add_all_algorithms(); - #elif defined(HAVE_DECL_OPENSSL_ADD_SSL_ALGORITHMS) && HAVE_DECL_OPENSSL_ADD_SSL_ALGORITHMS -@@ -53,6 +54,7 @@ util_o_init(void) - #else - SSL_library_init(); - #endif -+#endif - } - - char * -diff --git a/tests/001-keyiread-ec/run.sh b/tests/001-keyiread-ec/run.sh -index 3045f6d0..8a810d15 100755 ---- a/tests/001-keyiread-ec/run.sh -+++ b/tests/001-keyiread-ec/run.sh -@@ -18,7 +18,7 @@ for size in nistp256 nistp384 nistp521 ; do - EOF - $toolsdir/keyiread entry.nss.$size - # Export the key. -- if ! pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 ; then -+ if ! pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 ; then - echo Error exporting key for $size, continuing. - continue - fi -diff --git a/tests/001-keyiread-rsa/run.sh b/tests/001-keyiread-rsa/run.sh -index c6b4d38b..997ce000 100755 ---- a/tests/001-keyiread-rsa/run.sh -+++ b/tests/001-keyiread-rsa/run.sh -@@ -11,7 +11,7 @@ for size in 2048 3072 4096 ; do - -s "cn=T$size" -c "cn=T$size" \ - -x -t u -k rsa - # Export the key. -- pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 - openssl pkcs12 -in $size.p12 -out key.$size -passin pass: -nodes -nocerts > /dev/null 2>&1 - cat > entry.openssl.$size <<- EOF - key_storage_type=FILE -diff --git a/tests/001-keyiread/run.sh b/tests/001-keyiread/run.sh -index 25acdbd8..3a2502a6 100755 ---- a/tests/001-keyiread/run.sh -+++ b/tests/001-keyiread/run.sh -@@ -11,7 +11,7 @@ for size in 2048 3072 4096 ; do - -s "cn=T$size" -c "cn=T$size" \ - -x -t u - # Export the key. -- pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 - openssl pkcs12 -in $size.p12 -out key.$size -passin pass: -nodes -nocerts > /dev/null 2>&1 - cat > entry.openssl.$size <<- EOF - key_storage_type=FILE -diff --git a/tests/002-keygen-sql/prequal.sh b/tests/002-keygen-sql/prequal.sh -new file mode 100755 -index 00000000..d146a650 ---- /dev/null -+++ b/tests/002-keygen-sql/prequal.sh -@@ -0,0 +1,5 @@ -+#!/bin/sh -+if test `id -u` -eq 0 ; then -+ echo "This test won't work right if run as root." -+ exit 1 -+fi -diff --git a/tests/002-keygen/run.sh b/tests/002-keygen/run.sh -index 8bb609c5..e7e6525f 100755 ---- a/tests/002-keygen/run.sh -+++ b/tests/002-keygen/run.sh -@@ -2,7 +2,7 @@ - - cd "$tmpdir" - --scheme="${scheme:-dbm:}" -+scheme="${scheme:-sql:}" - - source "$srcdir"/functions - initnssdb "$scheme$tmpdir" -diff --git a/tests/003-csrgen-ec/run.sh b/tests/003-csrgen-ec/run.sh -index 91117ec8..408ea526 100755 ---- a/tests/003-csrgen-ec/run.sh -+++ b/tests/003-csrgen-ec/run.sh -@@ -12,7 +12,7 @@ run_certutil -d "$tmpdir" -S -n keyi$size \ - -s "cn=T$size" -c "cn=T$size" \ - -x -t u -k ec -q $size - # Export the key. --pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 -+pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 - openssl pkcs12 -in $size.p12 -out key.$size -passin pass: -nodes -nocerts > /dev/null 2>&1 | ( grep -v '^MAC verified OK$' || : ) - # Read the public key and cache it. - cat > entry.openssl.$size <<- EOF -diff --git a/tests/003-csrgen-rsa/run.sh b/tests/003-csrgen-rsa/run.sh -index bb8ebecb..9c11c708 100755 ---- a/tests/003-csrgen-rsa/run.sh -+++ b/tests/003-csrgen-rsa/run.sh -@@ -11,7 +11,7 @@ for size in 2048 3072 4096 ; do - -s "cn=T$size" -c "cn=T$size" \ - -x -t u -k rsa - # Export the key. -- pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" - openssl pkcs12 -in $size.p12 -out key.$size -passin pass: -nodes -nocerts 2>&1 | ( grep -v '^MAC verified OK$' || : ) - # Read the public key and cache it. - cat > entry.openssl.$size <<- EOF -diff --git a/tests/003-csrgen/run.sh b/tests/003-csrgen/run.sh -index d3dfbaf0..2a674679 100755 ---- a/tests/003-csrgen/run.sh -+++ b/tests/003-csrgen/run.sh -@@ -11,7 +11,7 @@ for size in 2048 3072 4096 ; do - -s "cn=T$size" -c "cn=T$size" \ - -x -t u - # Export the key. -- pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" - openssl pkcs12 -in $size.p12 -out key.$size -passin pass: -nodes -nocerts 2>&1 | ( grep -v "^MAC verified OK$" || : ) - # Read the public key and cache it. - cat > entry.openssl.$size <<- EOF -diff --git a/tests/004-selfsign-ec/run.sh b/tests/004-selfsign-ec/run.sh -index 9d5bd11f..d1161fe5 100755 ---- a/tests/004-selfsign-ec/run.sh -+++ b/tests/004-selfsign-ec/run.sh -@@ -39,7 +39,7 @@ run_certutil -d "$tmpdir" -S -n keyi$size \ - -s "cn=T$size" -c "cn=T$size" \ - -x -t u -k ec -q $size - # Export the certificate and key. --pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 -+pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 - openssl pkcs12 -in $size.p12 -passin pass: -out key.$size -nodes > /dev/null 2>&1 - # Read that OpenSSL key. - cat > entry.$size <<- EOF -diff --git a/tests/004-selfsign-rsa/run.sh b/tests/004-selfsign-rsa/run.sh -index c1dd4c80..b0cc71d2 100755 ---- a/tests/004-selfsign-rsa/run.sh -+++ b/tests/004-selfsign-rsa/run.sh -@@ -39,7 +39,7 @@ for size in 2048 3072 4096 ; do - -s "cn=T$size" -c "cn=T$size" \ - -x -t u -k rsa - # Export the certificate and key. -- pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 - openssl pkcs12 -in $size.p12 -passin pass: -out key.$size -nodes > /dev/null 2>&1 - # Read that OpenSSL key. - cat > entry.$size <<- EOF -diff --git a/tests/004-selfsign/run.sh b/tests/004-selfsign/run.sh -index eb1df4ee..ea00f4d7 100755 ---- a/tests/004-selfsign/run.sh -+++ b/tests/004-selfsign/run.sh -@@ -49,7 +49,7 @@ for size in 2048 3072 4096 ; do - -s "cn=T$size" -c "cn=T$size" \ - -x -t u - # Export the certificate and key. -- pk12util -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -o $size.p12 -W "" -n "keyi$size" > /dev/null 2>&1 - openssl pkcs12 -in $size.p12 -passin pass: -out key.$size -nodes > /dev/null 2>&1 - # Read that OpenSSL key. - cat > entry.$size <<- EOF -diff --git a/tests/025-casave/run.sh b/tests/025-casave/run.sh -index d81df82f..089d8223 100755 ---- a/tests/025-casave/run.sh -+++ b/tests/025-casave/run.sh -@@ -2,7 +2,7 @@ - - cd $tmpdir - --scheme="${scheme:-dbm}" -+scheme="${scheme:-sql}" - cat > $tmpdir/entrycb1 <<- EOF - id=EntryCB1 - ca_name=CAB1 -diff --git a/tests/026-local/expected.openssl1 b/tests/026-local/expected.openssl1 -new file mode 100644 -index 00000000..1f81c7ce ---- /dev/null -+++ b/tests/026-local/expected.openssl1 -@@ -0,0 +1,73 @@ -+[key] -+OK. -+[csr] -+Certificate Request: -+ Data: -+ Version: 1 (0x0) -+ Subject: CN=Babs Jensen's Signer -+ Attributes: -+ friendlyName :unable to print attribute -+ Requested Extensions: -+ X509v3 Key Usage: -+ Digital Signature, Certificate Sign, CRL Sign -+ X509v3 Subject Alternative Name: -+ email:root@localhost, email:root@localhost.localdomain -+ X509v3 Basic Constraints: critical -+ CA:TRUE -+ X509v3 Authority Key Identifier: -+ keyid:(160 bits) -+ -+ X509v3 Subject Key Identifier: -+ (160 bits) -+ Authority Information Access: -+ OCSP - URI:http://ocsp-1.example.com:12345 -+ OCSP - URI:http://ocsp-2.example.com:12345 -+ -+ OCSP No Check: -+ -+[issue] -+[issuer] -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Signature Algorithm: sha256WithRSAEncryption -+ Issuer: CN=Local Signing Authority, CN=$UUID -+ Subject: CN=Local Signing Authority, CN=$UUID -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:TRUE -+ X509v3 Subject Key Identifier: -+ (160 bits) -+ X509v3 Authority Key Identifier: -+ keyid:(160 bits) -+ -+ X509v3 Key Usage: critical -+ Digital Signature, Certificate Sign, CRL Sign -+[subject] -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Signature Algorithm: sha256WithRSAEncryption -+ Issuer: CN=Local Signing Authority, CN=$UUID -+ Subject: CN=Babs Jensen's Signer -+ X509v3 extensions: -+ X509v3 Key Usage: -+ Digital Signature, Certificate Sign, CRL Sign -+ X509v3 Subject Alternative Name: -+ email:root@localhost, email:root@localhost.localdomain -+ X509v3 Basic Constraints: critical -+ CA:TRUE -+ X509v3 Authority Key Identifier: -+ keyid:(160 bits) -+ -+ X509v3 Subject Key Identifier: -+ (160 bits) -+ Authority Information Access: -+ OCSP - URI:http://ocsp-1.example.com:12345 -+ OCSP - URI:http://ocsp-2.example.com:12345 -+ -+ OCSP No Check: -+ -+[verify] -+cert: OK -+OK. -diff --git a/tests/026-local/expected.openssl3 b/tests/026-local/expected.openssl3 -new file mode 100644 -index 00000000..05666ccc ---- /dev/null -+++ b/tests/026-local/expected.openssl3 -@@ -0,0 +1,68 @@ -+[key] -+OK. -+[csr] -+Certificate Request: -+ Data: -+ Version: 1 (0x0) -+ Subject: CN=Babs Jensen's Signer -+ Attributes: -+ friendlyName :unable to print attribute -+ Requested Extensions: -+ X509v3 Key Usage: -+ Digital Signature, Certificate Sign, CRL Sign -+ X509v3 Subject Alternative Name: -+ email:root@localhost, email:root@localhost.localdomain -+ X509v3 Basic Constraints: critical -+ CA:TRUE -+ X509v3 Authority Key Identifier: -+ (160 bits) -+ X509v3 Subject Key Identifier: -+ (160 bits) -+ Authority Information Access: -+ OCSP - URI:http://ocsp-1.example.com:12345 -+ OCSP - URI:http://ocsp-2.example.com:12345 -+ OCSP No Check: -+ -+[issue] -+[issuer] -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Signature Algorithm: sha256WithRSAEncryption -+ Issuer: CN=Local Signing Authority, CN=$UUID -+ Subject: CN=Local Signing Authority, CN=$UUID -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:TRUE -+ X509v3 Subject Key Identifier: -+ (160 bits) -+ X509v3 Authority Key Identifier: -+ (160 bits) -+ X509v3 Key Usage: critical -+ Digital Signature, Certificate Sign, CRL Sign -+[subject] -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Signature Algorithm: sha256WithRSAEncryption -+ Issuer: CN=Local Signing Authority, CN=$UUID -+ Subject: CN=Babs Jensen's Signer -+ X509v3 extensions: -+ X509v3 Key Usage: -+ Digital Signature, Certificate Sign, CRL Sign -+ X509v3 Subject Alternative Name: -+ email:root@localhost, email:root@localhost.localdomain -+ X509v3 Basic Constraints: critical -+ CA:TRUE -+ X509v3 Authority Key Identifier: -+ (160 bits) -+ X509v3 Subject Key Identifier: -+ (160 bits) -+ Authority Information Access: -+ OCSP - URI:http://ocsp-1.example.com:12345 -+ OCSP - URI:http://ocsp-2.example.com:12345 -+ OCSP No Check: -+ -+[verify] -+cert: OK -+OK. -diff --git a/tests/026-local/expected.out b/tests/026-local/expected.out -index 1f81c7ce..64afb8f5 100644 ---- a/tests/026-local/expected.out -+++ b/tests/026-local/expected.out -@@ -1,73 +1 @@ --[key] --OK. --[csr] --Certificate Request: -- Data: -- Version: 1 (0x0) -- Subject: CN=Babs Jensen's Signer -- Attributes: -- friendlyName :unable to print attribute -- Requested Extensions: -- X509v3 Key Usage: -- Digital Signature, Certificate Sign, CRL Sign -- X509v3 Subject Alternative Name: -- email:root@localhost, email:root@localhost.localdomain -- X509v3 Basic Constraints: critical -- CA:TRUE -- X509v3 Authority Key Identifier: -- keyid:(160 bits) -- -- X509v3 Subject Key Identifier: -- (160 bits) -- Authority Information Access: -- OCSP - URI:http://ocsp-1.example.com:12345 -- OCSP - URI:http://ocsp-2.example.com:12345 -- -- OCSP No Check: -- --[issue] --[issuer] --Certificate: -- Data: -- Version: 3 (0x2) -- Signature Algorithm: sha256WithRSAEncryption -- Issuer: CN=Local Signing Authority, CN=$UUID -- Subject: CN=Local Signing Authority, CN=$UUID -- X509v3 extensions: -- X509v3 Basic Constraints: critical -- CA:TRUE -- X509v3 Subject Key Identifier: -- (160 bits) -- X509v3 Authority Key Identifier: -- keyid:(160 bits) -- -- X509v3 Key Usage: critical -- Digital Signature, Certificate Sign, CRL Sign --[subject] --Certificate: -- Data: -- Version: 3 (0x2) -- Signature Algorithm: sha256WithRSAEncryption -- Issuer: CN=Local Signing Authority, CN=$UUID -- Subject: CN=Babs Jensen's Signer -- X509v3 extensions: -- X509v3 Key Usage: -- Digital Signature, Certificate Sign, CRL Sign -- X509v3 Subject Alternative Name: -- email:root@localhost, email:root@localhost.localdomain -- X509v3 Basic Constraints: critical -- CA:TRUE -- X509v3 Authority Key Identifier: -- keyid:(160 bits) -- -- X509v3 Subject Key Identifier: -- (160 bits) -- Authority Information Access: -- OCSP - URI:http://ocsp-1.example.com:12345 -- OCSP - URI:http://ocsp-2.example.com:12345 -- -- OCSP No Check: -- --[verify] --cert: OK --OK. -+# purposely empty -diff --git a/tests/026-local/run.sh b/tests/026-local/run.sh -index 6f0e74c9..3e7ade56 100755 ---- a/tests/026-local/run.sh -+++ b/tests/026-local/run.sh -@@ -1,4 +1,13 @@ --#!/bin/bash -e -+#!/bin/bash -+ -+openssl cmp -h > /dev/null 2>&1 -+if [ $? == 1 ]; then -+ cp expected.openssl1 expected.out -+else -+ cp expected.openssl3 expected.out -+fi -+ -+set -e - - cd $tmpdir - -diff --git a/tests/030-rekey/expected.out b/tests/030-rekey/expected.out -index e9a04221..8a9ac3fa 100644 ---- a/tests/030-rekey/expected.out -+++ b/tests/030-rekey/expected.out -@@ -11,7 +11,6 @@ key_requested_count=0 - (submit OpenSSL) - key_issued_count=0 - key_requested_count=1 --First round certificates OK. - NSS keys before re-keygen (preserve=1,pin=""): - <-> rsa originalhex NSS Certificate DB:i2048 - key_issued_count=0 -@@ -98,7 +97,6 @@ key_requested_count=0 - (submit OpenSSL) - key_issued_count=0 - key_requested_count=1 --First round certificates OK. - NSS keys before re-keygen (preserve=1,pin="password"): - <-> rsa originalhex NSS Certificate DB:i2048 - key_issued_count=0 -@@ -185,7 +183,6 @@ key_requested_count=0 - (submit OpenSSL) - key_issued_count=0 - key_requested_count=1 --First round certificates OK. - NSS keys before re-keygen (preserve=0,pin=""): - <-> rsa originalhex NSS Certificate DB:i2048 - key_issued_count=0 -@@ -270,7 +267,6 @@ key_requested_count=0 - (submit OpenSSL) - key_issued_count=0 - key_requested_count=1 --First round certificates OK. - NSS keys before re-keygen (preserve=0,pin="password"): - <-> rsa originalhex NSS Certificate DB:i2048 - key_issued_count=0 -diff --git a/tests/030-rekey/run.sh b/tests/030-rekey/run.sh -index 07fea683..7b9125ec 100755 ---- a/tests/030-rekey/run.sh -+++ b/tests/030-rekey/run.sh -@@ -31,7 +31,7 @@ for preserve in 1 0 ; do - -s "cn=T$size" -c "cn=T$size" \ - -x -t u -m 4660 -f pinfile - # Export the certificate and key. -- pk12util -d "$tmpdir" -k pinfile -o $size.p12 -W "" -n "i$size" > /dev/null 2>&1 -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir" -k pinfile -o $size.p12 -W "" -n "i$size" > /dev/null 2>&1 - openssl pkcs12 -in $size.p12 -passin pass: -nocerts -passout pass:${pin:- -nodes} | awk '/^-----BEGIN/,/^-----END/{print}' > keyi$size - openssl pkcs12 -in $size.p12 -passin pass: -nokeys -nodes | awk '/^-----BEGIN/,/^-----END/{print}' > certi$size - # Grab a copy of the public key. -@@ -101,14 +101,6 @@ for preserve in 1 0 ; do - echo '(submit OpenSSL)' - $toolsdir/submit ca.self entry.openssl.$size > cert.openssl.$size - grep ^key.\*count= entry.openssl.$size | LANG=C sort -- # Now compare the self-signed certificates built from the keys. -- if ! cmp cert.nss.$size cert.openssl.$size ; then -- echo First round certificates differ: -- cat cert.nss.$size cert.openssl.$size -- exit 1 -- else -- echo First round certificates OK. -- fi - - # Now generate new keys, CSRs, and certificates (NSS). - echo "NSS keys before re-keygen (preserve=$preserve,pin=\"$pin\"):" -diff --git a/tests/036-getcert/run.sh b/tests/036-getcert/run.sh -index 1c99803d..bcb821d7 100755 ---- a/tests/036-getcert/run.sh -+++ b/tests/036-getcert/run.sh -@@ -51,7 +51,7 @@ listdb() { - } - - extract() { -- pk12util -d "$tmpdir"/db -n first -o "$tmpdir"/files/p12 -W "" -K "" -+ pk12util -C AES-128-CBC -c AES-128-CBC -d "$tmpdir"/db -n first -o "$tmpdir"/files/p12 -W "" -K "" - openssl pkcs12 -nokeys -nomacver -in "$tmpdir"/files/p12 -passin pass: -nodes | awk '/BEGIN/,/END/{print}' > "$1"/cert - openssl pkcs12 -nocerts -nomacver -in "$tmpdir"/files/p12 -passin pass: -nodes | awk '/BEGIN/,/END/{print}' > "$1"/key - echo -n cert: --- -2.26.3 - diff --git a/0002-Add-compile-check-for-EVP_PKEY_get_id-along-with-EVP.patch b/0002-Add-compile-check-for-EVP_PKEY_get_id-along-with-EVP.patch deleted file mode 100644 index 2016234..0000000 --- a/0002-Add-compile-check-for-EVP_PKEY_get_id-along-with-EVP.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f6672effea3cf9e50d6d3f29c1fbfbf6b1578e06 Mon Sep 17 00:00:00 2001 -From: Rob Crittenden -Date: Tue, 28 Sep 2021 10:01:35 -0400 -Subject: [PATCH] Add compile check for EVP_PKEY_get_id along with EVP_PKEY_id - -EVP_PKEY_id is no longer available as a function, only as a preprocessor -macro, so AC_CHECK_FUNCS cannot recognize it. - -This was changed in OpenSSL 3.0.0-beta2 - -https://bugzilla.redhat.com/show_bug.cgi?id=2008451 - -Signed-off-by: Rob Crittenden ---- - configure.ac | 1 + - src/util-o.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8bfa3fa..3b413a1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -374,6 +374,7 @@ if ! ${configure_dist_target_only:-false} ; then - AC_CHECK_FUNCS(ASN1_TIME_set) - AC_CHECK_FUNCS(EVP_PKEY_base_id) - AC_CHECK_FUNCS(EVP_PKEY_id) -+ AC_CHECK_FUNCS(EVP_PKEY_get_id) - AC_CHECK_FUNCS(OBJ_get0_data) - AC_CHECK_FUNCS(OBJ_length) - AC_CHECK_FUNCS(X509_ATTRIBUTE_get0_object) -diff --git a/src/util-o.c b/src/util-o.c -index 2208ab6..db45964 100644 ---- a/src/util-o.c -+++ b/src/util-o.c -@@ -329,7 +329,7 @@ util_ASN1_TIME_set(ASN1_TIME *str, time_t t) - int - util_EVP_PKEY_id(const EVP_PKEY *pkey) - { --#ifdef HAVE_EVP_PKEY_ID -+#if defined(HAVE_EVP_PKEY_ID) || defined(HAVE_EVP_PKEY_GET_ID) - return EVP_PKEY_id(pkey); - #else - return pkey->type; --- -2.31.1 - diff --git a/0003-Use-extensions-template-from-NSS.patch b/0003-Use-extensions-template-from-NSS.patch deleted file mode 100644 index 55a04cf..0000000 --- a/0003-Use-extensions-template-from-NSS.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 9312d1892c611d9f0e814cb915488182da2b76cc Mon Sep 17 00:00:00 2001 -From: Christian Heimes -Date: Mon, 4 Oct 2021 15:55:44 +0200 -Subject: [PATCH 3/4] Use extensions template from NSS - -Drop certmonger's custom extension template and use the sequence of X509v3 -extensions template from NSS. - -The certmonger template had a bug that caused certmonger to create CSRs -with invalid DER. It was encoding extension's critical element even for -default value FALSE. - -Fixes: https://pagure.io/certmonger/issue/223 -Signed-off-by: Christian Heimes ---- - src/certext.c | 41 +---------------------------------------- - 1 file changed, 1 insertion(+), 40 deletions(-) - -diff --git a/src/certext.c b/src/certext.c -index be536987..0d66971e 100644 ---- a/src/certext.c -+++ b/src/certext.c -@@ -203,45 +203,6 @@ cm_ms_template_template[] = { - {0, 0, NULL, 0}, - }; - --/* RFC 5280, 4.1 */ --const SEC_ASN1Template --cm_certext_cert_extension_template[] = { -- { -- .kind = SEC_ASN1_SEQUENCE, -- .offset = 0, -- .sub = NULL, -- .size = sizeof(CERTCertExtension), -- }, -- { -- .kind = SEC_ASN1_OBJECT_ID, -- .offset = offsetof(CERTCertExtension, id), -- .sub = NULL, -- .size = sizeof(SECItem), -- }, -- { -- .kind = SEC_ASN1_BOOLEAN, -- .offset = offsetof(CERTCertExtension, critical), -- .sub = NULL, -- .size = sizeof(SECItem), -- }, -- { -- .kind = SEC_ASN1_OCTET_STRING, -- .offset = offsetof(CERTCertExtension, value), -- .sub = NULL, -- .size = sizeof(SECItem), -- }, -- {0, 0, NULL, 0}, --}; --const SEC_ASN1Template --cm_certext_sequence_of_cert_extension_template[] = { -- { -- .kind = SEC_ASN1_SEQUENCE_OF, -- .offset = 0, -- .sub = cm_certext_cert_extension_template, -- .size = sizeof(CERTCertExtension **), -- }, --}; -- - /* Windows 2000-style UPN */ - static unsigned char oid_ms_upn_name_bytes[] = {0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x14, 0x02, 0x03}; - static const SECOidData oid_ms_upn_name = { -@@ -1960,7 +1921,7 @@ cm_certext_build_csr_extensions(struct cm_store_entry *entry, - /* Encode the sequence. */ - memset(&encoded, 0, sizeof(encoded)); - if (i > 1) { -- template = cm_certext_sequence_of_cert_extension_template; -+ template = CERT_SequenceOfCertExtensionTemplate; - if (SEC_ASN1EncodeItem(arena, &encoded, &exts_ptr, - template) == &encoded) { - *extensions = talloc_memdup(entry, encoded.data, --- -2.31.1 - diff --git a/0004-Use-implicit-empty-FALSE-for-extensions.patch b/0004-Use-implicit-empty-FALSE-for-extensions.patch deleted file mode 100644 index 54abc19..0000000 --- a/0004-Use-implicit-empty-FALSE-for-extensions.patch +++ /dev/null @@ -1,280 +0,0 @@ -From e3e4679693efc60bc7a25983909ddfa6883ab2ec Mon Sep 17 00:00:00 2001 -From: Christian Heimes -Date: Mon, 4 Oct 2021 18:52:53 +0200 -Subject: [PATCH 4/4] Use implicit, empty FALSE for extensions - -Cemplate had a bug that caused certmonger to create CSRs with invalid DER. -It was encoding extension's critical element even for default value FALSE. - -Fixes: https://pagure.io/certmonger/issue/223 -Signed-off-by: Christian Heimes ---- - src/certext.c | 7 +- - tests/003-csrgen-rsa/expected.out | 82 ++++++++++------------ - tests/003-csrgen/expected.out | 110 +++++++++++++----------------- - 3 files changed, 91 insertions(+), 108 deletions(-) - -diff --git a/src/certext.c b/src/certext.c -index 0d66971e..e5e0b4dc 100644 ---- a/src/certext.c -+++ b/src/certext.c -@@ -1706,9 +1706,12 @@ cm_certext_build_csr_extensions(struct cm_store_entry *entry, - CERTCertExtension ext[13], *exts[14], **exts_ptr; - SECOidData *oid; - SECItem *item, encoded; -+ /* X509v3 extension's critical element has an implicit default, -+ * see https://pagure.io/certmonger/issue/223 -+ */ - SECItem der_false = { -- .len = 1, -- .data = (unsigned char *) "\000", -+ .len = 0, -+ .data = NULL, - }; - SECItem der_true = { - .len = 1, -diff --git a/tests/003-csrgen-rsa/expected.out b/tests/003-csrgen-rsa/expected.out -index def53fe4..0fb88323 100644 ---- a/tests/003-csrgen-rsa/expected.out -+++ b/tests/003-csrgen-rsa/expected.out -@@ -8,8 +8,8 @@ pk12util: PKCS12 EXPORT SUCCESSFUL - 4096 OK. - Signature OK - The last CSR (the one with everything) was: -- 0:d=0 hl=4 l=1413 cons: SEQUENCE -- 4:d=1 hl=4 l=1133 cons: SEQUENCE -+ 0:d=0 hl=4 l=1389 cons: SEQUENCE -+ 4:d=1 hl=4 l=1109 cons: SEQUENCE - 8:d=2 hl=2 l= 1 prim: INTEGER :00 - 11:d=2 hl=2 l= 22 cons: SEQUENCE - 13:d=3 hl=2 l= 20 cons: SET -@@ -21,7 +21,7 @@ The last CSR (the one with everything) was: - 41:d=4 hl=2 l= 9 prim: OBJECT :rsaEncryption - 52:d=4 hl=2 l= 0 prim: NULL - 54:d=3 hl=4 l= 271 prim: BIT STRING -- 329:d=2 hl=4 l= 808 cons: cont [ 0 ] -+ 329:d=2 hl=4 l= 784 cons: cont [ 0 ] - 333:d=3 hl=2 l= 52 cons: SEQUENCE - 335:d=4 hl=2 l= 9 prim: OBJECT :challengePassword - 346:d=4 hl=2 l= 39 cons: SET -@@ -30,48 +30,40 @@ The last CSR (the one with everything) was: - 389:d=4 hl=2 l= 9 prim: OBJECT :friendlyName - 400:d=4 hl=2 l= 48 cons: SET - 402:d=5 hl=2 l= 46 prim: BMPSTRING -- 450:d=3 hl=4 l= 687 cons: SEQUENCE -+ 450:d=3 hl=4 l= 663 cons: SEQUENCE - 454:d=4 hl=2 l= 9 prim: OBJECT :Extension Request -- 465:d=4 hl=4 l= 672 cons: SET -- 469:d=5 hl=4 l= 668 cons: SEQUENCE -- 473:d=6 hl=2 l= 14 cons: SEQUENCE -+ 465:d=4 hl=4 l= 648 cons: SET -+ 469:d=5 hl=4 l= 644 cons: SEQUENCE -+ 473:d=6 hl=2 l= 11 cons: SEQUENCE - 475:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Key Usage -- 480:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 483:d=7 hl=2 l= 4 prim: OCTET STRING [HEX DUMP]:030205E0 -- 489:d=6 hl=4 l= 264 cons: SEQUENCE -- 493:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Alternative Name -- 498:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 501:d=7 hl=3 l= 253 prim: OCTET STRING [HEX DUMP]:3081FA82096C6F63616C686F737482156C6F63616C686F73742E6C6F63616C646F6D61696E810E726F6F74406C6F63616C686F7374811A726F6F74406C6F63616C686F73742E6C6F63616C646F6D61696EA020060A2B060104018237140203A0120C10726F6F74404558414D504C452E434F4DA02E06062B0601050202A0243022A00D1B0B4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F74A024060A2B060104018237140203A0160C14726F6F7440464F4F2E4558414D504C452E434F4DA03206062B0601050202A0283026A0111B0F464F4F2E4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F74 -- 757:d=6 hl=2 l= 32 cons: SEQUENCE -- 759:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Extended Key Usage -- 764:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 767:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:301406082B0601050507030206082B06010505070304 -- 791:d=6 hl=2 l= 18 cons: SEQUENCE -- 793:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints -- 798:d=7 hl=2 l= 1 prim: BOOLEAN :255 -- 801:d=7 hl=2 l= 8 prim: OCTET STRING [HEX DUMP]:30060101FF020103 -- 811:d=6 hl=2 l= 34 cons: SEQUENCE -- 813:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier -- 818:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 821:d=7 hl=2 l= 24 prim: OCTET STRING [HEX DUMP]:30168014A9993E364706816ABA3E25717850C26C9CD0D89D -- 847:d=6 hl=2 l= 32 cons: SEQUENCE -- 849:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier -- 854:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 857:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:0414A9993E364706816ABA3E25717850C26C9CD0D89D -- 881:d=6 hl=2 l= 107 cons: SEQUENCE -- 883:d=7 hl=2 l= 8 prim: OBJECT :Authority Information Access -- 893:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 896:d=7 hl=2 l= 92 prim: OCTET STRING [HEX DUMP]:305A302B06082B06010505073001861F687474703A2F2F6F6373702D312E6578616D706C652E636F6D3A3132333435302B06082B06010505073001861F687474703A2F2F6F6373702D322E6578616D706C652E636F6D3A3132333435 -- 990:d=6 hl=2 l= 96 cons: SEQUENCE -- 992:d=7 hl=2 l= 3 prim: OBJECT :X509v3 CRL Distribution Points -- 997:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1000:d=7 hl=2 l= 86 prim: OCTET STRING [HEX DUMP]:30543028A026A0248622687474703A2F2F63726C2D312E6578616D706C652E636F6D3A31323334352F6765743028A026A0248622687474703A2F2F63726C2D322E6578616D706C652E636F6D3A31323334352F676574 -- 1088:d=6 hl=2 l= 51 cons: SEQUENCE -- 1090:d=7 hl=2 l= 9 prim: OBJECT :Netscape Comment -- 1101:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1104:d=7 hl=2 l= 35 prim: OCTET STRING [HEX DUMP]:1621636572746D6F6E6765722067656E65726174656420746869732072657175657374 -- 1141:d=1 hl=2 l= 13 cons: SEQUENCE -- 1143:d=2 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption -- 1154:d=2 hl=2 l= 0 prim: NULL -- 1156:d=1 hl=4 l= 257 prim: BIT STRING -+ 480:d=7 hl=2 l= 4 prim: OCTET STRING [HEX DUMP]:030205E0 -+ 486:d=6 hl=4 l= 261 cons: SEQUENCE -+ 490:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Alternative Name -+ 495:d=7 hl=3 l= 253 prim: OCTET STRING [HEX DUMP]:3081FA82096C6F63616C686F737482156C6F63616C686F73742E6C6F63616C646F6D61696E810E726F6F74406C6F63616C686F7374811A726F6F74406C6F63616C686F73742E6C6F63616C646F6D61696EA020060A2B060104018237140203A0120C10726F6F74404558414D504C452E434F4DA02E06062B0601050202A0243022A00D1B0B4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F74A024060A2B060104018237140203A0160C14726F6F7440464F4F2E4558414D504C452E434F4DA03206062B0601050202A0283026A0111B0F464F4F2E4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F74 -+ 751:d=6 hl=2 l= 29 cons: SEQUENCE -+ 753:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Extended Key Usage -+ 758:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:301406082B0601050507030206082B06010505070304 -+ 782:d=6 hl=2 l= 18 cons: SEQUENCE -+ 784:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints -+ 789:d=7 hl=2 l= 1 prim: BOOLEAN :255 -+ 792:d=7 hl=2 l= 8 prim: OCTET STRING [HEX DUMP]:30060101FF020103 -+ 802:d=6 hl=2 l= 31 cons: SEQUENCE -+ 804:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier -+ 809:d=7 hl=2 l= 24 prim: OCTET STRING [HEX DUMP]:30168014A9993E364706816ABA3E25717850C26C9CD0D89D -+ 835:d=6 hl=2 l= 29 cons: SEQUENCE -+ 837:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier -+ 842:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:0414A9993E364706816ABA3E25717850C26C9CD0D89D -+ 866:d=6 hl=2 l= 104 cons: SEQUENCE -+ 868:d=7 hl=2 l= 8 prim: OBJECT :Authority Information Access -+ 878:d=7 hl=2 l= 92 prim: OCTET STRING [HEX DUMP]:305A302B06082B06010505073001861F687474703A2F2F6F6373702D312E6578616D706C652E636F6D3A3132333435302B06082B06010505073001861F687474703A2F2F6F6373702D322E6578616D706C652E636F6D3A3132333435 -+ 972:d=6 hl=2 l= 93 cons: SEQUENCE -+ 974:d=7 hl=2 l= 3 prim: OBJECT :X509v3 CRL Distribution Points -+ 979:d=7 hl=2 l= 86 prim: OCTET STRING [HEX DUMP]:30543028A026A0248622687474703A2F2F63726C2D312E6578616D706C652E636F6D3A31323334352F6765743028A026A0248622687474703A2F2F63726C2D322E6578616D706C652E636F6D3A31323334352F676574 -+ 1067:d=6 hl=2 l= 48 cons: SEQUENCE -+ 1069:d=7 hl=2 l= 9 prim: OBJECT :Netscape Comment -+ 1080:d=7 hl=2 l= 35 prim: OCTET STRING [HEX DUMP]:1621636572746D6F6E6765722067656E65726174656420746869732072657175657374 -+ 1117:d=1 hl=2 l= 13 cons: SEQUENCE -+ 1119:d=2 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption -+ 1130:d=2 hl=2 l= 0 prim: NULL -+ 1132:d=1 hl=4 l= 257 prim: BIT STRING - Test complete (32 combinations). -diff --git a/tests/003-csrgen/expected.out b/tests/003-csrgen/expected.out -index 46e010cf..1081a678 100644 ---- a/tests/003-csrgen/expected.out -+++ b/tests/003-csrgen/expected.out -@@ -11,8 +11,8 @@ Signature OK - minicert.openssl.4096.pem: OK - 4096 OK. - The last CSR (the one with everything) was: -- 0:d=0 hl=4 l=1635 cons: SEQUENCE -- 4:d=1 hl=4 l=1355 cons: SEQUENCE -+ 0:d=0 hl=4 l=1599 cons: SEQUENCE -+ 4:d=1 hl=4 l=1319 cons: SEQUENCE - 8:d=2 hl=2 l= 1 prim: INTEGER :00 - 11:d=2 hl=2 l= 22 cons: SEQUENCE - 13:d=3 hl=2 l= 20 cons: SET -@@ -24,7 +24,7 @@ The last CSR (the one with everything) was: - 41:d=4 hl=2 l= 9 prim: OBJECT :rsaEncryption - 52:d=4 hl=2 l= 0 prim: NULL - 54:d=3 hl=4 l= 271 prim: BIT STRING -- 329:d=2 hl=4 l=1030 cons: cont [ 0 ] -+ 329:d=2 hl=4 l= 994 cons: cont [ 0 ] - 333:d=3 hl=2 l= 52 cons: SEQUENCE - 335:d=4 hl=2 l= 9 prim: OBJECT :challengePassword - 346:d=4 hl=2 l= 39 cons: SET -@@ -33,64 +33,52 @@ The last CSR (the one with everything) was: - 389:d=4 hl=2 l= 9 prim: OBJECT :friendlyName - 400:d=4 hl=2 l= 48 cons: SET - 402:d=5 hl=2 l= 46 prim: BMPSTRING -- 450:d=3 hl=4 l= 909 cons: SEQUENCE -+ 450:d=3 hl=4 l= 873 cons: SEQUENCE - 454:d=4 hl=2 l= 9 prim: OBJECT :Extension Request -- 465:d=4 hl=4 l= 894 cons: SET -- 469:d=5 hl=4 l= 890 cons: SEQUENCE -- 473:d=6 hl=2 l= 14 cons: SEQUENCE -+ 465:d=4 hl=4 l= 858 cons: SET -+ 469:d=5 hl=4 l= 854 cons: SEQUENCE -+ 473:d=6 hl=2 l= 11 cons: SEQUENCE - 475:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Key Usage -- 480:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 483:d=7 hl=2 l= 4 prim: OCTET STRING [HEX DUMP]:030205E0 -- 489:d=6 hl=4 l= 290 cons: SEQUENCE -- 493:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Alternative Name -- 498:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 501:d=7 hl=4 l= 278 prim: OCTET STRING [HEX DUMP]:3082011282096C6F63616C686F737482156C6F63616C686F73742E6C6F63616C646F6D61696E810E726F6F74406C6F63616C686F7374811A726F6F74406C6F63616C686F73742E6C6F63616C646F6D61696EA020060A2B060104018237140203A0120C10726F6F74404558414D504C452E434F4DA02E06062B0601050202A0243022A00D1B0B4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F74A024060A2B060104018237140203A0160C14726F6F7440464F4F2E4558414D504C452E434F4DA03206062B0601050202A0283026A0111B0F464F4F2E4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F7487047F000001871000000000000000000000000000000001 -- 783:d=6 hl=2 l= 32 cons: SEQUENCE -- 785:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Extended Key Usage -- 790:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 793:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:301406082B0601050507030206082B06010505070304 -- 817:d=6 hl=2 l= 18 cons: SEQUENCE -- 819:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints -- 824:d=7 hl=2 l= 1 prim: BOOLEAN :255 -- 827:d=7 hl=2 l= 8 prim: OCTET STRING [HEX DUMP]:30060101FF020103 -- 837:d=6 hl=2 l= 34 cons: SEQUENCE -- 839:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier -- 844:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 847:d=7 hl=2 l= 24 prim: OCTET STRING [HEX DUMP]:30168014A9993E364706816ABA3E25717850C26C9CD0D89D -- 873:d=6 hl=2 l= 32 cons: SEQUENCE -- 875:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier -- 880:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 883:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:0414A9993E364706816ABA3E25717850C26C9CD0D89D -- 907:d=6 hl=2 l= 107 cons: SEQUENCE -- 909:d=7 hl=2 l= 8 prim: OBJECT :Authority Information Access -- 919:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 922:d=7 hl=2 l= 92 prim: OCTET STRING [HEX DUMP]:305A302B06082B06010505073001861F687474703A2F2F6F6373702D312E6578616D706C652E636F6D3A3132333435302B06082B06010505073001861F687474703A2F2F6F6373702D322E6578616D706C652E636F6D3A3132333435 -- 1016:d=6 hl=2 l= 96 cons: SEQUENCE -- 1018:d=7 hl=2 l= 3 prim: OBJECT :X509v3 CRL Distribution Points -- 1023:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1026:d=7 hl=2 l= 86 prim: OCTET STRING [HEX DUMP]:30543028A026A0248622687474703A2F2F63726C2D312E6578616D706C652E636F6D3A31323334352F6765743028A026A0248622687474703A2F2F63726C2D322E6578616D706C652E636F6D3A31323334352F676574 -- 1114:d=6 hl=2 l= 106 cons: SEQUENCE -- 1116:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Freshest CRL -- 1121:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1124:d=7 hl=2 l= 96 prim: OCTET STRING [HEX DUMP]:305E302DA02BA0298627687474703A2F2F63726C2D312E6578616D706C652E636F6D3A31323334352F67657464656C7461302DA02BA0298627687474703A2F2F63726C2D322E6578616D706C652E636F6D3A31323334352F67657464656C7461 -- 1222:d=6 hl=2 l= 51 cons: SEQUENCE -- 1224:d=7 hl=2 l= 9 prim: OBJECT :Netscape Comment -- 1235:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1238:d=7 hl=2 l= 35 prim: OCTET STRING [HEX DUMP]:1621636572746D6F6E6765722067656E65726174656420746869732072657175657374 -- 1275:d=6 hl=2 l= 18 cons: SEQUENCE -- 1277:d=7 hl=2 l= 9 prim: OBJECT :OCSP No Check -- 1288:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1291:d=7 hl=2 l= 2 prim: OCTET STRING [HEX DUMP]:0500 -- 1295:d=6 hl=2 l= 44 cons: SEQUENCE -- 1297:d=7 hl=2 l= 9 prim: OBJECT :1.3.6.1.4.1.311.20.2 -- 1308:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1311:d=7 hl=2 l= 28 prim: OCTET STRING [HEX DUMP]:1E1A006300610041007700650073006F006D00650043006500720074 -- 1341:d=6 hl=2 l= 20 cons: SEQUENCE -- 1343:d=7 hl=2 l= 9 prim: OBJECT :Netscape Cert Type -- 1354:d=7 hl=2 l= 1 prim: BOOLEAN :0 -- 1357:d=7 hl=2 l= 4 prim: OCTET STRING [HEX DUMP]:030205A0 -- 1363:d=1 hl=2 l= 13 cons: SEQUENCE -- 1365:d=2 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption -- 1376:d=2 hl=2 l= 0 prim: NULL -- 1378:d=1 hl=4 l= 257 prim: BIT STRING -+ 480:d=7 hl=2 l= 4 prim: OCTET STRING [HEX DUMP]:030205E0 -+ 486:d=6 hl=4 l= 287 cons: SEQUENCE -+ 490:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Alternative Name -+ 495:d=7 hl=4 l= 278 prim: OCTET STRING [HEX DUMP]:3082011282096C6F63616C686F737482156C6F63616C686F73742E6C6F63616C646F6D61696E810E726F6F74406C6F63616C686F7374811A726F6F74406C6F63616C686F73742E6C6F63616C646F6D61696EA020060A2B060104018237140203A0120C10726F6F74404558414D504C452E434F4DA02E06062B0601050202A0243022A00D1B0B4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F74A024060A2B060104018237140203A0160C14726F6F7440464F4F2E4558414D504C452E434F4DA03206062B0601050202A0283026A0111B0F464F4F2E4558414D504C452E434F4DA111300FA003020101A10830061B04726F6F7487047F000001871000000000000000000000000000000001 -+ 777:d=6 hl=2 l= 29 cons: SEQUENCE -+ 779:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Extended Key Usage -+ 784:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:301406082B0601050507030206082B06010505070304 -+ 808:d=6 hl=2 l= 18 cons: SEQUENCE -+ 810:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Basic Constraints -+ 815:d=7 hl=2 l= 1 prim: BOOLEAN :255 -+ 818:d=7 hl=2 l= 8 prim: OCTET STRING [HEX DUMP]:30060101FF020103 -+ 828:d=6 hl=2 l= 31 cons: SEQUENCE -+ 830:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier -+ 835:d=7 hl=2 l= 24 prim: OCTET STRING [HEX DUMP]:30168014A9993E364706816ABA3E25717850C26C9CD0D89D -+ 861:d=6 hl=2 l= 29 cons: SEQUENCE -+ 863:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier -+ 868:d=7 hl=2 l= 22 prim: OCTET STRING [HEX DUMP]:0414A9993E364706816ABA3E25717850C26C9CD0D89D -+ 892:d=6 hl=2 l= 104 cons: SEQUENCE -+ 894:d=7 hl=2 l= 8 prim: OBJECT :Authority Information Access -+ 904:d=7 hl=2 l= 92 prim: OCTET STRING [HEX DUMP]:305A302B06082B06010505073001861F687474703A2F2F6F6373702D312E6578616D706C652E636F6D3A3132333435302B06082B06010505073001861F687474703A2F2F6F6373702D322E6578616D706C652E636F6D3A3132333435 -+ 998:d=6 hl=2 l= 93 cons: SEQUENCE -+ 1000:d=7 hl=2 l= 3 prim: OBJECT :X509v3 CRL Distribution Points -+ 1005:d=7 hl=2 l= 86 prim: OCTET STRING [HEX DUMP]:30543028A026A0248622687474703A2F2F63726C2D312E6578616D706C652E636F6D3A31323334352F6765743028A026A0248622687474703A2F2F63726C2D322E6578616D706C652E636F6D3A31323334352F676574 -+ 1093:d=6 hl=2 l= 103 cons: SEQUENCE -+ 1095:d=7 hl=2 l= 3 prim: OBJECT :X509v3 Freshest CRL -+ 1100:d=7 hl=2 l= 96 prim: OCTET STRING [HEX DUMP]:305E302DA02BA0298627687474703A2F2F63726C2D312E6578616D706C652E636F6D3A31323334352F67657464656C7461302DA02BA0298627687474703A2F2F63726C2D322E6578616D706C652E636F6D3A31323334352F67657464656C7461 -+ 1198:d=6 hl=2 l= 48 cons: SEQUENCE -+ 1200:d=7 hl=2 l= 9 prim: OBJECT :Netscape Comment -+ 1211:d=7 hl=2 l= 35 prim: OCTET STRING [HEX DUMP]:1621636572746D6F6E6765722067656E65726174656420746869732072657175657374 -+ 1248:d=6 hl=2 l= 15 cons: SEQUENCE -+ 1250:d=7 hl=2 l= 9 prim: OBJECT :OCSP No Check -+ 1261:d=7 hl=2 l= 2 prim: OCTET STRING [HEX DUMP]:0500 -+ 1265:d=6 hl=2 l= 41 cons: SEQUENCE -+ 1267:d=7 hl=2 l= 9 prim: OBJECT :1.3.6.1.4.1.311.20.2 -+ 1278:d=7 hl=2 l= 28 prim: OCTET STRING [HEX DUMP]:1E1A006300610041007700650073006F006D00650043006500720074 -+ 1308:d=6 hl=2 l= 17 cons: SEQUENCE -+ 1310:d=7 hl=2 l= 9 prim: OBJECT :Netscape Cert Type -+ 1321:d=7 hl=2 l= 4 prim: OCTET STRING [HEX DUMP]:030205A0 -+ 1327:d=1 hl=2 l= 13 cons: SEQUENCE -+ 1329:d=2 hl=2 l= 9 prim: OBJECT :sha256WithRSAEncryption -+ 1340:d=2 hl=2 l= 0 prim: NULL -+ 1342:d=1 hl=4 l= 257 prim: BIT STRING - Test complete (69 combinations). --- -2.31.1 - diff --git a/0005-Update-csrgen-test-to-understand-OpenSSL-3.0.0-outpu.patch b/0005-Update-csrgen-test-to-understand-OpenSSL-3.0.0-outpu.patch deleted file mode 100644 index 54e05bc..0000000 --- a/0005-Update-csrgen-test-to-understand-OpenSSL-3.0.0-outpu.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 46cd5a7d9434ed104093152bdf0a55404e6a1c6b Mon Sep 17 00:00:00 2001 -From: Rob Crittenden -Date: Tue, 5 Oct 2021 11:04:10 -0400 -Subject: [PATCH] Update csrgen test to understand OpenSSL 3.0.0 output - -OpenSSL 3.0.0 change a lot of output messages. When verifying -a certificate instead of printing just "verify OK" it prints -"Certificate request self-signature verify OK" - -Modify the check to match both OpenSSL 1.x and 3.x - -Related: https://pagure.io/certmonger/issue/223 - -Signed-off-by: Rob Crittenden ---- - tests/003-csrgen-ec/run.sh | 4 ++-- - tests/003-csrgen-rsa/run.sh | 4 ++-- - tests/003-csrgen/run.sh | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/003-csrgen-ec/run.sh b/tests/003-csrgen-ec/run.sh -index 91117ec8..7c0505f8 100755 ---- a/tests/003-csrgen-ec/run.sh -+++ b/tests/003-csrgen-ec/run.sh -@@ -42,8 +42,8 @@ grep ^minicert= entry.nss.$size | sed s,^minicert=,, | base64 -d > minicert.nss. - openssl x509 -out minicert.nss.$size.pem -in minicert.nss.$size -inform der - # The RSA tests already verify the contents of the requests, so we really only - # need to care about the signatures passing verification. --openssl req -verify -noout < csr.nss.$size 2>&1 --openssl req -verify -noout < csr.openssl.$size 2>&1 -+openssl req -verify -noout < csr.nss.$size 2>&1 | sed 's/Certificate request self-signature //' -+openssl req -verify -noout < csr.openssl.$size 2>&1 | sed 's/Certificate request self-signature //' - openssl spkac -verify -noout < spkac.nss.$size 2>&1 - openssl spkac -verify -noout < spkac.openssl.$size 2>&1 - openssl verify -CAfile minicert.openssl.$size.pem minicert.openssl.$size.pem 2>&1 -diff --git a/tests/003-csrgen-rsa/run.sh b/tests/003-csrgen-rsa/run.sh -index bb8ebecb..4f0c0ef0 100755 ---- a/tests/003-csrgen-rsa/run.sh -+++ b/tests/003-csrgen-rsa/run.sh -@@ -118,14 +118,14 @@ iterate() { - echo key_pubkey=616263 >> entry.openssl.$size - $toolsdir/csrgen entry.nss.$size > csr.nss.$size - # Both should verify. -- if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout 2>&1`" != "verify OK" ; then -+ if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout 2>&1 | grep -c "verify OK"`" != "1" ; then - echo Signature failed for OpenSSL: - cat csr.openssl.$size - echo Private key: - awk '/BEGIN PRIVATE KEY/,/END PRIVATE KEY/{print}{;}' $tmpdir/key.$size - exit 1 - fi -- if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout 2>&1`" != "verify OK" ; then -+ if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout 2>&1 | grep -c "verify OK"`" != "1" ; then - echo Signature failed for NSS: - cat csr.nss.$size - echo Private key: -diff --git a/tests/003-csrgen/run.sh b/tests/003-csrgen/run.sh -index d3dfbaf0..093beabf 100755 ---- a/tests/003-csrgen/run.sh -+++ b/tests/003-csrgen/run.sh -@@ -170,14 +170,14 @@ iterate() { - echo key_pubkey=616263 >> entry.openssl.$size - $toolsdir/csrgen entry.nss.$size > csr.nss.$size - # Both should verify. -- if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout 2>&1`" != "verify OK" ; then -+ if test "`openssl req -verify -key key.$size -in csr.openssl.$size -noout 2>&1 | grep -c "verify OK"`" != "1" ; then - echo Signature failed for OpenSSL: - cat csr.openssl.$size - echo Private key: - awk '/BEGIN PRIVATE KEY/,/END PRIVATE KEY/{print}{;}' $tmpdir/key.$size - exit 1 - fi -- if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout 2>&1`" != "verify OK" ; then -+ if test "`openssl req -verify -key key.$size -in csr.nss.$size -noout 2>&1 | grep -c "verify OK"`" != "1" ; then - echo Signature failed for NSS: - cat csr.nss.$size - echo Private key: --- -2.31.1 - diff --git a/certmonger.spec b/certmonger.spec index 626bba7..08806f9 100644 --- a/certmonger.spec +++ b/certmonger.spec @@ -27,8 +27,8 @@ %bcond_with xmlrpc Name: certmonger -Version: 0.79.14 -Release: 6%{?dist} +Version: 0.79.15 +Release: 1%{?dist} Summary: Certificate status monitor and PKI enrollment client License: GPLv3+ @@ -36,12 +36,6 @@ URL: http://pagure.io/certmonger/ Source0: http://releases.pagure.org/certmonger/certmonger-%{version}.tar.gz #Source1: http://releases.pagure.org/certmonger/certmonger-%%{version}.tar.gz.sig -Patch0001: 0001-candidate-openssl-3.0-compat-fixes.patch -Patch0002: 0002-Add-compile-check-for-EVP_PKEY_get_id-along-with-EVP.patch -Patch0003: 0003-Use-extensions-template-from-NSS.patch -Patch0004: 0004-Use-implicit-empty-FALSE-for-extensions.patch -Patch0005: 0005-Update-csrgen-test-to-understand-OpenSSL-3.0.0-outpu.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel @@ -269,6 +263,9 @@ exit 0 %endif %changelog +* Wed Jan 5 2022 Rob Crittenden - 0.79.15-1 +- Update to upstream 0.79.15 + * Tue Oct 05 2021 Rob Crittenden - 0.79.14-6 - Don't encode critical=FALSE in X509v3 extensions diff --git a/sources b/sources index 8fb9bc6..95389de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (certmonger-0.79.14.tar.gz) = 8eed1675fa5c79249993d96ad053f5414ff406f614860d0eaab3cd26d17291caaf192e8f308ba1317d85ebc021b7c2ab0d2a6b8c741b1b8e7796793f3dcceae3 +SHA512 (certmonger-0.79.15.tar.gz) = 4af1830335dafbdbcca27b89b876ce37d20672c57fc017aba5494d70d0a7f1b8cc796cd668f8f471efe106f3d47dc1498cf033db9927952d5148136b823f491a