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 8138269bffd4743954dcef20b8fed8faac2d65be..ce7a565ec1deafb608dcc1dfe423e00d1b8e797e 100644 (file)
--- 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: