diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-07-31 00:06:49 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-07-31 00:06:49 +0000 |
| commit | ba00a2c341f7ccb192cb82b7f8eb7f20b87d6b8c (patch) | |
| tree | 820468fe2eb3ff9d29c0398ea2ea781a554c8213 /security/nss/files/patch-const | |
| parent | Mark as broken on amd64 >= 6.0, as it does not build there. (diff) | |
* Update to 3.10 [1]
* Add a target for regression testing, and run that target automatically
when building on the package build cluster [1]
* Cleanup some portlint nits
Submitted by: mi [1]
Diffstat (limited to '')
| -rw-r--r-- | security/nss/files/patch-const | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/security/nss/files/patch-const b/security/nss/files/patch-const new file mode 100644 index 000000000000..de5fae9f6601 --- /dev/null +++ b/security/nss/files/patch-const @@ -0,0 +1,46 @@ +--- cmd/modutil/modutil.h Sun Apr 25 11:02:47 2004 ++++ cmd/modutil/modutil.h Fri Jul 22 17:35:20 2005 +@@ -53,6 +53,6 @@ + #include "error.h" + +-Error FipsMode(char *arg); +-Error ChkFipsMode(char *arg); ++Error FipsMode(const char *arg); ++Error ChkFipsMode(const char *arg); + Error AddModule(char *moduleName, char *libFile, char *ciphers, + char *mechanisms, char* modparms); +--- cmd/modutil/pk11.c Sun Apr 25 11:02:47 2004 ++++ cmd/modutil/pk11.c Fri Jul 22 17:36:48 2005 +@@ -53,5 +53,5 @@ + */ + Error +-FipsMode(char *arg) ++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 { +@@ -112,5 +114,5 @@ + */ + Error +-ChkFipsMode(char *arg) ++ChkFipsMode(const char *arg) + { + if(!PORT_Strcasecmp(arg, "true")) { |