summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Beurdouche <bbeurdouche@mozilla.com>2020-07-21 16:15:33 +0000
committerBenjamin Beurdouche <bbeurdouche@mozilla.com>2020-07-21 16:15:33 +0000
commit1f33e8c4710fcc88e0af84cabba87ace8659392d (patch)
treedc6c43c27d721a574e4cc98f2080bcdd0830de8f
parentad54bf67cf4597221b085426d6856c1d621fafae (diff)
downloadnss-hg-NSS_3_55_BETA1.tar.gz
Bug 1653202 - Fix issue disabling other mechanisms when SEED is deprecated in cmd/bltest/blapitest.c. r=kjacobsNSS_3_55_BETA1
Differential Revision: https://phabricator.services.mozilla.com/D83758
-rw-r--r--cmd/bltest/blapitest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/bltest/blapitest.c b/cmd/bltest/blapitest.c
index 96b88a3ae..cf7c60528 100644
--- a/cmd/bltest/blapitest.c
+++ b/cmd/bltest/blapitest.c
@@ -2961,9 +2961,9 @@ get_params(PLArenaPool *arena, bltestParams *params,
case bltestCAMELLIA_CBC:
#ifndef NSS_DISABLE_DEPRECATED_SEED
case bltestSEED_CBC:
+#endif
sprintf(filename, "%s/tests/%s/%s%d", testdir, modestr, "iv", j);
load_file_data(arena, &params->sk.iv, filename, bltestBinary);
-#endif
case bltestDES_ECB:
case bltestDES_EDE_ECB:
case bltestRC2_ECB:
@@ -2972,10 +2972,10 @@ get_params(PLArenaPool *arena, bltestParams *params,
case bltestCAMELLIA_ECB:
#ifndef NSS_DISABLE_DEPRECATED_SEED
case bltestSEED_ECB:
+#endif
sprintf(filename, "%s/tests/%s/%s%d", testdir, modestr, "key", j);
load_file_data(arena, &params->sk.key, filename, bltestBinary);
break;
-#endif
#ifdef NSS_SOFTOKEN_DOES_RC5
case bltestRC5_ECB:
case bltestRC5_CBC: