23 lines
793 B
Diff
23 lines
793 B
Diff
|
--- nss/lib/ckfw/pem/pinst.c.orig 2016-02-19 18:32:43.545902319 +0100
|
||
|
|
+++ nss/lib/ckfw/pem/pinst.c 2016-02-19 18:32:50.773900029 +0100
|
||
|
|
@@ -581,7 +581,7 @@
|
||
|
|
|
||
|
|
objid = pem_nobjs + 1;
|
||
|
|
|
||
|
|
- nickname = getUniquePEMNicknameFromFilename(certfile, i);
|
||
|
|
+ nickname = getUniquePEMNicknameFromFilename(certfile, 0);
|
||
|
|
if (!nickname) {
|
||
|
|
error = CKR_GENERAL_ERROR;
|
||
|
|
goto loser;
|
||
|
|
--- nss/lib/ckfw/pem/pinst.c.orig 2016-02-19 18:54:07.225438587 +0100
|
||
|
|
+++ nss/lib/ckfw/pem/pinst.c 2016-02-19 18:54:37.368427084 +0100
|
||
|
|
@@ -534,7 +534,7 @@
|
||
|
|
AddCertificate(char *certfile, char *keyfile, PRBool cacert,
|
||
|
|
CK_SLOT_ID slotID)
|
||
|
|
{
|
||
|
|
- pemInternalObject *o;
|
||
|
|
+ pemInternalObject *o = NULL;
|
||
|
|
CK_RV error = 0;
|
||
|
|
int objid, i;
|
||
|
|
int nobjs = 0;
|