diff options
author | Endi S. Dewata <edewata@redhat.com> | 2015-07-20 22:03:17 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2015-07-20 23:22:36 +0200 |
commit | 46dd3b8b536a515ec743001d6f797556f4fffb98 (patch) | |
tree | c65d5f82b9c8f24b21dfef668b93e0c231f2eb00 /base/java-tools/src/com/netscape | |
parent | 131681d5e2f0f9e8ef5f82fc9fb3298df7cc9ad1 (diff) | |
download | pki-46dd3b8b536a515ec743001d6f797556f4fffb98.tar.gz pki-46dd3b8b536a515ec743001d6f797556f4fffb98.tar.xz pki-46dd3b8b536a515ec743001d6f797556f4fffb98.zip |
Fixed ObjectNotFoundException in PKCS12Export.
The PKCS12Export has been fixed to handle ObjectNotFoundException
when exporting certificates without private keys.
https://fedorahosted.org/pki/ticket/1506
Diffstat (limited to 'base/java-tools/src/com/netscape')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/PKCS12Export.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java index 77e6b7cb8..b8999fe99 100644 --- a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java +++ b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java @@ -224,17 +224,17 @@ public class PKCS12Export { for (int i = 0; i < certs.length; i++) { String nickname = certs[i].getNickname(); debug(" * Certificate: " + nickname); - org.mozilla.jss.crypto.PrivateKey prikey = cm.findPrivKeyByCert(certs[i]); + try { + org.mozilla.jss.crypto.PrivateKey prikey = cm.findPrivKeyByCert(certs[i]); - if (prikey == null) { - debug(" Private key does not exist"); - addCertBag(certs[i], null, safeContents); - - } else { debug(" Private key exists"); byte localKeyId[] = addCertBag(certs[i], nickname, safeContents); addKeyBag(prikey, certs[i], password, localKeyId, encSafeContents); + + } catch (org.mozilla.jss.crypto.ObjectNotFoundException e) { + debug(" Private key does not exist"); + addCertBag(certs[i], null, safeContents); } } |