From: Pauli <pauli@openssl.org>
Date: Mon, 28 Nov 2022 01:24:02 +0000 (+1100)
Subject: Update fips version check to be more robust
X-Git-Tag: openssl-3.2.0-alpha1~1648
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abff8bd842b802c09b981b7552bd92ef1d0ced64;p=thirdparty%2Fopenssl.git

Update fips version check to be more robust

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/19777)
---

diff --git a/doc/man7/EVP_CIPHER-AES.pod b/doc/man7/EVP_CIPHER-AES.pod
index afb222f77bc..cecd3c30210 100644
--- a/doc/man7/EVP_CIPHER-AES.pod
+++ b/doc/man7/EVP_CIPHER-AES.pod
@@ -29,7 +29,7 @@ default provider:
 
 =item "AES-192-OFB", "AES-128-OFB" and "AES-256-OFB"
 
-=item "AES-128-SIV", "AES-192-SIV" and "AES-256-SIV"
+=item "AES-128-GCM-SIV", "AES-192-GCM-SIV" and "AES-256-GCM-SIV"
 
 =item "AES-128-XTS" and "AES-256-XTS"
 
@@ -54,6 +54,8 @@ FIPS provider:
 
 =item "AES-128-OCB", "AES-192-OCB" and "AES-256-OCB"
 
+=item "AES-128-SIV", "AES-192-SIV" and "AES-256-SIV"
+
 =back
 
 =head2 Parameters
diff --git a/test/recipes/30-test_evp_data/evpmac_common.txt b/test/recipes/30-test_evp_data/evpmac_common.txt
index 0f1e75f2073..aacae61f141 100644
--- a/test/recipes/30-test_evp_data/evpmac_common.txt
+++ b/test/recipes/30-test_evp_data/evpmac_common.txt
@@ -259,7 +259,7 @@ Key = 0B122AC8F34ED1FE082A3625D157561454167AC145A10BBF77C6A70596D574F1
 Input = 498B53FDEC87EDCBF07097DCCDE93A084BAD7501A224E388DF349CE18959FE8485F8AD1537F0D896EA73BEDC7214713F
 Output = F62C46329B41085625669BAF51DEA66A
 
-FIPSversion = >3.0.99
+FIPSversion = >=3.1.0
 MAC = CMAC
 Algorithm = AES-256-ECB
 Key = 0B122AC8F34ED1FE082A3625D157561454167AC145A10BBF77C6A70596D574F1