Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 125143 - allow modutil to report PKCS#11 library load failure errors

Browse Source
This commit is contained in:
jpierre%netscape.com 2002-02-13 01:43:10 +00:00
parent 3c6a4b6df9
commit 7716bf30c8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/nss/cmd/modutil/pk11.c
View File

@ -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);

2
security/nss/lib/pk11wrap/pk11util.c
View File

@ -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) {