Bug 1748237: Adding a better error message. r=nss-reviewers,rrelyea

Differential Revision: https://phabricator.services.mozilla.com/D135359

1 files changed, 10 insertions, 1 deletions

diff --git a/cmd/bltest/blapitest.c b/cmd/bltest/blapitest.c
index 0b86075b7..279e121b6 100644
--- a/cmd/bltest/blapitest.c
+++ b/cmd/bltest/blapitest.c
@@ -3871,9 +3871,18 @@ main(int argc, char **argv)
 
     /* Do FIPS self-test */
     if (bltest.commands[cmd_FIPS].activated) {
+#ifdef NSS_FIPS_DISABLED
+        fprintf(stdout, "FIPS self-test failed with: NSS_FIPS_DISABLED\n");
+        return SECFailure;
+#endif
         CK_RV ckrv = sftk_FIPSEntryOK(PR_FALSE);
-        fprintf(stdout, "CK_RV: %ld.\n", ckrv);
         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;
         return SECFailure;