Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't error out when creating the list of PKCS#11 modules

Browse Source 
if one wasn't loaded correctly.


git-svn-id: svn://10.0.0.236/trunk@83866 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
javi%netscape.com
2000-12-19 22:49:42 +00:00
parent 3d4b1daba2
commit 78298d51bf
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/security/psm/server/pkcs11ui.c
View File

@@ -74,7 +74,7 @@ ssmpkcs11_convert_module(SSMTextGenContext *cx,
{
char *dllName = NULL;
char *tempStr = NULL;
char *lib_ch = NULL;
char *lib_ch = NULL;
CK_INFO modInfo;
SSMStatus rv = SSM_FAILURE;
SECStatus srv;
@@ -83,17 +83,25 @@ ssmpkcs11_convert_module(SSMTextGenContext *cx,
char buf2[65];
srv = PK11_GetModInfo(mod, &modInfo);
if (srv != SECSuccess)
goto loser;
/* we provide the space in (buf), so we don't deallocate lib_ch */
lib_ch = PK11_MakeString(NULL,buf2,(char *)modInfo.libraryDescription,
sizeof(modInfo.libraryDescription));
if (srv != SECSuccess) {
/*
* The module was not properly loaded at start-up,
* so just make all the strings blank.
*/
lib_ch = "";
buf[0] = '\0';
} else {
/* we provide the space in (buf), so we don't deallocate lib_ch */
lib_ch = PK11_MakeString(NULL,buf2,(char *)modInfo.libraryDescription,
sizeof(modInfo.libraryDescription));
PR_snprintf(buf, sizeof(buf), "%d.%d",
modInfo.libraryVersion.major, modInfo.libraryVersion.minor);
}
if (mod->dllName)
{
char *cursor, *newString;
int numSlashes = 0, newLen, i, j, oldLen;
dllName = mod->dllName;
/*
* Now we need to escape the '\' characters so the string shows
@@ -132,10 +140,7 @@ ssmpkcs11_convert_module(SSMTextGenContext *cx,
if (rv != SSM_SUCCESS)
goto loser;
}
PR_snprintf(buf, sizeof(buf), "%d.%d",
modInfo.libraryVersion.major, modInfo.libraryVersion.minor);
tempStr = PR_smprintf(fmt, modIndex, (long)mod->moduleID, lib_ch,
mod->commonName, dllName, buf);
if (tempStr == NULL) {