diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-05-20 18:38:50 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-05-20 18:38:50 +0000 |
| commit | f2012316f6ea6ea8c46bf64a78e12020f3a6ff4f (patch) | |
| tree | 661c0f3f9104c3783782df0c15f7a5c8e4928850 /security/nss/files/patch-const | |
| parent | Remove expired port: (diff) | |
security/nss: update to 3.24
Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.24_release_notes
Notes
Notes:
svn path=/head/; revision=415569
Diffstat (limited to 'security/nss/files/patch-const')
| -rw-r--r-- | security/nss/files/patch-const | 40 |
1 files changed, 21 insertions, 19 deletions
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 |