From a63915eb2b7902c6b2fdb71de56c072b220be554 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Thu, 26 May 2022 12:07:22 +0200 Subject: [PATCH] CVE-2022-1343 openssl: inacurate verification when using OCSP_NOCHECKS Resolves: rhbz#2087911 --- 0064-CVE-2022-1343.diff | 263 ++++++++++++++++++++++++++++++++++++++++ openssl.spec | 6 + 2 files changed, 269 insertions(+) create mode 100644 0064-CVE-2022-1343.diff diff --git a/0064-CVE-2022-1343.diff b/0064-CVE-2022-1343.diff new file mode 100644 index 0000000..d473597 --- /dev/null +++ b/0064-CVE-2022-1343.diff @@ -0,0 +1,263 @@ +diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c +index 7a4a45d537..3c5f48ec0a 100644 +--- a/crypto/ocsp/ocsp_vfy.c ++++ b/crypto/ocsp/ocsp_vfy.c +@@ -59,9 +59,10 @@ static int ocsp_verify_signer(X509 *signer, int response, + + ret = X509_verify_cert(ctx); + if (ret <= 0) { +- ret = X509_STORE_CTX_get_error(ctx); ++ int err = X509_STORE_CTX_get_error(ctx); ++ + ERR_raise_data(ERR_LIB_OCSP, OCSP_R_CERTIFICATE_VERIFY_ERROR, +- "Verify error: %s", X509_verify_cert_error_string(ret)); ++ "Verify error: %s", X509_verify_cert_error_string(err)); + goto end; + } + if (chain != NULL) +diff --git a/test/recipes/80-test_ocsp.t b/test/recipes/80-test_ocsp.t +index d42030cb89..34fdfcbccc 100644 +--- a/test/recipes/80-test_ocsp.t ++++ b/test/recipes/80-test_ocsp.t +@@ -35,6 +35,7 @@ sub test_ocsp { + $untrusted = $CAfile; + } + my $expected_exit = shift; ++ my $nochecks = shift; + my $outputfile = basename($inputfile, '.ors') . '.dat'; + + run(app(["openssl", "base64", "-d", +@@ -45,7 +46,8 @@ sub test_ocsp { + "-partial_chain", @check_time, + "-CAfile", catfile($ocspdir, $CAfile), + "-verify_other", catfile($ocspdir, $untrusted), +- "-no-CApath", "-no-CAstore"])), ++ "-no-CApath", "-no-CAstore", ++ $nochecks ? "-no_cert_checks" : ()])), + $title); }); + } + +@@ -55,143 +57,149 @@ subtest "=== VALID OCSP RESPONSES ===" => sub { + plan tests => 7; + + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "ND1.ors", "ND1_Issuer_ICA.pem", "", 0); ++ "ND1.ors", "ND1_Issuer_ICA.pem", "", 0, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "ND2.ors", "ND2_Issuer_Root.pem", "", 0); ++ "ND2.ors", "ND2_Issuer_Root.pem", "", 0, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "ND3.ors", "ND3_Issuer_Root.pem", "", 0); ++ "ND3.ors", "ND3_Issuer_Root.pem", "", 0, 0); + test_ocsp("NON-DELEGATED; 3-level CA hierarchy", +- "ND1.ors", "ND1_Cross_Root.pem", "ND1_Issuer_ICA-Cross.pem", 0); ++ "ND1.ors", "ND1_Cross_Root.pem", "ND1_Issuer_ICA-Cross.pem", 0, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "D1.ors", "D1_Issuer_ICA.pem", "", 0); ++ "D1.ors", "D1_Issuer_ICA.pem", "", 0, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "D2.ors", "D2_Issuer_Root.pem", "", 0); ++ "D2.ors", "D2_Issuer_Root.pem", "", 0, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "D3.ors", "D3_Issuer_Root.pem", "", 0); ++ "D3.ors", "D3_Issuer_Root.pem", "", 0, 0); + }; + + subtest "=== INVALID SIGNATURE on the OCSP RESPONSE ===" => sub { + plan tests => 6; + + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "ISOP_ND1.ors", "ND1_Issuer_ICA.pem", "", 1); ++ "ISOP_ND1.ors", "ND1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "ISOP_ND2.ors", "ND2_Issuer_Root.pem", "", 1); ++ "ISOP_ND2.ors", "ND2_Issuer_Root.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "ISOP_ND3.ors", "ND3_Issuer_Root.pem", "", 1); ++ "ISOP_ND3.ors", "ND3_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "ISOP_D1.ors", "D1_Issuer_ICA.pem", "", 1); ++ "ISOP_D1.ors", "D1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "ISOP_D2.ors", "D2_Issuer_Root.pem", "", 1); ++ "ISOP_D2.ors", "D2_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "ISOP_D3.ors", "D3_Issuer_Root.pem", "", 1); ++ "ISOP_D3.ors", "D3_Issuer_Root.pem", "", 1, 0); + }; + + subtest "=== WRONG RESPONDERID in the OCSP RESPONSE ===" => sub { + plan tests => 6; + + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "WRID_ND1.ors", "ND1_Issuer_ICA.pem", "", 1); ++ "WRID_ND1.ors", "ND1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "WRID_ND2.ors", "ND2_Issuer_Root.pem", "", 1); ++ "WRID_ND2.ors", "ND2_Issuer_Root.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "WRID_ND3.ors", "ND3_Issuer_Root.pem", "", 1); ++ "WRID_ND3.ors", "ND3_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "WRID_D1.ors", "D1_Issuer_ICA.pem", "", 1); ++ "WRID_D1.ors", "D1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "WRID_D2.ors", "D2_Issuer_Root.pem", "", 1); ++ "WRID_D2.ors", "D2_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "WRID_D3.ors", "D3_Issuer_Root.pem", "", 1); ++ "WRID_D3.ors", "D3_Issuer_Root.pem", "", 1, 0); + }; + + subtest "=== WRONG ISSUERNAMEHASH in the OCSP RESPONSE ===" => sub { + plan tests => 6; + + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "WINH_ND1.ors", "ND1_Issuer_ICA.pem", "", 1); ++ "WINH_ND1.ors", "ND1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "WINH_ND2.ors", "ND2_Issuer_Root.pem", "", 1); ++ "WINH_ND2.ors", "ND2_Issuer_Root.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "WINH_ND3.ors", "ND3_Issuer_Root.pem", "", 1); ++ "WINH_ND3.ors", "ND3_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "WINH_D1.ors", "D1_Issuer_ICA.pem", "", 1); ++ "WINH_D1.ors", "D1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "WINH_D2.ors", "D2_Issuer_Root.pem", "", 1); ++ "WINH_D2.ors", "D2_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "WINH_D3.ors", "D3_Issuer_Root.pem", "", 1); ++ "WINH_D3.ors", "D3_Issuer_Root.pem", "", 1, 0); + }; + + subtest "=== WRONG ISSUERKEYHASH in the OCSP RESPONSE ===" => sub { + plan tests => 6; + + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "WIKH_ND1.ors", "ND1_Issuer_ICA.pem", "", 1); ++ "WIKH_ND1.ors", "ND1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "WIKH_ND2.ors", "ND2_Issuer_Root.pem", "", 1); ++ "WIKH_ND2.ors", "ND2_Issuer_Root.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "WIKH_ND3.ors", "ND3_Issuer_Root.pem", "", 1); ++ "WIKH_ND3.ors", "ND3_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "WIKH_D1.ors", "D1_Issuer_ICA.pem", "", 1); ++ "WIKH_D1.ors", "D1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "WIKH_D2.ors", "D2_Issuer_Root.pem", "", 1); ++ "WIKH_D2.ors", "D2_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "WIKH_D3.ors", "D3_Issuer_Root.pem", "", 1); ++ "WIKH_D3.ors", "D3_Issuer_Root.pem", "", 1, 0); + }; + + subtest "=== WRONG KEY in the DELEGATED OCSP SIGNING CERTIFICATE ===" => sub { + plan tests => 3; + + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "WKDOSC_D1.ors", "D1_Issuer_ICA.pem", "", 1); ++ "WKDOSC_D1.ors", "D1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "WKDOSC_D2.ors", "D2_Issuer_Root.pem", "", 1); ++ "WKDOSC_D2.ors", "D2_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "WKDOSC_D3.ors", "D3_Issuer_Root.pem", "", 1); ++ "WKDOSC_D3.ors", "D3_Issuer_Root.pem", "", 1, 0); + }; + + subtest "=== INVALID SIGNATURE on the DELEGATED OCSP SIGNING CERTIFICATE ===" => sub { +- plan tests => 3; ++ plan tests => 6; + + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "ISDOSC_D1.ors", "D1_Issuer_ICA.pem", "", 1); ++ "ISDOSC_D1.ors", "D1_Issuer_ICA.pem", "", 1, 0); ++ test_ocsp("DELEGATED; Root CA -> Intermediate CA", ++ "ISDOSC_D2.ors", "D2_Issuer_Root.pem", "", 1, 0); ++ test_ocsp("DELEGATED; Root CA -> EE", ++ "ISDOSC_D3.ors", "D3_Issuer_Root.pem", "", 1, 0); ++ test_ocsp("DELEGATED; Intermediate CA -> EE", ++ "ISDOSC_D1.ors", "D1_Issuer_ICA.pem", "", 1, 1); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "ISDOSC_D2.ors", "D2_Issuer_Root.pem", "", 1); ++ "ISDOSC_D2.ors", "D2_Issuer_Root.pem", "", 1, 1); + test_ocsp("DELEGATED; Root CA -> EE", +- "ISDOSC_D3.ors", "D3_Issuer_Root.pem", "", 1); ++ "ISDOSC_D3.ors", "D3_Issuer_Root.pem", "", 1, 1); + }; + + subtest "=== WRONG SUBJECT NAME in the ISSUER CERTIFICATE ===" => sub { + plan tests => 6; + + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "ND1.ors", "WSNIC_ND1_Issuer_ICA.pem", "", 1); ++ "ND1.ors", "WSNIC_ND1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "ND2.ors", "WSNIC_ND2_Issuer_Root.pem", "", 1); ++ "ND2.ors", "WSNIC_ND2_Issuer_Root.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "ND3.ors", "WSNIC_ND3_Issuer_Root.pem", "", 1); ++ "ND3.ors", "WSNIC_ND3_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "D1.ors", "WSNIC_D1_Issuer_ICA.pem", "", 1); ++ "D1.ors", "WSNIC_D1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "D2.ors", "WSNIC_D2_Issuer_Root.pem", "", 1); ++ "D2.ors", "WSNIC_D2_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "D3.ors", "WSNIC_D3_Issuer_Root.pem", "", 1); ++ "D3.ors", "WSNIC_D3_Issuer_Root.pem", "", 1, 0); + }; + + subtest "=== WRONG KEY in the ISSUER CERTIFICATE ===" => sub { + plan tests => 6; + + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "ND1.ors", "WKIC_ND1_Issuer_ICA.pem", "", 1); ++ "ND1.ors", "WKIC_ND1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "ND2.ors", "WKIC_ND2_Issuer_Root.pem", "", 1); ++ "ND2.ors", "WKIC_ND2_Issuer_Root.pem", "", 1, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "ND3.ors", "WKIC_ND3_Issuer_Root.pem", "", 1); ++ "ND3.ors", "WKIC_ND3_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "D1.ors", "WKIC_D1_Issuer_ICA.pem", "", 1); ++ "D1.ors", "WKIC_D1_Issuer_ICA.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "D2.ors", "WKIC_D2_Issuer_Root.pem", "", 1); ++ "D2.ors", "WKIC_D2_Issuer_Root.pem", "", 1, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "D3.ors", "WKIC_D3_Issuer_Root.pem", "", 1); ++ "D3.ors", "WKIC_D3_Issuer_Root.pem", "", 1, 0); + }; + + subtest "=== INVALID SIGNATURE on the ISSUER CERTIFICATE ===" => sub { +@@ -199,17 +207,17 @@ subtest "=== INVALID SIGNATURE on the ISSUER CERTIFICATE ===" => sub { + + # Expect success, because we're explicitly trusting the issuer certificate. + test_ocsp("NON-DELEGATED; Intermediate CA -> EE", +- "ND1.ors", "ISIC_ND1_Issuer_ICA.pem", "", 0); ++ "ND1.ors", "ISIC_ND1_Issuer_ICA.pem", "", 0, 0); + test_ocsp("NON-DELEGATED; Root CA -> Intermediate CA", +- "ND2.ors", "ISIC_ND2_Issuer_Root.pem", "", 0); ++ "ND2.ors", "ISIC_ND2_Issuer_Root.pem", "", 0, 0); + test_ocsp("NON-DELEGATED; Root CA -> EE", +- "ND3.ors", "ISIC_ND3_Issuer_Root.pem", "", 0); ++ "ND3.ors", "ISIC_ND3_Issuer_Root.pem", "", 0, 0); + test_ocsp("DELEGATED; Intermediate CA -> EE", +- "D1.ors", "ISIC_D1_Issuer_ICA.pem", "", 0); ++ "D1.ors", "ISIC_D1_Issuer_ICA.pem", "", 0, 0); + test_ocsp("DELEGATED; Root CA -> Intermediate CA", +- "D2.ors", "ISIC_D2_Issuer_Root.pem", "", 0); ++ "D2.ors", "ISIC_D2_Issuer_Root.pem", "", 0, 0); + test_ocsp("DELEGATED; Root CA -> EE", +- "D3.ors", "ISIC_D3_Issuer_Root.pem", "", 0); ++ "D3.ors", "ISIC_D3_Issuer_Root.pem", "", 0, 0); + }; + + subtest "=== OCSP API TESTS===" => sub { diff --git a/openssl.spec b/openssl.spec index 218b4bf..40d0dc3 100644 --- a/openssl.spec +++ b/openssl.spec @@ -121,6 +121,9 @@ Patch61: 0061-Deny-SHA-1-signature-verification-in-FIPS-provider.patch Patch62: 0062-Disable-EVP_PKEY_-sign-verify-in-FIPS-provider.patch # https://github.com/openssl/openssl/pull/18141 Patch63: 0063-CVE-2022-1473.patch +# upstream commits 55c80c222293a972587004c185dc5653ae207a0e 2eda98790c5c2741d76d23cc1e74b0dc4f4b391a +Patch64: 0064-CVE-2022-1343.diff + License: ASL 2.0 URL: http://www.openssl.org/ @@ -454,6 +457,9 @@ install -m644 %{SOURCE9} \ * Thu May 26 2022 Dmitry Belyavskiy - 1:3.0.1-33 - CVE-2022-1473 openssl: OPENSSL_LH_flush() breaks reuse of memory - Resolves: rhbz#2089444 +- CVE-2022-1343 openssl: Signer certificate verification returned + inaccurate response when using OCSP_NOCHECKS +- Resolves: rhbz#2087911 * Thu May 19 2022 Dmitry Belyavskiy - 1:3.0.1-32 - `openssl ecparam -list_curves` lists only FIPS-approved curves in FIPS mode