From f2012316f6ea6ea8c46bf64a78e12020f3a6ff4f Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 20 May 2016 18:38:50 +0000 Subject: security/nss: update to 3.24 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.24_release_notes --- security/nss/files/patch-const | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'security/nss/files/patch-const') diff --git a/security/nss/files/patch-const b/security/nss/files/patch-const index de5fae9f6601..ccefa75c7825 100644 --- a/security/nss/files/patch-const +++ b/security/nss/files/patch-const @@ -18,25 +18,27 @@ +FipsMode(const char *arg) { char *internal_name; -@@ -62,14 +62,16 @@ - SECMOD_GetInternalModule()->commonName); - if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) { -- PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError())); -+ PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n", SECU_Strerror(PORT_GetError()), internal_name); - PR_smprintf_free(internal_name); - PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); - return FIPS_SWITCH_FAILED_ERR; - } -- PR_smprintf_free(internal_name); - if (!PK11_IsFIPS()) { -+ PR_fprintf(PR_STDERR, "FipsMode(true): in module %s", internal_name); -+ PR_smprintf_free(internal_name); - PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); - return FIPS_SWITCH_FAILED_ERR; - } -+ PR_smprintf_free(internal_name); - PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]); - } else { +@@ -25,16 +25,18 @@ FipsMode(char *arg) + internal_name = PR_smprintf("%s", + SECMOD_GetInternalModule()->commonName); + if (SECMOD_DeleteInternalModule(internal_name) != SECSuccess) { +- PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError())); ++ PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n", SECU_Strerror(PORT_GetError()), internal_name); + PR_smprintf_free(internal_name); + PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); + return FIPS_SWITCH_FAILED_ERR; + } +- PR_smprintf_free(internal_name); + if (!PK11_IsFIPS()) { ++ PR_fprintf(PR_STDERR, "FipsMode(true): in module %s", internal_name); ++ PR_smprintf_free(internal_name); + PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); + return FIPS_SWITCH_FAILED_ERR; + } ++ PR_smprintf_free(internal_name); + PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]); + } else { + PR_fprintf(PR_STDERR, errStrings[FIPS_ALREADY_ON_ERR]); @@ -112,5 +114,5 @@ */ Error -- cgit v1.2.3