diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-06-29 08:40:42 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-07-05 23:41:11 +0200 |
| commit | 7524be0fb18304d2562059a82607da0fdd9a2f1d (patch) | |
| tree | 80338aada1d36f11b7d78f3599a02cf6602649a5 /base/util | |
| parent | c12209783759a5098ad451c072bc0e28a5c6bd61 (diff) | |
| download | pki-7524be0fb18304d2562059a82607da0fdd9a2f1d.tar.gz pki-7524be0fb18304d2562059a82607da0fdd9a2f1d.tar.xz pki-7524be0fb18304d2562059a82607da0fdd9a2f1d.zip | |
Refactored CertUtil.importCert().
The code for importing certificate into NSS database has been
moved into CertUtil.importCert().
https://pagure.io/dogtagpki/issue/2280
Change-Id: I6a7a01b9170a5c0e9973ab1d5a7484349765dc5e
Diffstat (limited to 'base/util')
| -rw-r--r-- | base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index eca8dddb6..707a12388 100644 --- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -2064,25 +2064,24 @@ public class CryptoUtil { TokenException, CryptoManager.NicknameConflictException, CryptoManager.UserCertConflictException { - CryptoManager cm = CryptoManager.getInstance(); - cm.importUserCACertPackage(cert.getEncoded(), nickname); - trustCertByNickname(nickname); + importUserCertificate(cert, nickname, true); } - public static void importUserCertificate(X509CertImpl cert, String nickname, - boolean trust) + public static void importUserCertificate(X509CertImpl cert, String nickname, boolean trust) throws CryptoManager.NotInitializedException, CertificateEncodingException, NoSuchItemOnTokenException, TokenException, CryptoManager.NicknameConflictException, CryptoManager.UserCertConflictException { - CryptoManager cm = CryptoManager.getInstance(); + CryptoManager cm = CryptoManager.getInstance(); cm.importUserCACertPackage(cert.getEncoded(), nickname); - if (trust) + + if (trust) { trustCertByNickname(nickname); + } } public static java.security.cert.X509Certificate[] getX509CertificateFromPKCS7(byte[] b) throws IOException { |