summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatalia Kulatova <nkulatova@mozilla.com>2023-04-17 21:23:31 +0000
committerNatalia Kulatova <nkulatova@mozilla.com>2023-04-17 21:23:31 +0000
commit1703ee6734711462b7ead4cbcedd95a961f39aaa (patch)
tree721afd8d90dcfbe0fb15c8d83604e41b70bfcc6b
parent466ae9d2e877704f83ed017b8d47ce6b377f8587 (diff)
downloadnss-hg-1703ee6734711462b7ead4cbcedd95a961f39aaa.tar.gz
Bug 1748237 - Repairing unreachable code in clang built with gyp r=jschanck
Differential Revision: https://phabricator.services.mozilla.com/D175684
-rw-r--r--cmd/bltest/blapitest.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/cmd/bltest/blapitest.c b/cmd/bltest/blapitest.c
index 279e121b6..199d5a450 100644
--- a/cmd/bltest/blapitest.c
+++ b/cmd/bltest/blapitest.c
@@ -3871,21 +3871,19 @@ main(int argc, char **argv)
/* Do FIPS self-test */
if (bltest.commands[cmd_FIPS].activated) {
+ PORT_Free(cipherInfo);
#ifdef NSS_FIPS_DISABLED
fprintf(stdout, "FIPS self-test failed with: NSS_FIPS_DISABLED\n");
return SECFailure;
-#endif
+#else
CK_RV ckrv = sftk_FIPSEntryOK(PR_FALSE);
- PORT_Free(cipherInfo);
if (ckrv == CKR_OK) {
fprintf(stdout, "FIPS self-test was successful.\n");
return SECSuccess;
- } else {
- fprintf(stdout, "FIPS self-test failed with the CK_RV: %ld.\n", ckrv);
}
- if (ckrv == CKR_OK)
- return SECSuccess;
+ fprintf(stdout, "FIPS self-test failed with the CK_RV: %ld.\n", ckrv);
return SECFailure;
+#endif
}
/*