diff options
| author | jpierre%netscape.com <devnull@localhost> | 2002-02-13 01:43:10 +0000 |
|---|---|---|
| committer | jpierre%netscape.com <devnull@localhost> | 2002-02-13 01:43:10 +0000 |
| commit | 485184c5ae72bc31aa5c3c36932878d516486a4f (patch) | |
| tree | 06b5ab9bbbbffcfeba7b44aacde6592f8e14a653 | |
| parent | c410d2e3b6f82f81ce464c0fc12a6e78f6688bae (diff) | |
| download | nss-hg-485184c5ae72bc31aa5c3c36932878d516486a4f.tar.gz | |
Fix for 125143 - allow modutil to report PKCS#11 library load failure errors
| -rw-r--r-- | security/nss/cmd/modutil/pk11.c | 6 | ||||
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11util.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/cmd/modutil/pk11.c b/security/nss/cmd/modutil/pk11.c index edf3b2183..5831dde48 100644 --- a/security/nss/cmd/modutil/pk11.c +++ b/security/nss/cmd/modutil/pk11.c @@ -233,8 +233,6 @@ AddModule(char *moduleName, char *libFile, char *cipherString, ciphers = getFlagsFromString(cipherString, cipherStrings, numCipherStrings); - PR_SetErrorText(NULL,0); - status = SECMOD_AddNewModule(moduleName, libFile, SECMOD_PubMechFlagstoInternal(mechanisms), @@ -244,12 +242,12 @@ AddModule(char *moduleName, char *libFile, char *cipherString, char* errtxt=NULL; PRInt32 copied = 0; if (PR_GetErrorTextLength()) { - errtxt = malloc(PR_GetErrorTextLength()); + errtxt = PR_Malloc(PR_GetErrorTextLength()); copied = PR_GetErrorText(errtxt); } if (copied && errtxt) { PR_fprintf(PR_STDERR, errStrings[ADD_MODULE_FAILED_STATUS_ERR], moduleName, errtxt); - free(errtxt); + PR_Free(errtxt); } else { PR_fprintf(PR_STDERR, errStrings[ADD_MODULE_FAILED_ERR], moduleName); diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c index 464cc740d..c72294ef6 100644 --- a/security/nss/lib/pk11wrap/pk11util.c +++ b/security/nss/lib/pk11wrap/pk11util.c @@ -416,6 +416,8 @@ SECStatus SECMOD_AddNewModule(char* moduleName, char* dllPath, int s,i; PK11SlotInfo* slot; + PR_SetErrorText(0, NULL); + module = SECMOD_CreateModule(dllPath,moduleName,NULL, NULL); if (module->dllName != NULL) { |