Attachment 572061 Details for Bug 806043 – Fix applied in RHEL adapted for Fedora

[patch] Fix applied in RHEL adapted for Fedora

0001-Bug-806043-Use-pem-files-interchangeably-in-a-single.patch (text/plain), 2.54 KB, created by Elio Maldonado Batiz on 2012-03-22 18:33:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-03-22 18:33:02 UTC

Size: 2.54 KB

patch

obsolete

>From 5a1ffb37637f3bea586edd8ee9b5dacf3c31027a Mon Sep 17 00:00:00 2001
>From: Elio Maldonado <emaldona@redhat.com>
>Date: Thu, 22 Mar 2012 11:20:18 -0700
>Subject: [PATCH] Bug 806043 - Use pem files interchangeably in a single
> process
>
>- Patch contributed by Kamil Dudka for rhbz#689031
>- Cloned for Fedora
>---
> mozilla/security/nss/lib/ckfw/pem/pinst.c   |    3 ++-
> mozilla/security/nss/lib/ckfw/pem/pobject.c |   20 ++------------------
> 2 files changed, 4 insertions(+), 19 deletions(-)
>
>diff --git a/mozilla/security/nss/lib/ckfw/pem/pinst.c b/mozilla/security/nss/lib/ckfw/pem/pinst.c
>index 77f1715..2f25d5a 100644
>--- a/mozilla/security/nss/lib/ckfw/pem/pinst.c
>+++ b/mozilla/security/nss/lib/ckfw/pem/pinst.c
>@@ -213,6 +213,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
>     case CKO_PRIVATE_KEY:
>         plog("Creating key id %d in slot %ld\n", objid, slotID);
>         memset(&o->u.key, 0, sizeof(o->u.key));
>+        nickname = filename;
>         break;
>     case CKO_NETSCAPE_TRUST:
>         plog("Creating trust nick %s id %d in slot %ld\n", nickname, objid, slotID);
>@@ -318,7 +319,7 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objClass,
> 
>     /* FIXME: copy-pasted from CreateObject */
>     const char *nickname = strrchr(filename, '/');
>-    if (nickname)
>+    if (nickname && CKO_PRIVATE_KEY != objClass)
>         nickname++;
>     else
>         nickname = filename;
>diff --git a/mozilla/security/nss/lib/ckfw/pem/pobject.c b/mozilla/security/nss/lib/ckfw/pem/pobject.c
>index a3b94d5..a65cb31 100644
>--- a/mozilla/security/nss/lib/ckfw/pem/pobject.c
>+++ b/mozilla/security/nss/lib/ckfw/pem/pobject.c
>@@ -1113,28 +1113,12 @@ pem_CreateObject
>     }
> 
>     if (objClass == CKO_CERTIFICATE) {
>-        int i;
>-
>         nobjs = ReadDERFromFile(&derlist, filename, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */);
>         if (nobjs < 1)
>             goto loser;
> 
>-        objid = -1;
>-        /* Brute force: find the id of the key, if any, in this slot */
>-        for (i = 0; i < pem_nobjs; i++) {
>-            if (NULL == gobj[i])
>-                continue;
>-
>-            if ((slotID == gobj[i]->slotID)
>-                && (gobj[i]->type == pemBareKey)) {
>-                objid = atoi(gobj[i]->id.data);
>-            }
>-        }
>-
>-        if (objid == -1) {
>-            /* We're just adding a cert, we'll assume the key is next */
>-            objid = pem_nobjs + 1;
>-        }
>+        /* We're just adding a cert, we'll assume the key is next */
>+        objid = pem_nobjs + 1;
> 
>         if (cacert) {
>             /* Add the certificate. There may be more than one */
>-- 
>1.7.7.6
>

Flags:

kdudka: review+

Actions: View | Diff

Attachments on bug 806043: 572061