]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix no-des
authorMatt Caswell <matt@openssl.org>
Thu, 6 Feb 2020 16:59:49 +0000 (16:59 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 7 Feb 2020 23:33:59 +0000 (23:33 +0000)
Don't attempt to self-test DES in the FIPS provider if we have been built
without FIPS support.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11034)

providers/fips/self_test_data.inc

index 28616a00794e27ff78c586a9c70259492b228ea0..1ee83e0d1cf2921a27bbdda66ce76b16a365ab5f 100644 (file)
@@ -141,6 +141,7 @@ static const unsigned char aes_256_gcm_tag[] = {
 };
 
 static const ST_KAT_CIPHER st_kat_cipher_tests[] = {
+#ifndef OPENSSL_NO_DES
     {
         {
             OSSL_SELF_TEST_DESC_CIPHER_TDES,
@@ -151,6 +152,7 @@ static const ST_KAT_CIPHER st_kat_cipher_tests[] = {
         ITM(des_ede3_cbc_key),
         ITM(des_ede3_cbc_iv),
     },
+#endif
     {
         {
             OSSL_SELF_TEST_DESC_CIPHER_AES_GCM,