The branch master has been updated
via e89ffd23c37905574b3beab163b298dabb9f7a20 (commit)
from 709b5e8a3e10963072ce390df7e736308853aa85 (commit)
- Log -----------------------------------------------------------------
commit e89ffd23c37905574b3beab163b298dabb9f7a20
Author: Matt Caswell <[email protected]>
Date: Thu Feb 6 16:59:49 2020 +0000
Fix no-des
Don't attempt to self-test DES in the FIPS provider if we have been built
without FIPS support.
Reviewed-by: Richard Levitte <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/11034)
-----------------------------------------------------------------------
Summary of changes:
providers/fips/self_test_data.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/providers/fips/self_test_data.inc
b/providers/fips/self_test_data.inc
index 28616a0079..1ee83e0d1c 100644
--- a/providers/fips/self_test_data.inc
+++ b/providers/fips/self_test_data.inc
@@ -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,
