From: Pauli <paul.dale@oracle.com>
Date: Wed, 10 Apr 2019 22:55:50 +0000 (+1000)
Subject: Skip the no derivation functions when in FIPS mode because they are not
X-Git-Tag: openssl-3.0.0-alpha1~2074
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1fb3c0afffec0b53a01fa3374bb0099218902ce0;p=oweals%2Fopenssl.git

Skip the no derivation functions when in FIPS mode because they are not
applicable.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8695)
---

diff --git a/test/drbg_cavs_test.c b/test/drbg_cavs_test.c
index 8138269bff..ce7a565ec1 100644
--- a/test/drbg_cavs_test.c
+++ b/test/drbg_cavs_test.c
@@ -257,7 +257,8 @@ static int test_cavs_kats(const struct drbg_kat *test[], int i)
 #ifdef FIPS_MODE
     /* FIPS mode doesn't support instantiating without a derivation function */
     if ((td->flags & USE_DF) == 0)
-        return 1;
+        return TEST_skip("instantiating without derivation function "
+                         "is not supported in FIPS mode");
 #endif
     switch (td->type) {
     case NO_RESEED: