jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
author vinnie
Mon, 15 Feb 2016 15:57:58 +0000
changeset 35958 31866c4c84d3
parent 32634 614f8e5859aa
child 40276 2217f830ca7b
permissions -rw-r--r--
8149411: PKCS12KeyStore cannot extract AES Secret Keys Reviewed-by: xuelei
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
35958
31866c4c84d3 8149411: PKCS12KeyStore cannot extract AES Secret Keys
vinnie
parents: 32634
diff changeset
     2
 * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    23
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
package sun.security.pkcs12;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
import java.io.*;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    29
import java.security.AccessController;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
import java.security.MessageDigest;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
import java.security.NoSuchAlgorithmException;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
import java.security.Key;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
    33
import java.security.KeyFactory;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    34
import java.security.KeyStore;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
    35
import java.security.KeyStoreSpi;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
    36
import java.security.KeyStoreException;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
    37
import java.security.PKCS12Attribute;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
import java.security.PrivateKey;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    39
import java.security.PrivilegedAction;
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    40
import java.security.UnrecoverableEntryException;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
import java.security.UnrecoverableKeyException;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
    42
import java.security.SecureRandom;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    43
import java.security.Security;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
import java.security.cert.Certificate;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
import java.security.cert.CertificateFactory;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
import java.security.cert.X509Certificate;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
import java.security.cert.CertificateException;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    48
import java.security.spec.AlgorithmParameterSpec;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
    49
import java.security.spec.KeySpec;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
import java.security.spec.PKCS8EncodedKeySpec;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
import java.util.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
import java.security.AlgorithmParameters;
32634
614f8e5859aa 8134232: KeyStore.load() throws an IOException with a wrong cause in case of wrong password
asmotrak
parents: 31695
diff changeset
    54
import java.security.InvalidAlgorithmParameterException;
614f8e5859aa 8134232: KeyStore.load() throws an IOException with a wrong cause in case of wrong password
asmotrak
parents: 31695
diff changeset
    55
import java.security.InvalidKeyException;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
import javax.crypto.spec.PBEParameterSpec;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
import javax.crypto.spec.PBEKeySpec;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
    58
import javax.crypto.spec.SecretKeySpec;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
import javax.crypto.SecretKeyFactory;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
import javax.crypto.SecretKey;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
import javax.crypto.Cipher;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
import javax.crypto.Mac;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    63
import javax.security.auth.DestroyFailedException;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
import javax.security.auth.x500.X500Principal;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
    66
import sun.security.util.Debug;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
import sun.security.util.DerInputStream;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
import sun.security.util.DerOutputStream;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
import sun.security.util.DerValue;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
import sun.security.util.ObjectIdentifier;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
import sun.security.pkcs.ContentInfo;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
import sun.security.x509.AlgorithmId;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
import sun.security.pkcs.EncryptedPrivateKeyInfo;
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
    74
import sun.security.provider.JavaKeyStore.JKS;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
    75
import sun.security.util.KeyStoreDelegator;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
90ce3da70b43 Initial load
duke
parents:
diff changeset
    78
/**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    79
 * This class provides the keystore implementation referred to as "PKCS12".
90ce3da70b43 Initial load
duke
parents:
diff changeset
    80
 * Implements the PKCS#12 PFX protected using the Password privacy mode.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    81
 * The contents are protected using Password integrity mode.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    82
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
 * Currently we support following PBE algorithms:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    84
 *  - pbeWithSHAAnd3KeyTripleDESCBC to encrypt private keys
90ce3da70b43 Initial load
duke
parents:
diff changeset
    85
 *  - pbeWithSHAAnd40BitRC2CBC to encrypt certificates
90ce3da70b43 Initial load
duke
parents:
diff changeset
    86
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    87
 * Supported encryption of various implementations :
90ce3da70b43 Initial load
duke
parents:
diff changeset
    88
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
 * Software and mode.     Certificate encryption  Private key encryption
90ce3da70b43 Initial load
duke
parents:
diff changeset
    90
 * ---------------------------------------------------------------------
90ce3da70b43 Initial load
duke
parents:
diff changeset
    91
 * MSIE4 (domestic            40 bit RC2.            40 bit RC2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    92
 * and xport versions)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    93
 * PKCS#12 export.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    94
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    95
 * MSIE4, 5 (domestic         40 bit RC2,            40 bit RC2,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
 * and export versions)       3 key triple DES       3 key triple DES
90ce3da70b43 Initial load
duke
parents:
diff changeset
    97
 * PKCS#12 import.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    98
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    99
 * MSIE5                      40 bit RC2             3 key triple DES,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   100
 * PKCS#12 export.                                   with SHA1 (168 bits)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   102
 * Netscape Communicator      40 bit RC2             3 key triple DES,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   103
 * (domestic and export                              with SHA1 (168 bits)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
 * versions) PKCS#12 export
90ce3da70b43 Initial load
duke
parents:
diff changeset
   105
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
 * Netscape Communicator      40 bit ciphers only    All.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   107
 * (export version)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   108
 * PKCS#12 import.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
 * Netscape Communicator      All.                   All.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
 * (domestic or fortified
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
 * version) PKCS#12 import.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
 * OpenSSL PKCS#12 code.      All.                   All.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
 * ---------------------------------------------------------------------
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
 *
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   117
 * NOTE: PKCS12 KeyStore supports PrivateKeyEntry and TrustedCertficateEntry.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
 * PKCS#12 is mainly used to deliver private keys with their associated
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
 * certificate chain and aliases. In a PKCS12 keystore, entries are
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
 * identified by the alias, and a localKeyId is required to match the
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   121
 * private key with the certificate. Trusted certificate entries are identified
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   122
 * by the presence of an trustedKeyUsage attribute.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
 * @author Seema Malkani
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
 * @author Jeff Nisewanger
90ce3da70b43 Initial load
duke
parents:
diff changeset
   126
 * @author Jan Luehe
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
 * @see KeyProtector
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
 * @see java.security.KeyStoreSpi
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
 * @see KeyTool
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   133
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
public final class PKCS12KeyStore extends KeyStoreSpi {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   135
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
   136
    // special PKCS12 keystore that supports PKCS12 and JKS file formats
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
   137
    public static final class DualFormatPKCS12 extends KeyStoreDelegator {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
   138
        public DualFormatPKCS12() {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
   139
            super("PKCS12", PKCS12KeyStore.class, "JKS", JKS.class);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
   140
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
   141
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
   142
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
    public static final int VERSION_3 = 3;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   144
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   145
    private static final String[] KEY_PROTECTION_ALGORITHM = {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   146
        "keystore.pkcs12.keyProtectionAlgorithm",
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   147
        "keystore.PKCS12.keyProtectionAlgorithm"
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   148
    };
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   149
15308
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
   150
    // friendlyName, localKeyId, trustedKeyUsage
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
   151
    private static final String[] CORE_ATTRIBUTES = {
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
   152
        "1.2.840.113549.1.9.20",
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
   153
        "1.2.840.113549.1.9.21",
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
   154
        "2.16.840.1.113894.746875.1.1"
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
   155
    };
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
   156
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   157
    private static final Debug debug = Debug.getInstance("pkcs12");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   158
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   159
    private static final int[] keyBag  = {1, 2, 840, 113549, 1, 12, 10, 1, 2};
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   160
    private static final int[] certBag = {1, 2, 840, 113549, 1, 12, 10, 1, 3};
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   161
    private static final int[] secretBag = {1, 2, 840, 113549, 1, 12, 10, 1, 5};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   162
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   163
    private static final int[] pkcs9Name  = {1, 2, 840, 113549, 1, 9, 20};
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   164
    private static final int[] pkcs9KeyId = {1, 2, 840, 113549, 1, 9, 21};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   165
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   166
    private static final int[] pkcs9certType = {1, 2, 840, 113549, 1, 9, 22, 1};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   167
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   168
    private static final int[] pbeWithSHAAnd40BitRC2CBC =
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
                                        {1, 2, 840, 113549, 1, 12, 1, 6};
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   170
    private static final int[] pbeWithSHAAnd3KeyTripleDESCBC =
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
                                        {1, 2, 840, 113549, 1, 12, 1, 3};
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   172
    private static final int[] pbes2 = {1, 2, 840, 113549, 1, 5, 13};
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   173
    // TODO: temporary Oracle OID
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   174
    /*
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   175
     * { joint-iso-itu-t(2) country(16) us(840) organization(1) oracle(113894)
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   176
     *   jdk(746875) crypto(1) id-at-trustedKeyUsage(1) }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   177
     */
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   178
    private static final int[] TrustedKeyUsage =
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   179
                                        {2, 16, 840, 1, 113894, 746875, 1, 1};
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   180
    private static final int[] AnyExtendedKeyUsage = {2, 5, 29, 37, 0};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
    private static ObjectIdentifier PKCS8ShroudedKeyBag_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
    private static ObjectIdentifier CertBag_OID;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   184
    private static ObjectIdentifier SecretBag_OID;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   185
    private static ObjectIdentifier PKCS9FriendlyName_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   186
    private static ObjectIdentifier PKCS9LocalKeyId_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
    private static ObjectIdentifier PKCS9CertType_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
    private static ObjectIdentifier pbeWithSHAAnd40BitRC2CBC_OID;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
    private static ObjectIdentifier pbeWithSHAAnd3KeyTripleDESCBC_OID;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   190
    private static ObjectIdentifier pbes2_OID;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   191
    private static ObjectIdentifier TrustedKeyUsage_OID;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   192
    private static ObjectIdentifier[] AnyUsage;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
    private int counter = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
    private static final int iterationCount = 1024;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
    private static final int SALT_LEN = 20;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   197
90ce3da70b43 Initial load
duke
parents:
diff changeset
   198
    // private key count
90ce3da70b43 Initial load
duke
parents:
diff changeset
   199
    // Note: This is a workaround to allow null localKeyID attribute
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
    // in pkcs12 with one private key entry and associated cert-chain
90ce3da70b43 Initial load
duke
parents:
diff changeset
   201
    private int privateKeyCount = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   202
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   203
    // secret key count
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   204
    private int secretKeyCount = 0;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   205
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   206
    // certificate count
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   207
    private int certificateCount = 0;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   208
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   209
    // the source of randomness
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
    private SecureRandom random;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
90ce3da70b43 Initial load
duke
parents:
diff changeset
   212
    static {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   213
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
            PKCS8ShroudedKeyBag_OID = new ObjectIdentifier(keyBag);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
            CertBag_OID = new ObjectIdentifier(certBag);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   216
            SecretBag_OID = new ObjectIdentifier(secretBag);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   217
            PKCS9FriendlyName_OID = new ObjectIdentifier(pkcs9Name);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   218
            PKCS9LocalKeyId_OID = new ObjectIdentifier(pkcs9KeyId);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   219
            PKCS9CertType_OID = new ObjectIdentifier(pkcs9certType);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   220
            pbeWithSHAAnd40BitRC2CBC_OID =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
                        new ObjectIdentifier(pbeWithSHAAnd40BitRC2CBC);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
            pbeWithSHAAnd3KeyTripleDESCBC_OID =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
                        new ObjectIdentifier(pbeWithSHAAnd3KeyTripleDESCBC);
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   224
            pbes2_OID = new ObjectIdentifier(pbes2);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   225
            TrustedKeyUsage_OID = new ObjectIdentifier(TrustedKeyUsage);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   226
            AnyUsage = new ObjectIdentifier[]{
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   227
                new ObjectIdentifier(AnyExtendedKeyUsage)};
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   228
        } catch (IOException ioe) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   229
            // should not happen
90ce3da70b43 Initial load
duke
parents:
diff changeset
   230
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   231
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   232
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   233
    // A keystore entry and associated attributes
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   234
    private static class Entry {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   235
        Date date; // the creation date of this entry
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   236
        String alias;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   237
        byte[] keyId;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   238
        Set<KeyStore.Entry.Attribute> attributes;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   239
    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   240
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   241
    // A key entry
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   242
    private static class KeyEntry extends Entry {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   243
    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   244
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   245
    // A private key entry and its supporting certificate chain
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   246
    private static class PrivateKeyEntry extends KeyEntry {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   247
        byte[] protectedPrivKey;
31538
0981099a3e54 8130022: Use Java-style array declarations consistently
igerasim
parents: 31426
diff changeset
   248
        Certificate[] chain;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   249
    };
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   250
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   251
    // A secret key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   252
    private static class SecretKeyEntry extends KeyEntry {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   253
        byte[] protectedSecretKey;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   254
    };
90ce3da70b43 Initial load
duke
parents:
diff changeset
   255
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   256
    // A certificate entry
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   257
    private static class CertEntry extends Entry {
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   258
        final X509Certificate cert;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   259
        ObjectIdentifier[] trustedKeyUsage;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   260
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   261
        CertEntry(X509Certificate cert, byte[] keyId, String alias) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   262
            this(cert, keyId, alias, null, null);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   263
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   264
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   265
        CertEntry(X509Certificate cert, byte[] keyId, String alias,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   266
                ObjectIdentifier[] trustedKeyUsage,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   267
                Set<? extends KeyStore.Entry.Attribute> attributes) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   268
            this.date = new Date();
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   269
            this.cert = cert;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   270
            this.keyId = keyId;
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   271
            this.alias = alias;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   272
            this.trustedKeyUsage = trustedKeyUsage;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   273
            this.attributes = new HashSet<>();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   274
            if (attributes != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   275
                this.attributes.addAll(attributes);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   276
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   277
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   278
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   279
90ce3da70b43 Initial load
duke
parents:
diff changeset
   280
    /**
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   281
     * Private keys and certificates are stored in a map.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   282
     * Map entries are keyed by alias names.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   283
     */
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   284
    private Map<String, Entry> entries =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   285
        Collections.synchronizedMap(new LinkedHashMap<String, Entry>());
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   286
90ce3da70b43 Initial load
duke
parents:
diff changeset
   287
    private ArrayList<KeyEntry> keyList = new ArrayList<KeyEntry>();
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   288
    private LinkedHashMap<X500Principal, X509Certificate> certsMap =
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   289
            new LinkedHashMap<X500Principal, X509Certificate>();
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   290
    private ArrayList<CertEntry> certEntries = new ArrayList<CertEntry>();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   291
90ce3da70b43 Initial load
duke
parents:
diff changeset
   292
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   293
     * Returns the key associated with the given alias, using the given
90ce3da70b43 Initial load
duke
parents:
diff changeset
   294
     * password to recover it.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   295
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   296
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   297
     * @param password the password for recovering the key
90ce3da70b43 Initial load
duke
parents:
diff changeset
   298
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   299
     * @return the requested key, or null if the given alias does not exist
90ce3da70b43 Initial load
duke
parents:
diff changeset
   300
     * or does not identify a <i>key entry</i>.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   301
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   302
     * @exception NoSuchAlgorithmException if the algorithm for recovering the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   303
     * key cannot be found
90ce3da70b43 Initial load
duke
parents:
diff changeset
   304
     * @exception UnrecoverableKeyException if the key cannot be recovered
90ce3da70b43 Initial load
duke
parents:
diff changeset
   305
     * (e.g., the given password is wrong).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   306
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   307
    public Key engineGetKey(String alias, char[] password)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   308
        throws NoSuchAlgorithmException, UnrecoverableKeyException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   309
    {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   310
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   311
        Key key = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   312
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   313
        if (entry == null || (!(entry instanceof KeyEntry))) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   314
            return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   315
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   316
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   317
        // get the encoded private key or secret key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   318
        byte[] encrBytes = null;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   319
        if (entry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   320
            encrBytes = ((PrivateKeyEntry) entry).protectedPrivKey;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   321
        } else if (entry instanceof SecretKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   322
            encrBytes = ((SecretKeyEntry) entry).protectedSecretKey;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   323
        } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   324
            throw new UnrecoverableKeyException("Error locating key");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   325
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   326
90ce3da70b43 Initial load
duke
parents:
diff changeset
   327
        byte[] encryptedKey;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   328
        AlgorithmParameters algParams;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   329
        ObjectIdentifier algOid;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   330
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   331
            // get the encrypted private key
90ce3da70b43 Initial load
duke
parents:
diff changeset
   332
            EncryptedPrivateKeyInfo encrInfo =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   333
                        new EncryptedPrivateKeyInfo(encrBytes);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   334
            encryptedKey = encrInfo.getEncryptedData();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   335
90ce3da70b43 Initial load
duke
parents:
diff changeset
   336
            // parse Algorithm parameters
90ce3da70b43 Initial load
duke
parents:
diff changeset
   337
            DerValue val = new DerValue(encrInfo.getAlgorithm().encode());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   338
            DerInputStream in = val.toDerInputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   339
            algOid = in.getOID();
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   340
            algParams = parseAlgParameters(algOid, in);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   341
90ce3da70b43 Initial load
duke
parents:
diff changeset
   342
        } catch (IOException ioe) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   343
            UnrecoverableKeyException uke =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   344
                new UnrecoverableKeyException("Private key not stored as "
90ce3da70b43 Initial load
duke
parents:
diff changeset
   345
                                 + "PKCS#8 EncryptedPrivateKeyInfo: " + ioe);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   346
            uke.initCause(ioe);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   347
            throw uke;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   348
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   349
90ce3da70b43 Initial load
duke
parents:
diff changeset
   350
        try {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   351
            byte[] keyInfo;
11835
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   352
            while (true) {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   353
                try {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   354
                    // Use JCE
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   355
                    SecretKey skey = getPBEKey(password);
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   356
                    Cipher cipher = Cipher.getInstance(
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   357
                        mapPBEParamsToAlgorithm(algOid, algParams));
11835
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   358
                    cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   359
                    keyInfo = cipher.doFinal(encryptedKey);
11835
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   360
                    break;
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   361
                } catch (Exception e) {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   362
                    if (password.length == 0) {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   363
                        // Retry using an empty password
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   364
                        // without a NULL terminator.
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   365
                        password = new char[1];
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   366
                        continue;
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   367
                    }
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   368
                    throw e;
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   369
                }
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
   370
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   371
90ce3da70b43 Initial load
duke
parents:
diff changeset
   372
            /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   373
             * Parse the key algorithm and then use a JCA key factory
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   374
             * to re-create the key.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   375
             */
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   376
            DerValue val = new DerValue(keyInfo);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   377
            DerInputStream in = val.toDerInputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   378
            int i = in.getInteger();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   379
            DerValue[] value = in.getSequence(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   380
            AlgorithmId algId = new AlgorithmId(value[0].getOID());
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   381
            String keyAlgo = algId.getName();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   382
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   383
            // decode private key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   384
            if (entry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   385
                KeyFactory kfac = KeyFactory.getInstance(keyAlgo);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   386
                PKCS8EncodedKeySpec kspec = new PKCS8EncodedKeySpec(keyInfo);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   387
                key = kfac.generatePrivate(kspec);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   388
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   389
                if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   390
                    debug.println("Retrieved a protected private key (" +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   391
                        key.getClass().getName() + ") at alias '" + alias +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   392
                        "'");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   393
                }
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   394
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   395
            // decode secret key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   396
            } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   397
                byte[] keyBytes = in.getOctetString();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   398
                SecretKeySpec secretKeySpec =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   399
                    new SecretKeySpec(keyBytes, keyAlgo);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   400
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   401
                // Special handling required for PBE: needs a PBEKeySpec
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   402
                if (keyAlgo.startsWith("PBE")) {
35958
31866c4c84d3 8149411: PKCS12KeyStore cannot extract AES Secret Keys
vinnie
parents: 32634
diff changeset
   403
                    SecretKeyFactory sKeyFactory =
31866c4c84d3 8149411: PKCS12KeyStore cannot extract AES Secret Keys
vinnie
parents: 32634
diff changeset
   404
                        SecretKeyFactory.getInstance(keyAlgo);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   405
                    KeySpec pbeKeySpec =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   406
                        sKeyFactory.getKeySpec(secretKeySpec, PBEKeySpec.class);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   407
                    key = sKeyFactory.generateSecret(pbeKeySpec);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   408
                } else {
35958
31866c4c84d3 8149411: PKCS12KeyStore cannot extract AES Secret Keys
vinnie
parents: 32634
diff changeset
   409
                    key = secretKeySpec;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   410
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   411
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   412
                if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   413
                    debug.println("Retrieved a protected secret key (" +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   414
                        key.getClass().getName() + ") at alias '" + alias +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   415
                        "'");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   416
                }
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   417
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   418
        } catch (Exception e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   419
            UnrecoverableKeyException uke =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   420
                new UnrecoverableKeyException("Get Key failed: " +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   421
                                        e.getMessage());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   422
            uke.initCause(e);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   423
            throw uke;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   424
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   425
        return key;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   426
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   427
90ce3da70b43 Initial load
duke
parents:
diff changeset
   428
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   429
     * Returns the certificate chain associated with the given alias.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   430
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   431
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   432
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   433
     * @return the certificate chain (ordered with the user's certificate first
90ce3da70b43 Initial load
duke
parents:
diff changeset
   434
     * and the root certificate authority last), or null if the given alias
90ce3da70b43 Initial load
duke
parents:
diff changeset
   435
     * does not exist or does not contain a certificate chain (i.e., the given
90ce3da70b43 Initial load
duke
parents:
diff changeset
   436
     * alias identifies either a <i>trusted certificate entry</i> or a
90ce3da70b43 Initial load
duke
parents:
diff changeset
   437
     * <i>key entry</i> without a certificate chain).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   438
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   439
    public Certificate[] engineGetCertificateChain(String alias) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   440
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   441
        if (entry != null && entry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   442
            if (((PrivateKeyEntry) entry).chain == null) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   443
                return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   444
            } else {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   445
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   446
                if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   447
                    debug.println("Retrieved a " +
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   448
                        ((PrivateKeyEntry) entry).chain.length +
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   449
                        "-certificate chain at alias '" + alias + "'");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   450
                }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   451
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   452
                return ((PrivateKeyEntry) entry).chain.clone();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   453
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   454
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   455
            return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   456
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   457
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   458
90ce3da70b43 Initial load
duke
parents:
diff changeset
   459
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   460
     * Returns the certificate associated with the given alias.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   461
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   462
     * <p>If the given alias name identifies a
90ce3da70b43 Initial load
duke
parents:
diff changeset
   463
     * <i>trusted certificate entry</i>, the certificate associated with that
90ce3da70b43 Initial load
duke
parents:
diff changeset
   464
     * entry is returned. If the given alias name identifies a
90ce3da70b43 Initial load
duke
parents:
diff changeset
   465
     * <i>key entry</i>, the first element of the certificate chain of that
90ce3da70b43 Initial load
duke
parents:
diff changeset
   466
     * entry is returned, or null if that entry does not have a certificate
90ce3da70b43 Initial load
duke
parents:
diff changeset
   467
     * chain.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   468
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   469
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   470
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   471
     * @return the certificate, or null if the given alias does not exist or
90ce3da70b43 Initial load
duke
parents:
diff changeset
   472
     * does not contain a certificate.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   473
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   474
    public Certificate engineGetCertificate(String alias) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   475
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   476
        if (entry == null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   477
            return null;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   478
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   479
        if (entry instanceof CertEntry &&
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   480
            ((CertEntry) entry).trustedKeyUsage != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   481
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   482
            if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   483
                if (Arrays.equals(AnyUsage,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   484
                    ((CertEntry) entry).trustedKeyUsage)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   485
                    debug.println("Retrieved a certificate at alias '" + alias +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   486
                        "' (trusted for any purpose)");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   487
                } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   488
                    debug.println("Retrieved a certificate at alias '" + alias +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   489
                        "' (trusted for limited purposes)");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   490
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   491
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   492
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   493
            return ((CertEntry) entry).cert;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   494
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   495
        } else if (entry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   496
            if (((PrivateKeyEntry) entry).chain == null) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   497
                return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   498
            } else {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   499
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   500
                if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   501
                    debug.println("Retrieved a certificate at alias '" + alias +
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   502
                        "'");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   503
                }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   504
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   505
                return ((PrivateKeyEntry) entry).chain[0];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   506
            }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   507
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   508
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   509
            return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   510
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   511
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   512
90ce3da70b43 Initial load
duke
parents:
diff changeset
   513
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   514
     * Returns the creation date of the entry identified by the given alias.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   515
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   516
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   517
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   518
     * @return the creation date of this entry, or null if the given alias does
90ce3da70b43 Initial load
duke
parents:
diff changeset
   519
     * not exist
90ce3da70b43 Initial load
duke
parents:
diff changeset
   520
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   521
    public Date engineGetCreationDate(String alias) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   522
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   523
        if (entry != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   524
            return new Date(entry.date.getTime());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   525
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   526
            return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   527
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   528
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   529
90ce3da70b43 Initial load
duke
parents:
diff changeset
   530
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   531
     * Assigns the given key to the given alias, protecting it with the given
90ce3da70b43 Initial load
duke
parents:
diff changeset
   532
     * password.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   533
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   534
     * <p>If the given key is of type <code>java.security.PrivateKey</code>,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   535
     * it must be accompanied by a certificate chain certifying the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   536
     * corresponding public key.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   537
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   538
     * <p>If the given alias already exists, the keystore information
90ce3da70b43 Initial load
duke
parents:
diff changeset
   539
     * associated with it is overridden by the given key (and possibly
90ce3da70b43 Initial load
duke
parents:
diff changeset
   540
     * certificate chain).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   541
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   542
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   543
     * @param key the key to be associated with the alias
90ce3da70b43 Initial load
duke
parents:
diff changeset
   544
     * @param password the password to protect the key
90ce3da70b43 Initial load
duke
parents:
diff changeset
   545
     * @param chain the certificate chain for the corresponding public
90ce3da70b43 Initial load
duke
parents:
diff changeset
   546
     * key (only required if the given key is of type
90ce3da70b43 Initial load
duke
parents:
diff changeset
   547
     * <code>java.security.PrivateKey</code>).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   548
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   549
     * @exception KeyStoreException if the given key cannot be protected, or
90ce3da70b43 Initial load
duke
parents:
diff changeset
   550
     * this operation fails for some other reason
90ce3da70b43 Initial load
duke
parents:
diff changeset
   551
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   552
    public synchronized void engineSetKeyEntry(String alias, Key key,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   553
                        char[] password, Certificate[] chain)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   554
        throws KeyStoreException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   555
    {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   556
        KeyStore.PasswordProtection passwordProtection =
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   557
            new KeyStore.PasswordProtection(password);
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   558
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   559
        try {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   560
            setKeyEntry(alias, key, passwordProtection, chain, null);
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   561
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   562
        } finally {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   563
            try {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   564
                passwordProtection.destroy();
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   565
            } catch (DestroyFailedException dfe) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   566
                // ignore
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   567
            }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   568
        }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   569
    }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   570
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   571
    /*
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   572
     * Sets a key entry (with attributes, when present)
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   573
     */
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   574
    private void setKeyEntry(String alias, Key key,
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   575
        KeyStore.PasswordProtection passwordProtection, Certificate[] chain,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   576
        Set<KeyStore.Entry.Attribute> attributes)
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   577
            throws KeyStoreException
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   578
    {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   579
        try {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   580
            Entry entry;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   581
90ce3da70b43 Initial load
duke
parents:
diff changeset
   582
            if (key instanceof PrivateKey) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   583
                PrivateKeyEntry keyEntry = new PrivateKeyEntry();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   584
                keyEntry.date = new Date();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   585
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   586
                if ((key.getFormat().equals("PKCS#8")) ||
90ce3da70b43 Initial load
duke
parents:
diff changeset
   587
                    (key.getFormat().equals("PKCS8"))) {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   588
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   589
                    if (debug != null) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   590
                        debug.println("Setting a protected private key (" +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   591
                            key.getClass().getName() + ") at alias '" + alias +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   592
                            "'");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   593
                        }
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   594
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   595
                    // Encrypt the private key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   596
                    keyEntry.protectedPrivKey =
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   597
                        encryptPrivateKey(key.getEncoded(), passwordProtection);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   598
                } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   599
                    throw new KeyStoreException("Private key is not encoded" +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   600
                                "as PKCS#8");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   601
                }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   602
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   603
                // clone the chain
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   604
                if (chain != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   605
                    // validate cert-chain
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   606
                    if ((chain.length > 1) && (!validateChain(chain)))
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   607
                       throw new KeyStoreException("Certificate chain is " +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   608
                                                "not valid");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   609
                    keyEntry.chain = chain.clone();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   610
                    certificateCount += chain.length;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   611
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   612
                    if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   613
                        debug.println("Setting a " + chain.length +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   614
                            "-certificate chain at alias '" + alias + "'");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   615
                    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   616
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   617
                privateKeyCount++;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   618
                entry = keyEntry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   619
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   620
            } else if (key instanceof SecretKey) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   621
                SecretKeyEntry keyEntry = new SecretKeyEntry();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   622
                keyEntry.date = new Date();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   623
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   624
                // Encode secret key in a PKCS#8
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   625
                DerOutputStream pkcs8 = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   626
                DerOutputStream secretKeyInfo = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   627
                secretKeyInfo.putInteger(0);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   628
                AlgorithmId algId = AlgorithmId.get(key.getAlgorithm());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   629
                algId.encode(secretKeyInfo);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   630
                secretKeyInfo.putOctetString(key.getEncoded());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   631
                pkcs8.write(DerValue.tag_Sequence, secretKeyInfo);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   632
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   633
                // Encrypt the secret key (using same PBE as for private keys)
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   634
                keyEntry.protectedSecretKey =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   635
                    encryptPrivateKey(pkcs8.toByteArray(), passwordProtection);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   636
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   637
                if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   638
                    debug.println("Setting a protected secret key (" +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   639
                        key.getClass().getName() + ") at alias '" + alias +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   640
                        "'");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   641
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   642
                secretKeyCount++;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   643
                entry = keyEntry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   644
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   645
            } else {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   646
                throw new KeyStoreException("Unsupported Key type");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   647
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   648
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   649
            entry.attributes = new HashSet<>();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   650
            if (attributes != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   651
                entry.attributes.addAll(attributes);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   652
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   653
            // set the keyId to current date
90ce3da70b43 Initial load
duke
parents:
diff changeset
   654
            entry.keyId = ("Time " + (entry.date).getTime()).getBytes("UTF8");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   655
            // set the alias
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
   656
            entry.alias = alias.toLowerCase(Locale.ENGLISH);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   657
            // add the entry
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
   658
            entries.put(alias.toLowerCase(Locale.ENGLISH), entry);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   659
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   660
        } catch (Exception nsae) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   661
            throw new KeyStoreException("Key protection " +
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   662
                       " algorithm not found: " + nsae, nsae);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   663
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   664
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   665
90ce3da70b43 Initial load
duke
parents:
diff changeset
   666
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   667
     * Assigns the given key (that has already been protected) to the given
90ce3da70b43 Initial load
duke
parents:
diff changeset
   668
     * alias.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   669
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   670
     * <p>If the protected key is of type
90ce3da70b43 Initial load
duke
parents:
diff changeset
   671
     * <code>java.security.PrivateKey</code>, it must be accompanied by a
90ce3da70b43 Initial load
duke
parents:
diff changeset
   672
     * certificate chain certifying the corresponding public key. If the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   673
     * underlying keystore implementation is of type <code>jks</code>,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   674
     * <code>key</code> must be encoded as an
90ce3da70b43 Initial load
duke
parents:
diff changeset
   675
     * <code>EncryptedPrivateKeyInfo</code> as defined in the PKCS #8 standard.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   676
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   677
     * <p>If the given alias already exists, the keystore information
90ce3da70b43 Initial load
duke
parents:
diff changeset
   678
     * associated with it is overridden by the given key (and possibly
90ce3da70b43 Initial load
duke
parents:
diff changeset
   679
     * certificate chain).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   680
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   681
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   682
     * @param key the key (in protected format) to be associated with the alias
90ce3da70b43 Initial load
duke
parents:
diff changeset
   683
     * @param chain the certificate chain for the corresponding public
90ce3da70b43 Initial load
duke
parents:
diff changeset
   684
     * key (only useful if the protected key is of type
90ce3da70b43 Initial load
duke
parents:
diff changeset
   685
     * <code>java.security.PrivateKey</code>).
90ce3da70b43 Initial load
duke
parents:
diff changeset
   686
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   687
     * @exception KeyStoreException if this operation fails.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   688
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   689
    public synchronized void engineSetKeyEntry(String alias, byte[] key,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   690
                                  Certificate[] chain)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   691
        throws KeyStoreException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   692
    {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   693
        // Private key must be encoded as EncryptedPrivateKeyInfo
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   694
        // as defined in PKCS#8
90ce3da70b43 Initial load
duke
parents:
diff changeset
   695
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   696
            new EncryptedPrivateKeyInfo(key);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   697
        } catch (IOException ioe) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   698
            throw new KeyStoreException("Private key is not stored"
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   699
                    + " as PKCS#8 EncryptedPrivateKeyInfo: " + ioe, ioe);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   700
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   701
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   702
        PrivateKeyEntry entry = new PrivateKeyEntry();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   703
        entry.date = new Date();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   704
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   705
        if (debug != null) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   706
            debug.println("Setting a protected private key at alias '" +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   707
                alias + "'");
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   708
        }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   709
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   710
        try {
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   711
            // set the keyId to current date
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   712
            entry.keyId = ("Time " + (entry.date).getTime()).getBytes("UTF8");
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   713
        } catch (UnsupportedEncodingException ex) {
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   714
            // Won't happen
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   715
        }
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   716
        // set the alias
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
   717
        entry.alias = alias.toLowerCase(Locale.ENGLISH);
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
   718
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   719
        entry.protectedPrivKey = key.clone();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   720
        if (chain != null) {
29909
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
   721
            // validate cert-chain
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
   722
            if ((chain.length > 1) && (!validateChain(chain))) {
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
   723
                throw new KeyStoreException("Certificate chain is "
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
   724
                        + "not valid");
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
   725
            }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   726
            entry.chain = chain.clone();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   727
            certificateCount += chain.length;
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   728
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   729
            if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   730
                debug.println("Setting a " + entry.chain.length +
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   731
                    "-certificate chain at alias '" + alias + "'");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   732
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   733
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   734
90ce3da70b43 Initial load
duke
parents:
diff changeset
   735
        // add the entry
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   736
        privateKeyCount++;
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
   737
        entries.put(alias.toLowerCase(Locale.ENGLISH), entry);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   738
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   739
90ce3da70b43 Initial load
duke
parents:
diff changeset
   740
90ce3da70b43 Initial load
duke
parents:
diff changeset
   741
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   742
     * Generate random salt
90ce3da70b43 Initial load
duke
parents:
diff changeset
   743
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   744
    private byte[] getSalt()
90ce3da70b43 Initial load
duke
parents:
diff changeset
   745
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   746
        // Generate a random salt.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   747
        byte[] salt = new byte[SALT_LEN];
90ce3da70b43 Initial load
duke
parents:
diff changeset
   748
        if (random == null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   749
           random = new SecureRandom();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   750
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   751
        random.nextBytes(salt);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   752
        return salt;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   753
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   754
90ce3da70b43 Initial load
duke
parents:
diff changeset
   755
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   756
     * Generate PBE Algorithm Parameters
90ce3da70b43 Initial load
duke
parents:
diff changeset
   757
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   758
    private AlgorithmParameters getAlgorithmParameters(String algorithm)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   759
        throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   760
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   761
        AlgorithmParameters algParams = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   762
90ce3da70b43 Initial load
duke
parents:
diff changeset
   763
        // create PBE parameters from salt and iteration count
90ce3da70b43 Initial load
duke
parents:
diff changeset
   764
        PBEParameterSpec paramSpec =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   765
                new PBEParameterSpec(getSalt(), iterationCount);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   766
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   767
           algParams = AlgorithmParameters.getInstance(algorithm);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   768
           algParams.init(paramSpec);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   769
        } catch (Exception e) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   770
           throw new IOException("getAlgorithmParameters failed: " +
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   771
                                 e.getMessage(), e);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   772
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   773
        return algParams;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   774
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   775
90ce3da70b43 Initial load
duke
parents:
diff changeset
   776
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   777
     * parse Algorithm Parameters
90ce3da70b43 Initial load
duke
parents:
diff changeset
   778
     */
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   779
    private AlgorithmParameters parseAlgParameters(ObjectIdentifier algorithm,
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   780
        DerInputStream in) throws IOException
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   781
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   782
        AlgorithmParameters algParams = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   783
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   784
            DerValue params;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   785
            if (in.available() == 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   786
                params = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   787
            } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   788
                params = in.getDerValue();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   789
                if (params.tag == DerValue.tag_Null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   790
                   params = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   791
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   792
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   793
            if (params != null) {
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
   794
                if (algorithm.equals(pbes2_OID)) {
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   795
                    algParams = AlgorithmParameters.getInstance("PBES2");
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   796
                } else {
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   797
                    algParams = AlgorithmParameters.getInstance("PBE");
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   798
                }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   799
                algParams.init(params.toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   800
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   801
        } catch (Exception e) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   802
           throw new IOException("parseAlgParameters failed: " +
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   803
                                 e.getMessage(), e);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   804
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   805
        return algParams;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   806
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   807
90ce3da70b43 Initial load
duke
parents:
diff changeset
   808
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   809
     * Generate PBE key
90ce3da70b43 Initial load
duke
parents:
diff changeset
   810
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   811
    private SecretKey getPBEKey(char[] password) throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   812
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   813
        SecretKey skey = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   814
90ce3da70b43 Initial load
duke
parents:
diff changeset
   815
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   816
            PBEKeySpec keySpec = new PBEKeySpec(password);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   817
            SecretKeyFactory skFac = SecretKeyFactory.getInstance("PBE");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   818
            skey = skFac.generateSecret(keySpec);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   819
            keySpec.clearPassword();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   820
        } catch (Exception e) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   821
           throw new IOException("getSecretKey failed: " +
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
   822
                                 e.getMessage(), e);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   823
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   824
        return skey;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   825
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   826
90ce3da70b43 Initial load
duke
parents:
diff changeset
   827
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   828
     * Encrypt private key using Password-based encryption (PBE)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   829
     * as defined in PKCS#5.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   830
     *
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   831
     * NOTE: By default, pbeWithSHAAnd3-KeyTripleDES-CBC algorithmID is
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   832
     *       used to derive the key and IV.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   833
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   834
     * @return encrypted private key encoded as EncryptedPrivateKeyInfo
90ce3da70b43 Initial load
duke
parents:
diff changeset
   835
     */
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   836
    private byte[] encryptPrivateKey(byte[] data,
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   837
        KeyStore.PasswordProtection passwordProtection)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   838
        throws IOException, NoSuchAlgorithmException, UnrecoverableKeyException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   839
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   840
        byte[] key = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   841
90ce3da70b43 Initial load
duke
parents:
diff changeset
   842
        try {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   843
            String algorithm;
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   844
            AlgorithmParameters algParams;
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   845
            AlgorithmId algid;
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   846
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   847
            // Initialize PBE algorithm and parameters
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   848
            algorithm = passwordProtection.getProtectionAlgorithm();
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   849
            if (algorithm != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   850
                AlgorithmParameterSpec algParamSpec =
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   851
                    passwordProtection.getProtectionParameters();
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   852
                if (algParamSpec != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   853
                    algParams = AlgorithmParameters.getInstance(algorithm);
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   854
                    algParams.init(algParamSpec);
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   855
                } else {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   856
                    algParams = getAlgorithmParameters(algorithm);
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   857
                }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   858
            } else {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   859
                // Check default key protection algorithm for PKCS12 keystores
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   860
                algorithm = AccessController.doPrivileged(
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   861
                    new PrivilegedAction<String>() {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   862
                        public String run() {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   863
                            String prop =
15299
879d8cfab8e6 8006813: Compilation error in PKCS12KeyStore.java
mullan
parents: 15298
diff changeset
   864
                                Security.getProperty(
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   865
                                    KEY_PROTECTION_ALGORITHM[0]);
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   866
                            if (prop == null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   867
                                prop = Security.getProperty(
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   868
                                    KEY_PROTECTION_ALGORITHM[1]);
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   869
                            }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   870
                            return prop;
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   871
                        }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   872
                    });
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   873
                if (algorithm == null || algorithm.isEmpty()) {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   874
                    algorithm = "PBEWithSHA1AndDESede";
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   875
                }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   876
                algParams = getAlgorithmParameters(algorithm);
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   877
            }
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   878
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   879
            ObjectIdentifier pbeOID = mapPBEAlgorithmToOID(algorithm);
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   880
            if (pbeOID == null) {
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   881
                    throw new IOException("PBE algorithm '" + algorithm +
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   882
                        " 'is not supported for key entry protection");
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   883
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   884
90ce3da70b43 Initial load
duke
parents:
diff changeset
   885
            // Use JCE
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   886
            SecretKey skey = getPBEKey(passwordProtection.getPassword());
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   887
            Cipher cipher = Cipher.getInstance(algorithm);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   888
            cipher.init(Cipher.ENCRYPT_MODE, skey, algParams);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   889
            byte[] encryptedKey = cipher.doFinal(data);
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   890
            algid = new AlgorithmId(pbeOID, cipher.getParameters());
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   891
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   892
            if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   893
                debug.println("  (Cipher algorithm: " + cipher.getAlgorithm() +
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   894
                    ")");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   895
            }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   896
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   897
            // wrap encrypted private key in EncryptedPrivateKeyInfo
90ce3da70b43 Initial load
duke
parents:
diff changeset
   898
            // as defined in PKCS#8
90ce3da70b43 Initial load
duke
parents:
diff changeset
   899
            EncryptedPrivateKeyInfo encrInfo =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   900
                new EncryptedPrivateKeyInfo(algid, encryptedKey);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   901
            key = encrInfo.getEncoded();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   902
        } catch (Exception e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   903
            UnrecoverableKeyException uke =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   904
                new UnrecoverableKeyException("Encrypt Private Key failed: "
90ce3da70b43 Initial load
duke
parents:
diff changeset
   905
                                                + e.getMessage());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   906
            uke.initCause(e);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   907
            throw uke;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   908
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   909
90ce3da70b43 Initial load
duke
parents:
diff changeset
   910
        return key;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   911
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   912
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   913
    /*
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   914
     * Map a PBE algorithm name onto its object identifier
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   915
     */
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   916
    private static ObjectIdentifier mapPBEAlgorithmToOID(String algorithm)
15301
215128369cab 8006855: PKCS12 test failures due to unsupported algorithm
vinnie
parents: 15299
diff changeset
   917
        throws NoSuchAlgorithmException {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   918
        // Check for PBES2 algorithms
25402
0c24d9aa8fb9 7065233: To interpret case-insensitive string locale independently
juh
parents: 19210
diff changeset
   919
        if (algorithm.toLowerCase(Locale.ENGLISH).startsWith("pbewithhmacsha")) {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   920
            return pbes2_OID;
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   921
        }
15301
215128369cab 8006855: PKCS12 test failures due to unsupported algorithm
vinnie
parents: 15299
diff changeset
   922
        return AlgorithmId.get(algorithm).getOID();
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   923
    }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   924
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   925
    /*
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   926
     * Map a PBE algorithm parameters onto its algorithm name
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   927
     */
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   928
    private static String mapPBEParamsToAlgorithm(ObjectIdentifier algorithm,
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   929
        AlgorithmParameters algParams) throws NoSuchAlgorithmException {
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   930
        // Check for PBES2 algorithms
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
   931
        if (algorithm.equals(pbes2_OID) && algParams != null) {
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   932
            return algParams.toString();
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   933
        }
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   934
        return algorithm.toString();
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   935
    }
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
   936
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   937
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   938
     * Assigns the given certificate to the given alias.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   939
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   940
     * <p>If the given alias already exists in this keystore and identifies a
90ce3da70b43 Initial load
duke
parents:
diff changeset
   941
     * <i>trusted certificate entry</i>, the certificate associated with it is
90ce3da70b43 Initial load
duke
parents:
diff changeset
   942
     * overridden by the given certificate.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   943
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   944
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   945
     * @param cert the certificate
90ce3da70b43 Initial load
duke
parents:
diff changeset
   946
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   947
     * @exception KeyStoreException if the given alias already exists and does
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   948
     * not identify a <i>trusted certificate entry</i>, or this operation fails
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   949
     * for some other reason.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   950
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   951
    public synchronized void engineSetCertificateEntry(String alias,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   952
        Certificate cert) throws KeyStoreException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   953
    {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   954
        setCertEntry(alias, cert, null);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   955
    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   956
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   957
    /*
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   958
     * Sets a trusted cert entry (with attributes, when present)
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   959
     */
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   960
    private void setCertEntry(String alias, Certificate cert,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   961
        Set<KeyStore.Entry.Attribute> attributes) throws KeyStoreException {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   962
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   963
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   964
        if (entry != null && entry instanceof KeyEntry) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   965
            throw new KeyStoreException("Cannot overwrite own certificate");
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   966
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   967
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   968
        CertEntry certEntry =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   969
            new CertEntry((X509Certificate) cert, null, alias, AnyUsage,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   970
                attributes);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   971
        certificateCount++;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   972
        entries.put(alias, certEntry);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   973
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   974
        if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   975
            debug.println("Setting a trusted certificate at alias '" + alias +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   976
                "'");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   977
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   978
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   979
90ce3da70b43 Initial load
duke
parents:
diff changeset
   980
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   981
     * Deletes the entry identified by the given alias from this keystore.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   982
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   983
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
   984
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   985
     * @exception KeyStoreException if the entry cannot be removed.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   986
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   987
    public synchronized void engineDeleteEntry(String alias)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   988
        throws KeyStoreException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   989
    {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   990
        if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   991
            debug.println("Removing entry at alias '" + alias + "'");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   992
        }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
   993
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   994
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   995
        if (entry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   996
            PrivateKeyEntry keyEntry = (PrivateKeyEntry) entry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   997
            if (keyEntry.chain != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   998
                certificateCount -= keyEntry.chain.length;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
   999
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1000
            privateKeyCount--;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1001
        } else if (entry instanceof CertEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1002
            certificateCount--;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1003
        } else if (entry instanceof SecretKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1004
            secretKeyCount--;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1005
        }
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
  1006
        entries.remove(alias.toLowerCase(Locale.ENGLISH));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1007
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1008
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1009
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1010
     * Lists all the alias names of this keystore.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1011
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1012
     * @return enumeration of the alias names
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1013
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1014
    public Enumeration<String> engineAliases() {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1015
        return Collections.enumeration(entries.keySet());
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1016
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1017
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1018
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1019
     * Checks if the given alias exists in this keystore.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1020
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1021
     * @param alias the alias name
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1022
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1023
     * @return true if the alias exists, false otherwise
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1024
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1025
    public boolean engineContainsAlias(String alias) {
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
  1026
        return entries.containsKey(alias.toLowerCase(Locale.ENGLISH));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1027
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1028
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1029
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1030
     * Retrieves the number of entries in this keystore.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1031
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1032
     * @return the number of entries in this keystore
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1033
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1034
    public int engineSize() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1035
        return entries.size();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1036
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1037
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1038
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1039
     * Returns true if the entry identified by the given alias is a
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1040
     * <i>key entry</i>, and false otherwise.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1041
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1042
     * @return true if the entry identified by the given alias is a
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1043
     * <i>key entry</i>, false otherwise.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1044
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1045
    public boolean engineIsKeyEntry(String alias) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1046
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1047
        if (entry != null && entry instanceof KeyEntry) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1048
            return true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1049
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1050
            return false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1051
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1052
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1053
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1054
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1055
     * Returns true if the entry identified by the given alias is a
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1056
     * <i>trusted certificate entry</i>, and false otherwise.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1057
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1058
     * @return true if the entry identified by the given alias is a
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1059
     * <i>trusted certificate entry</i>, false otherwise.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1060
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1061
    public boolean engineIsCertificateEntry(String alias) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1062
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1063
        if (entry != null && entry instanceof CertEntry &&
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1064
            ((CertEntry) entry).trustedKeyUsage != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1065
            return true;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1066
        } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1067
            return false;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1068
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1069
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1070
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1071
    /**
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1072
     * Determines if the keystore {@code Entry} for the specified
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1073
     * {@code alias} is an instance or subclass of the specified
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1074
     * {@code entryClass}.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1075
     *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1076
     * @param alias the alias name
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1077
     * @param entryClass the entry class
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1078
     *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1079
     * @return true if the keystore {@code Entry} for the specified
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1080
     *          {@code alias} is an instance or subclass of the
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1081
     *          specified {@code entryClass}, false otherwise
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1082
     *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1083
     * @since 1.5
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1084
     */
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1085
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1086
    public boolean
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1087
        engineEntryInstanceOf(String alias,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1088
                              Class<? extends KeyStore.Entry> entryClass)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1089
    {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1090
        if (entryClass == KeyStore.TrustedCertificateEntry.class) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1091
            return engineIsCertificateEntry(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1092
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1093
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1094
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1095
        if (entryClass == KeyStore.PrivateKeyEntry.class) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1096
            return (entry != null && entry instanceof PrivateKeyEntry);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1097
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1098
        if (entryClass == KeyStore.SecretKeyEntry.class) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1099
            return (entry != null && entry instanceof SecretKeyEntry);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1100
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1101
        return false;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1102
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1103
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1104
    /**
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1105
     * Returns the (alias) name of the first keystore entry whose certificate
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1106
     * matches the given certificate.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1107
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1108
     * <p>This method attempts to match the given certificate with each
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1109
     * keystore entry. If the entry being considered
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1110
     * is a <i>trusted certificate entry</i>, the given certificate is
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1111
     * compared to that entry's certificate. If the entry being considered is
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1112
     * a <i>key entry</i>, the given certificate is compared to the first
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1113
     * element of that entry's certificate chain (if a chain exists).
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1114
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1115
     * @param cert the certificate to match with.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1116
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1117
     * @return the (alias) name of the first entry with matching certificate,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1118
     * or null if no such entry exists in this keystore.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1119
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1120
    public String engineGetCertificateAlias(Certificate cert) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1121
        Certificate certElem = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1122
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1123
        for (Enumeration<String> e = engineAliases(); e.hasMoreElements(); ) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1124
            String alias = e.nextElement();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1125
            Entry entry = entries.get(alias);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1126
            if (entry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1127
                if (((PrivateKeyEntry) entry).chain != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1128
                    certElem = ((PrivateKeyEntry) entry).chain[0];
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1129
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1130
            } else if (entry instanceof CertEntry &&
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1131
                    ((CertEntry) entry).trustedKeyUsage != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1132
                certElem = ((CertEntry) entry).cert;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1133
            } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1134
                continue;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1135
            }
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1136
            if (certElem != null && certElem.equals(cert)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1137
                return alias;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1138
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1139
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1140
        return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1141
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1142
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1143
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1144
     * Stores this keystore to the given output stream, and protects its
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1145
     * integrity with the given password.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1146
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1147
     * @param stream the output stream to which this keystore is written.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1148
     * @param password the password to generate the keystore integrity check
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1149
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1150
     * @exception IOException if there was an I/O problem with data
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1151
     * @exception NoSuchAlgorithmException if the appropriate data integrity
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1152
     * algorithm could not be found
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1153
     * @exception CertificateException if any of the certificates included in
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1154
     * the keystore data could not be stored
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1155
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1156
    public synchronized void engineStore(OutputStream stream, char[] password)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1157
        throws IOException, NoSuchAlgorithmException, CertificateException
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1158
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1159
        // password is mandatory when storing
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1160
        if (password == null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1161
           throw new IllegalArgumentException("password can't be null");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1162
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1163
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1164
        // -- Create PFX
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1165
        DerOutputStream pfx = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1166
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1167
        // PFX version (always write the latest version)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1168
        DerOutputStream version = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1169
        version.putInteger(VERSION_3);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1170
        byte[] pfxVersion = version.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1171
        pfx.write(pfxVersion);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1172
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1173
        // -- Create AuthSafe
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1174
        DerOutputStream authSafe = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1175
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1176
        // -- Create ContentInfos
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1177
        DerOutputStream authSafeContentInfo = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1178
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1179
        // -- create safeContent Data ContentInfo
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1180
        if (privateKeyCount > 0 || secretKeyCount > 0) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1181
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1182
            if (debug != null) {
15538
02e547c0b530 8007483: attributes are ignored when loading keys from a PKCS12 keystore
vinnie
parents: 15308
diff changeset
  1183
                debug.println("Storing " + (privateKeyCount + secretKeyCount) +
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1184
                    " protected key(s) in a PKCS#7 data content-type");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1185
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1186
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1187
            byte[] safeContentData = createSafeContent();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1188
            ContentInfo dataContentInfo = new ContentInfo(safeContentData);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1189
            dataContentInfo.encode(authSafeContentInfo);
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1190
        }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1191
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1192
        // -- create EncryptedContentInfo
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1193
        if (certificateCount > 0) {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1194
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1195
            if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1196
                debug.println("Storing " + certificateCount +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1197
                    " certificate(s) in a PKCS#7 encryptedData content-type");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1198
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1199
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1200
            byte[] encrData = createEncryptedData(password);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1201
            ContentInfo encrContentInfo =
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1202
                new ContentInfo(ContentInfo.ENCRYPTED_DATA_OID,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1203
                                new DerValue(encrData));
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1204
            encrContentInfo.encode(authSafeContentInfo);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1205
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1206
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1207
        // wrap as SequenceOf ContentInfos
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1208
        DerOutputStream cInfo = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1209
        cInfo.write(DerValue.tag_SequenceOf, authSafeContentInfo);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1210
        byte[] authenticatedSafe = cInfo.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1211
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1212
        // Create Encapsulated ContentInfo
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1213
        ContentInfo contentInfo = new ContentInfo(authenticatedSafe);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1214
        contentInfo.encode(authSafe);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1215
        byte[] authSafeData = authSafe.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1216
        pfx.write(authSafeData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1217
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1218
        // -- MAC
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1219
        byte[] macData = calculateMac(password, authenticatedSafe);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1220
        pfx.write(macData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1221
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1222
        // write PFX to output stream
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1223
        DerOutputStream pfxout = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1224
        pfxout.write(DerValue.tag_Sequence, pfx);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1225
        byte[] pfxData = pfxout.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1226
        stream.write(pfxData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1227
        stream.flush();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1228
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1229
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1230
    /**
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1231
     * Gets a <code>KeyStore.Entry</code> for the specified alias
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1232
     * with the specified protection parameter.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1233
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1234
     * @param alias get the <code>KeyStore.Entry</code> for this alias
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1235
     * @param protParam the <code>ProtectionParameter</code>
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1236
     *          used to protect the <code>Entry</code>,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1237
     *          which may be <code>null</code>
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1238
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1239
     * @return the <code>KeyStore.Entry</code> for the specified alias,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1240
     *          or <code>null</code> if there is no such entry
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1241
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1242
     * @exception KeyStoreException if the operation failed
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1243
     * @exception NoSuchAlgorithmException if the algorithm for recovering the
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1244
     *          entry cannot be found
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1245
     * @exception UnrecoverableEntryException if the specified
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1246
     *          <code>protParam</code> were insufficient or invalid
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1247
     * @exception UnrecoverableKeyException if the entry is a
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1248
     *          <code>PrivateKeyEntry</code> or <code>SecretKeyEntry</code>
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1249
     *          and the specified <code>protParam</code> does not contain
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1250
     *          the information needed to recover the key (e.g. wrong password)
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1251
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1252
     * @since 1.5
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1253
     */
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1254
    @Override
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1255
    public KeyStore.Entry engineGetEntry(String alias,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1256
                        KeyStore.ProtectionParameter protParam)
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1257
                throws KeyStoreException, NoSuchAlgorithmException,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1258
                UnrecoverableEntryException {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1259
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1260
        if (!engineContainsAlias(alias)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1261
            return null;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1262
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1263
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1264
        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1265
        if (protParam == null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1266
            if (engineIsCertificateEntry(alias)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1267
                if (entry instanceof CertEntry &&
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1268
                    ((CertEntry) entry).trustedKeyUsage != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1269
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1270
                    if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1271
                        debug.println("Retrieved a trusted certificate at " +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1272
                            "alias '" + alias + "'");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1273
                    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1274
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1275
                    return new KeyStore.TrustedCertificateEntry(
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1276
                        ((CertEntry)entry).cert, getAttributes(entry));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1277
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1278
            } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1279
                throw new UnrecoverableKeyException
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1280
                        ("requested entry requires a password");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1281
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1282
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1283
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1284
        if (protParam instanceof KeyStore.PasswordProtection) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1285
            if (engineIsCertificateEntry(alias)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1286
                throw new UnsupportedOperationException
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1287
                    ("trusted certificate entries are not password-protected");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1288
            } else if (engineIsKeyEntry(alias)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1289
                KeyStore.PasswordProtection pp =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1290
                        (KeyStore.PasswordProtection)protParam;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1291
                char[] password = pp.getPassword();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1292
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1293
                Key key = engineGetKey(alias, password);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1294
                if (key instanceof PrivateKey) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1295
                    Certificate[] chain = engineGetCertificateChain(alias);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1296
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1297
                    return new KeyStore.PrivateKeyEntry((PrivateKey)key, chain,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1298
                        getAttributes(entry));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1299
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1300
                } else if (key instanceof SecretKey) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1301
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1302
                    return new KeyStore.SecretKeyEntry((SecretKey)key,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1303
                        getAttributes(entry));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1304
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1305
            } else if (!engineIsKeyEntry(alias)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1306
                throw new UnsupportedOperationException
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1307
                    ("untrusted certificate entries are not " +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1308
                        "password-protected");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1309
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1310
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1311
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1312
        throw new UnsupportedOperationException();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1313
    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1314
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1315
    /**
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1316
     * Saves a <code>KeyStore.Entry</code> under the specified alias.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1317
     * The specified protection parameter is used to protect the
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1318
     * <code>Entry</code>.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1319
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1320
     * <p> If an entry already exists for the specified alias,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1321
     * it is overridden.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1322
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1323
     * @param alias save the <code>KeyStore.Entry</code> under this alias
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1324
     * @param entry the <code>Entry</code> to save
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1325
     * @param protParam the <code>ProtectionParameter</code>
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1326
     *          used to protect the <code>Entry</code>,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1327
     *          which may be <code>null</code>
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1328
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1329
     * @exception KeyStoreException if this operation fails
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1330
     *
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1331
     * @since 1.5
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1332
     */
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1333
    @Override
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1334
    public synchronized void engineSetEntry(String alias, KeyStore.Entry entry,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1335
        KeyStore.ProtectionParameter protParam) throws KeyStoreException {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1336
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1337
        // get password
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1338
        if (protParam != null &&
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1339
            !(protParam instanceof KeyStore.PasswordProtection)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1340
            throw new KeyStoreException("unsupported protection parameter");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1341
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1342
        KeyStore.PasswordProtection pProtect = null;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1343
        if (protParam != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1344
            pProtect = (KeyStore.PasswordProtection)protParam;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1345
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1346
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1347
        // set entry
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1348
        if (entry instanceof KeyStore.TrustedCertificateEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1349
            if (protParam != null && pProtect.getPassword() != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1350
                // pre-1.5 style setCertificateEntry did not allow password
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1351
                throw new KeyStoreException
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1352
                    ("trusted certificate entries are not password-protected");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1353
            } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1354
                KeyStore.TrustedCertificateEntry tce =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1355
                        (KeyStore.TrustedCertificateEntry)entry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1356
                setCertEntry(alias, tce.getTrustedCertificate(),
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1357
                    tce.getAttributes());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1358
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1359
                return;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1360
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1361
        } else if (entry instanceof KeyStore.PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1362
            if (pProtect == null || pProtect.getPassword() == null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1363
                // pre-1.5 style setKeyEntry required password
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1364
                throw new KeyStoreException
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1365
                    ("non-null password required to create PrivateKeyEntry");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1366
            } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1367
                KeyStore.PrivateKeyEntry pke = (KeyStore.PrivateKeyEntry)entry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1368
                setKeyEntry(alias, pke.getPrivateKey(), pProtect,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1369
                    pke.getCertificateChain(), pke.getAttributes());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1370
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1371
                return;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1372
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1373
        } else if (entry instanceof KeyStore.SecretKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1374
            if (pProtect == null || pProtect.getPassword() == null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1375
                // pre-1.5 style setKeyEntry required password
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1376
                throw new KeyStoreException
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1377
                    ("non-null password required to create SecretKeyEntry");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1378
            } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1379
                KeyStore.SecretKeyEntry ske = (KeyStore.SecretKeyEntry)entry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1380
                setKeyEntry(alias, ske.getSecretKey(), pProtect,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1381
                    (Certificate[])null, ske.getAttributes());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1382
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1383
                return;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1384
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1385
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1386
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1387
        throw new KeyStoreException
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1388
                ("unsupported entry type: " + entry.getClass().getName());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1389
    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1390
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1391
    /*
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1392
     * Assemble the entry attributes
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1393
     */
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1394
    private Set<KeyStore.Entry.Attribute> getAttributes(Entry entry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1395
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1396
        if (entry.attributes == null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1397
            entry.attributes = new HashSet<>();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1398
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1399
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1400
        // friendlyName
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1401
        entry.attributes.add(new PKCS12Attribute(
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1402
            PKCS9FriendlyName_OID.toString(), entry.alias));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1403
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1404
        // localKeyID
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1405
        byte[] keyIdValue = entry.keyId;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1406
        if (keyIdValue != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1407
            entry.attributes.add(new PKCS12Attribute(
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1408
                PKCS9LocalKeyId_OID.toString(), Debug.toString(keyIdValue)));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1409
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1410
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1411
        // trustedKeyUsage
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1412
        if (entry instanceof CertEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1413
            ObjectIdentifier[] trustedKeyUsageValue =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1414
                ((CertEntry) entry).trustedKeyUsage;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1415
            if (trustedKeyUsageValue != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1416
                if (trustedKeyUsageValue.length == 1) { // omit brackets
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1417
                    entry.attributes.add(new PKCS12Attribute(
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1418
                        TrustedKeyUsage_OID.toString(),
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1419
                        trustedKeyUsageValue[0].toString()));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1420
                } else { // multi-valued
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1421
                    entry.attributes.add(new PKCS12Attribute(
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1422
                        TrustedKeyUsage_OID.toString(),
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1423
                        Arrays.toString(trustedKeyUsageValue)));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1424
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1425
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1426
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1427
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1428
        return entry.attributes;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1429
    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1430
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1431
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1432
     * Generate Hash.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1433
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1434
    private byte[] generateHash(byte[] data) throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1435
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1436
        byte[] digest = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1437
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1438
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1439
            MessageDigest md = MessageDigest.getInstance("SHA1");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1440
            md.update(data);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1441
            digest = md.digest();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1442
        } catch (Exception e) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
  1443
            throw new IOException("generateHash failed: " + e, e);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1444
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1445
        return digest;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1446
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1447
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1448
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1449
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1450
     * Calculate MAC using HMAC algorithm (required for password integrity)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1451
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1452
     * Hash-based MAC algorithm combines secret key with message digest to
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1453
     * create a message authentication code (MAC)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1454
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1455
    private byte[] calculateMac(char[] passwd, byte[] data)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1456
        throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1457
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1458
        byte[] mData = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1459
        String algName = "SHA1";
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1460
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1461
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1462
            // Generate a random salt.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1463
            byte[] salt = getSalt();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1464
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1465
            // generate MAC (MAC key is generated within JCE)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1466
            Mac m = Mac.getInstance("HmacPBESHA1");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1467
            PBEParameterSpec params =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1468
                        new PBEParameterSpec(salt, iterationCount);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1469
            SecretKey key = getPBEKey(passwd);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1470
            m.init(key, params);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1471
            m.update(data);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1472
            byte[] macResult = m.doFinal();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1473
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1474
            // encode as MacData
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1475
            MacData macData = new MacData(algName, macResult, salt,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1476
                                                iterationCount);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1477
            DerOutputStream bytes = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1478
            bytes.write(macData.getEncoded());
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1479
            mData = bytes.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1480
        } catch (Exception e) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
  1481
            throw new IOException("calculateMac failed: " + e, e);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1482
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1483
        return mData;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1484
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1485
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1486
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1487
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1488
     * Validate Certificate Chain
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1489
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1490
    private boolean validateChain(Certificate[] certChain)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1491
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1492
        for (int i = 0; i < certChain.length-1; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1493
            X500Principal issuerDN =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1494
                ((X509Certificate)certChain[i]).getIssuerX500Principal();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1495
            X500Principal subjectDN =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1496
                ((X509Certificate)certChain[i+1]).getSubjectX500Principal();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1497
            if (!(issuerDN.equals(subjectDN)))
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1498
                return false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1499
        }
29909
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  1500
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  1501
        // Check for loops in the chain. If there are repeated certs,
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  1502
        // the Set of certs in the chain will contain fewer certs than
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  1503
        // the chain
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  1504
        Set<Certificate> set = new HashSet<>(Arrays.asList(certChain));
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  1505
        return set.size() == certChain.length;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1506
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1507
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1508
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1509
    /*
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1510
     * Create PKCS#12 Attributes, friendlyName, localKeyId and trustedKeyUsage.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1511
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1512
     * Although attributes are optional, they could be required.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1513
     * For e.g. localKeyId attribute is required to match the
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1514
     * private key with the associated end-entity certificate.
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1515
     * The trustedKeyUsage attribute is used to denote a trusted certificate.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1516
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1517
     * PKCS8ShroudedKeyBags include unique localKeyID and friendlyName.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1518
     * CertBags may or may not include attributes depending on the type
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1519
     * of Certificate. In end-entity certificates, localKeyID should be
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1520
     * unique, and the corresponding private key should have the same
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1521
     * localKeyID. For trusted CA certs in the cert-chain, localKeyID
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1522
     * attribute is not required, hence most vendors don't include it.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1523
     * NSS/Netscape require it to be unique or null, where as IE/OpenSSL
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1524
     * ignore it.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1525
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1526
     * Here is a list of pkcs12 attribute values in CertBags.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1527
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1528
     * PKCS12 Attribute       NSS/Netscape    IE     OpenSSL    J2SE
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1529
     * --------------------------------------------------------------
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1530
     * LocalKeyId
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1531
     * (In EE cert only,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1532
     *  NULL in CA certs)      true          true     true      true
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1533
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1534
     * friendlyName            unique        same/    same/     unique
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1535
     *                                       unique   unique/
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1536
     *                                                null
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1537
     * trustedKeyUsage         -             -        -         true
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1538
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1539
     * Note: OpenSSL adds friendlyName for end-entity cert only, and
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1540
     * removes the localKeyID and friendlyName for CA certs.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1541
     * If the CertBag did not have a friendlyName, most vendors will
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1542
     * add it, and assign it to the DN of the cert.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1543
     */
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1544
    private byte[] getBagAttributes(String alias, byte[] keyId,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1545
        Set<KeyStore.Entry.Attribute> attributes) throws IOException {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1546
        return getBagAttributes(alias, keyId, null, attributes);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1547
    }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1548
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1549
    private byte[] getBagAttributes(String alias, byte[] keyId,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1550
        ObjectIdentifier[] trustedUsage,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1551
        Set<KeyStore.Entry.Attribute> attributes) throws IOException {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1552
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1553
        byte[] localKeyID = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1554
        byte[] friendlyName = null;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1555
        byte[] trustedKeyUsage = null;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1556
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1557
        // return null if all three attributes are null
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1558
        if ((alias == null) && (keyId == null) && (trustedKeyUsage == null)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1559
            return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1560
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1561
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1562
        // SafeBag Attributes
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1563
        DerOutputStream bagAttrs = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1564
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1565
        // Encode the friendlyname oid.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1566
        if (alias != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1567
            DerOutputStream bagAttr1 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1568
            bagAttr1.putOID(PKCS9FriendlyName_OID);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1569
            DerOutputStream bagAttrContent1 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1570
            DerOutputStream bagAttrValue1 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1571
            bagAttrContent1.putBMPString(alias);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1572
            bagAttr1.write(DerValue.tag_Set, bagAttrContent1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1573
            bagAttrValue1.write(DerValue.tag_Sequence, bagAttr1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1574
            friendlyName = bagAttrValue1.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1575
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1576
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1577
        // Encode the localkeyId oid.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1578
        if (keyId != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1579
            DerOutputStream bagAttr2 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1580
            bagAttr2.putOID(PKCS9LocalKeyId_OID);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1581
            DerOutputStream bagAttrContent2 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1582
            DerOutputStream bagAttrValue2 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1583
            bagAttrContent2.putOctetString(keyId);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1584
            bagAttr2.write(DerValue.tag_Set, bagAttrContent2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1585
            bagAttrValue2.write(DerValue.tag_Sequence, bagAttr2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1586
            localKeyID = bagAttrValue2.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1587
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1588
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1589
        // Encode the trustedKeyUsage oid.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1590
        if (trustedUsage != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1591
            DerOutputStream bagAttr3 = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1592
            bagAttr3.putOID(TrustedKeyUsage_OID);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1593
            DerOutputStream bagAttrContent3 = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1594
            DerOutputStream bagAttrValue3 = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1595
            for (ObjectIdentifier usage : trustedUsage) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1596
                bagAttrContent3.putOID(usage);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1597
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1598
            bagAttr3.write(DerValue.tag_Set, bagAttrContent3);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1599
            bagAttrValue3.write(DerValue.tag_Sequence, bagAttr3);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1600
            trustedKeyUsage = bagAttrValue3.toByteArray();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1601
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1602
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1603
        DerOutputStream attrs = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1604
        if (friendlyName != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1605
            attrs.write(friendlyName);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1606
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1607
        if (localKeyID != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1608
            attrs.write(localKeyID);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1609
        }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1610
        if (trustedKeyUsage != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1611
            attrs.write(trustedKeyUsage);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1612
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1613
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1614
        if (attributes != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1615
            for (KeyStore.Entry.Attribute attribute : attributes) {
15308
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
  1616
                String attributeName = attribute.getName();
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
  1617
                // skip friendlyName, localKeyId and trustedKeyUsage
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
  1618
                if (CORE_ATTRIBUTES[0].equals(attributeName) ||
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
  1619
                    CORE_ATTRIBUTES[1].equals(attributeName) ||
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
  1620
                    CORE_ATTRIBUTES[2].equals(attributeName)) {
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
  1621
                    continue;
55742a890b6c 8006951: Avoid storing duplicate PKCS12 attributes
vinnie
parents: 15307
diff changeset
  1622
                }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1623
                attrs.write(((PKCS12Attribute) attribute).getEncoded());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1624
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1625
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1626
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1627
        bagAttrs.write(DerValue.tag_Set, attrs);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1628
        return bagAttrs.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1629
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1630
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1631
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1632
     * Create EncryptedData content type, that contains EncryptedContentInfo.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1633
     * Includes certificates in individual SafeBags of type CertBag.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1634
     * Each CertBag may include pkcs12 attributes
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1635
     * (see comments in getBagAttributes)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1636
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1637
    private byte[] createEncryptedData(char[] password)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1638
        throws CertificateException, IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1639
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1640
        DerOutputStream out = new DerOutputStream();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1641
        for (Enumeration<String> e = engineAliases(); e.hasMoreElements(); ) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1642
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1643
            String alias = e.nextElement();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1644
            Entry entry = entries.get(alias);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1645
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1646
            // certificate chain
30368
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1647
            Certificate[] certs;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1648
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1649
            if (entry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1650
                PrivateKeyEntry keyEntry = (PrivateKeyEntry) entry;
30368
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1651
                if (keyEntry.chain != null) {
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1652
                    certs = keyEntry.chain;
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1653
                } else {
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1654
                    certs = new Certificate[0];
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1655
                }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1656
            } else if (entry instanceof CertEntry) {
30368
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1657
                certs = new Certificate[]{((CertEntry) entry).cert};
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1658
            } else {
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1659
                certs = new Certificate[0];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1660
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1661
30368
60f02327d396 8079129: NullPointerException in PKCS#12 Keystore in PKCS12KeyStore.java
vinnie
parents: 29909
diff changeset
  1662
            for (int i = 0; i < certs.length; i++) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1663
                // create SafeBag of Type CertBag
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1664
                DerOutputStream safeBag = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1665
                safeBag.putOID(CertBag_OID);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1666
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1667
                // create a CertBag
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1668
                DerOutputStream certBag = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1669
                certBag.putOID(PKCS9CertType_OID);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1670
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1671
                // write encoded certs in a context-specific tag
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1672
                DerOutputStream certValue = new DerOutputStream();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1673
                X509Certificate cert = (X509Certificate) certs[i];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1674
                certValue.putOctetString(cert.getEncoded());
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1675
                certBag.write(DerValue.createTag(DerValue.TAG_CONTEXT,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1676
                                        true, (byte) 0), certValue);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1677
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1678
                // wrap CertBag in a Sequence
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1679
                DerOutputStream certout = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1680
                certout.write(DerValue.tag_Sequence, certBag);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1681
                byte[] certBagValue = certout.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1682
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1683
                // Wrap the CertBag encoding in a context-specific tag.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1684
                DerOutputStream bagValue = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1685
                bagValue.write(certBagValue);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1686
                // write SafeBag Value
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1687
                safeBag.write(DerValue.createTag(DerValue.TAG_CONTEXT,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1688
                                true, (byte) 0), bagValue);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1689
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1690
                // write SafeBag Attributes
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1691
                // All Certs should have a unique friendlyName.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1692
                // This change is made to meet NSS requirements.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1693
                byte[] bagAttrs = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1694
                if (i == 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1695
                    // Only End-Entity Cert should have a localKeyId.
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1696
                    if (entry instanceof KeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1697
                        KeyEntry keyEntry = (KeyEntry) entry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1698
                        bagAttrs =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1699
                            getBagAttributes(keyEntry.alias, keyEntry.keyId,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1700
                                keyEntry.attributes);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1701
                    } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1702
                        CertEntry certEntry = (CertEntry) entry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1703
                        bagAttrs =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1704
                            getBagAttributes(certEntry.alias, certEntry.keyId,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1705
                                certEntry.trustedKeyUsage,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1706
                                certEntry.attributes);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1707
                    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1708
                } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1709
                    // Trusted root CA certs and Intermediate CA certs do not
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1710
                    // need to have a localKeyId, and hence localKeyId is null
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1711
                    // This change is made to meet NSS/Netscape requirements.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1712
                    // NSS pkcs12 library requires trusted CA certs in the
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1713
                    // certificate chain to have unique or null localKeyID.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1714
                    // However, IE/OpenSSL do not impose this restriction.
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  1715
                    bagAttrs = getBagAttributes(
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1716
                            cert.getSubjectX500Principal().getName(), null,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1717
                            entry.attributes);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1718
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1719
                if (bagAttrs != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1720
                    safeBag.write(bagAttrs);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1721
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1722
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1723
                // wrap as Sequence
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1724
                out.write(DerValue.tag_Sequence, safeBag);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1725
            } // for cert-chain
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1726
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1727
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1728
        // wrap as SequenceOf SafeBag
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1729
        DerOutputStream safeBagValue = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1730
        safeBagValue.write(DerValue.tag_SequenceOf, out);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1731
        byte[] safeBagData = safeBagValue.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1732
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1733
        // encrypt the content (EncryptedContentInfo)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1734
        byte[] encrContentInfo = encryptContent(safeBagData, password);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1735
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1736
        // -- SEQUENCE of EncryptedData
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1737
        DerOutputStream encrData = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1738
        DerOutputStream encrDataContent = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1739
        encrData.putInteger(0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1740
        encrData.write(encrContentInfo);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1741
        encrDataContent.write(DerValue.tag_Sequence, encrData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1742
        return encrDataContent.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1743
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1744
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1745
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1746
     * Create SafeContent Data content type.
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1747
     * Includes encrypted secret key in a SafeBag of type SecretBag.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1748
     * Includes encrypted private key in a SafeBag of type PKCS8ShroudedKeyBag.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1749
     * Each PKCS8ShroudedKeyBag includes pkcs12 attributes
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1750
     * (see comments in getBagAttributes)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1751
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1752
    private byte[] createSafeContent()
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1753
        throws CertificateException, IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1754
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1755
        DerOutputStream out = new DerOutputStream();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1756
        for (Enumeration<String> e = engineAliases(); e.hasMoreElements(); ) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1757
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1758
            String alias = e.nextElement();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1759
            Entry entry = entries.get(alias);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1760
            if (entry == null || (!(entry instanceof KeyEntry))) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1761
                continue;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1762
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1763
            DerOutputStream safeBag = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1764
            KeyEntry keyEntry = (KeyEntry) entry;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1765
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1766
            // DER encode the private key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1767
            if (keyEntry instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1768
                // Create SafeBag of type pkcs8ShroudedKeyBag
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1769
                safeBag.putOID(PKCS8ShroudedKeyBag_OID);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1770
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1771
                // get the encrypted private key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1772
                byte[] encrBytes = ((PrivateKeyEntry)keyEntry).protectedPrivKey;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1773
                EncryptedPrivateKeyInfo encrInfo = null;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1774
                try {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1775
                    encrInfo = new EncryptedPrivateKeyInfo(encrBytes);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1776
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1777
                } catch (IOException ioe) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1778
                    throw new IOException("Private key not stored as "
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1779
                            + "PKCS#8 EncryptedPrivateKeyInfo"
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1780
                            + ioe.getMessage());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1781
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1782
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1783
                // Wrap the EncryptedPrivateKeyInfo in a context-specific tag.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1784
                DerOutputStream bagValue = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1785
                bagValue.write(encrInfo.getEncoded());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1786
                safeBag.write(DerValue.createTag(DerValue.TAG_CONTEXT,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1787
                                true, (byte) 0), bagValue);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1788
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1789
            // DER encode the secret key
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1790
            } else if (keyEntry instanceof SecretKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1791
                // Create SafeBag of type SecretBag
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1792
                safeBag.putOID(SecretBag_OID);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1793
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1794
                // Create a SecretBag
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1795
                DerOutputStream secretBag = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1796
                secretBag.putOID(PKCS8ShroudedKeyBag_OID);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1797
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1798
                // Write secret key in a context-specific tag
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1799
                DerOutputStream secretKeyValue = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1800
                secretKeyValue.putOctetString(
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1801
                    ((SecretKeyEntry) keyEntry).protectedSecretKey);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1802
                secretBag.write(DerValue.createTag(DerValue.TAG_CONTEXT,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1803
                                        true, (byte) 0), secretKeyValue);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1804
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1805
                // Wrap SecretBag in a Sequence
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1806
                DerOutputStream secretBagSeq = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1807
                secretBagSeq.write(DerValue.tag_Sequence, secretBag);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1808
                byte[] secretBagValue = secretBagSeq.toByteArray();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1809
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1810
                // Wrap the secret bag in a context-specific tag.
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1811
                DerOutputStream bagValue = new DerOutputStream();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1812
                bagValue.write(secretBagValue);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1813
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1814
                // Write SafeBag value
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1815
                safeBag.write(DerValue.createTag(DerValue.TAG_CONTEXT,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1816
                                    true, (byte) 0), bagValue);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1817
            } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1818
                continue; // skip this entry
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1819
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1820
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1821
            // write SafeBag Attributes
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1822
            byte[] bagAttrs =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1823
                getBagAttributes(alias, entry.keyId, entry.attributes);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1824
            safeBag.write(bagAttrs);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1825
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1826
            // wrap as Sequence
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1827
            out.write(DerValue.tag_Sequence, safeBag);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1828
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1829
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1830
        // wrap as Sequence
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1831
        DerOutputStream safeBagValue = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1832
        safeBagValue.write(DerValue.tag_Sequence, out);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1833
        return safeBagValue.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1834
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1835
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1836
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1837
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1838
     * Encrypt the contents using Password-based (PBE) encryption
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1839
     * as defined in PKCS #5.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1840
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1841
     * NOTE: Currently pbeWithSHAAnd40BiteRC2-CBC algorithmID is used
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1842
     *       to derive the key and IV.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1843
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1844
     * @return encrypted contents encoded as EncryptedContentInfo
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1845
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1846
    private byte[] encryptContent(byte[] data, char[] password)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1847
        throws IOException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1848
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1849
        byte[] encryptedData = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1850
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1851
        // create AlgorithmParameters
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1852
        AlgorithmParameters algParams =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1853
                getAlgorithmParameters("PBEWithSHA1AndRC2_40");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1854
        DerOutputStream bytes = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1855
        AlgorithmId algId =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1856
                new AlgorithmId(pbeWithSHAAnd40BitRC2CBC_OID, algParams);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1857
        algId.encode(bytes);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1858
        byte[] encodedAlgId = bytes.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1859
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1860
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1861
            // Use JCE
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1862
            SecretKey skey = getPBEKey(password);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1863
            Cipher cipher = Cipher.getInstance("PBEWithSHA1AndRC2_40");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1864
            cipher.init(Cipher.ENCRYPT_MODE, skey, algParams);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1865
            encryptedData = cipher.doFinal(data);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1866
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1867
            if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1868
                debug.println("  (Cipher algorithm: " + cipher.getAlgorithm() +
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1869
                    ")");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1870
            }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1871
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1872
        } catch (Exception e) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
  1873
            throw new IOException("Failed to encrypt" +
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
  1874
                    " safe contents entry: " + e, e);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1875
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1876
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1877
        // create EncryptedContentInfo
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1878
        DerOutputStream bytes2 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1879
        bytes2.putOID(ContentInfo.DATA_OID);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1880
        bytes2.write(encodedAlgId);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1881
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1882
        // Wrap encrypted data in a context-specific tag.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1883
        DerOutputStream tmpout2 = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1884
        tmpout2.putOctetString(encryptedData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1885
        bytes2.writeImplicit(DerValue.createTag(DerValue.TAG_CONTEXT,
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1886
                                        false, (byte)0), tmpout2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1887
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1888
        // wrap EncryptedContentInfo in a Sequence
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1889
        DerOutputStream out = new DerOutputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1890
        out.write(DerValue.tag_Sequence, bytes2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1891
        return out.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1892
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1893
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1894
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1895
     * Loads the keystore from the given input stream.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1896
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1897
     * <p>If a password is given, it is used to check the integrity of the
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1898
     * keystore data. Otherwise, the integrity of the keystore is not checked.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1899
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1900
     * @param stream the input stream from which the keystore is loaded
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1901
     * @param password the (optional) password used to check the integrity of
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1902
     * the keystore.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1903
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1904
     * @exception IOException if there is an I/O or format problem with the
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1905
     * keystore data
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1906
     * @exception NoSuchAlgorithmException if the algorithm used to check
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1907
     * the integrity of the keystore cannot be found
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1908
     * @exception CertificateException if any of the certificates in the
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1909
     * keystore could not be loaded
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1910
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1911
    public synchronized void engineLoad(InputStream stream, char[] password)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1912
        throws IOException, NoSuchAlgorithmException, CertificateException
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1913
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1914
        DataInputStream dis;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1915
        CertificateFactory cf = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1916
        ByteArrayInputStream bais = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1917
        byte[] encoded = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1918
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1919
        if (stream == null)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1920
           return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1921
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1922
        // reset the counter
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1923
        counter = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1924
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1925
        DerValue val = new DerValue(stream);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1926
        DerInputStream s = val.toDerInputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1927
        int version = s.getInteger();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1928
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1929
        if (version != VERSION_3) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1930
           throw new IOException("PKCS12 keystore not in version 3 format");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1931
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1932
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1933
        entries.clear();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1934
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1935
        /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1936
         * Read the authSafe.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1937
         */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1938
        byte[] authSafeData;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1939
        ContentInfo authSafe = new ContentInfo(s);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1940
        ObjectIdentifier contentType = authSafe.getContentType();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1941
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  1942
        if (contentType.equals(ContentInfo.DATA_OID)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1943
           authSafeData = authSafe.getData();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1944
        } else /* signed data */ {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1945
           throw new IOException("public key protected PKCS12 not supported");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1946
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1947
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1948
        DerInputStream as = new DerInputStream(authSafeData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1949
        DerValue[] safeContentsArray = as.getSequence(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1950
        int count = safeContentsArray.length;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1951
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1952
        // reset the counters at the start
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1953
        privateKeyCount = 0;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1954
        secretKeyCount = 0;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  1955
        certificateCount = 0;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1956
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1957
        /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1958
         * Spin over the ContentInfos.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1959
         */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1960
        for (int i = 0; i < count; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1961
            byte[] safeContentsData;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1962
            ContentInfo safeContents;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1963
            DerInputStream sci;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1964
            byte[] eAlgId = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1965
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1966
            sci = new DerInputStream(safeContentsArray[i].toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1967
            safeContents = new ContentInfo(sci);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1968
            contentType = safeContents.getContentType();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1969
            safeContentsData = null;
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  1970
            if (contentType.equals(ContentInfo.DATA_OID)) {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1971
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1972
                if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1973
                    debug.println("Loading PKCS#7 data content-type");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1974
                }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1975
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1976
                safeContentsData = safeContents.getData();
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  1977
            } else if (contentType.equals(ContentInfo.ENCRYPTED_DATA_OID)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1978
                if (password == null) {
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1979
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1980
                    if (debug != null) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1981
                        debug.println("Warning: skipping PKCS#7 encryptedData" +
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1982
                            " content-type - no password was supplied");
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1983
                    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  1984
                    continue;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1985
                }
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1986
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1987
                if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1988
                    debug.println("Loading PKCS#7 encryptedData content-type");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1989
                }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  1990
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1991
                DerInputStream edi =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1992
                                safeContents.getContent().toDerInputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1993
                int edVersion = edi.getInteger();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1994
                DerValue[] seq = edi.getSequence(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1995
                ObjectIdentifier edContentType = seq[0].getOID();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1996
                eAlgId = seq[1].toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1997
                if (!seq[2].isContextSpecific((byte)0)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1998
                   throw new IOException("encrypted content not present!");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  1999
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2000
                byte newTag = DerValue.tag_OctetString;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2001
                if (seq[2].isConstructed())
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2002
                   newTag |= 0x20;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2003
                seq[2].resetTag(newTag);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2004
                safeContentsData = seq[2].getOctetString();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2005
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2006
                // parse Algorithm parameters
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2007
                DerInputStream in = seq[1].toDerInputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2008
                ObjectIdentifier algOid = in.getOID();
15661
282a9cfb26ca 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore
vinnie
parents: 15538
diff changeset
  2009
                AlgorithmParameters algParams = parseAlgParameters(algOid, in);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2010
11835
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2011
                while (true) {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2012
                    try {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2013
                        // Use JCE
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2014
                        SecretKey skey = getPBEKey(password);
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2015
                        Cipher cipher = Cipher.getInstance(algOid.toString());
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2016
                        cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2017
                        safeContentsData = cipher.doFinal(safeContentsData);
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2018
                        break;
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2019
                    } catch (Exception e) {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2020
                        if (password.length == 0) {
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2021
                            // Retry using an empty password
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2022
                            // without a NULL terminator.
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2023
                            password = new char[1];
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2024
                            continue;
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2025
                        }
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2026
                        throw new IOException("keystore password was incorrect",
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2027
                            new UnrecoverableKeyException(
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2028
                                "failed to decrypt safe contents entry: " + e));
11835
c9e7cfc908b3 6879539: enable empty password support for pkcs12 keystore
weijun
parents: 10369
diff changeset
  2029
                    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2030
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2031
            } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2032
                throw new IOException("public key protected PKCS12" +
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2033
                                        " not supported");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2034
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2035
            DerInputStream sc = new DerInputStream(safeContentsData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2036
            loadSafeContents(sc, password);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2037
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2038
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2039
        // The MacData is optional.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2040
        if (password != null && s.available() > 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2041
           MacData macData = new MacData(s);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2042
           try {
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
  2043
                String algName =
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
  2044
                        macData.getDigestAlgName().toUpperCase(Locale.ENGLISH);
13361
bda5c2354fc6 7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes
weijun
parents: 11835
diff changeset
  2045
bda5c2354fc6 7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes
weijun
parents: 11835
diff changeset
  2046
                // Change SHA-1 to SHA1
bda5c2354fc6 7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes
weijun
parents: 11835
diff changeset
  2047
                algName = algName.replace("-", "");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2048
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2049
                // generate MAC (MAC key is created within JCE)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2050
                Mac m = Mac.getInstance("HmacPBE" + algName);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2051
                PBEParameterSpec params =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2052
                        new PBEParameterSpec(macData.getSalt(),
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2053
                                        macData.getIterations());
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2054
                SecretKey key = getPBEKey(password);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2055
                m.init(key, params);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2056
                m.update(authSafeData);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2057
                byte[] macResult = m.doFinal();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2058
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2059
                if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2060
                    debug.println("Checking keystore integrity " +
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2061
                        "(MAC algorithm: " + m.getAlgorithm() + ")");
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2062
                }
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2063
31695
4d10942c9a7b 8074865: General crypto resilience changes
valeriep
parents: 31538
diff changeset
  2064
                if (!MessageDigest.isEqual(macData.getDigest(), macResult)) {
32634
614f8e5859aa 8134232: KeyStore.load() throws an IOException with a wrong cause in case of wrong password
asmotrak
parents: 31695
diff changeset
  2065
                   throw new UnrecoverableKeyException("Failed PKCS12" +
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2066
                                        " integrity checking");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2067
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2068
           } catch (Exception e) {
10336
0bb1999251f8 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
jjg
parents: 5973
diff changeset
  2069
                throw new IOException("Integrity check failed: " + e, e);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2070
           }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2071
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2072
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2073
        /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2074
         * Match up private keys with certificate chains.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2075
         */
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2076
        PrivateKeyEntry[] list =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2077
            keyList.toArray(new PrivateKeyEntry[keyList.size()]);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2078
        for (int m = 0; m < list.length; m++) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2079
            PrivateKeyEntry entry = list[m];
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2080
            if (entry.keyId != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2081
                ArrayList<X509Certificate> chain =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2082
                                new ArrayList<X509Certificate>();
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2083
                X509Certificate cert = findMatchedCertificate(entry);
29909
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2084
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2085
                mainloop:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2086
                while (cert != null) {
29909
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2087
                    // Check for loops in the certificate chain
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2088
                    if (!chain.isEmpty()) {
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2089
                        for (X509Certificate chainCert : chain) {
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2090
                            if (cert.equals(chainCert)) {
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2091
                                if (debug != null) {
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2092
                                    debug.println("Loop detected in " +
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2093
                                        "certificate chain. Skip adding " +
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2094
                                        "repeated cert to chain. Subject: " +
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2095
                                        cert.getSubjectX500Principal()
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2096
                                            .toString());
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2097
                                }
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2098
                                break mainloop;
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2099
                            }
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2100
                        }
388fe481deeb 8066479: Better certificate chain validation
juh
parents: 28243
diff changeset
  2101
                    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2102
                    chain.add(cert);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2103
                    X500Principal issuerDN = cert.getIssuerX500Principal();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2104
                    if (issuerDN.equals(cert.getSubjectX500Principal())) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2105
                        break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2106
                    }
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2107
                    cert = certsMap.get(issuerDN);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2108
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2109
                /* Update existing KeyEntry in entries table */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2110
                if (chain.size() > 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2111
                    entry.chain = chain.toArray(new Certificate[chain.size()]);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2112
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2113
        }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2114
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2115
        if (debug != null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2116
            if (privateKeyCount > 0) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2117
                debug.println("Loaded " + privateKeyCount +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2118
                    " protected private key(s)");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2119
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2120
            if (secretKeyCount > 0) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2121
                debug.println("Loaded " + secretKeyCount +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2122
                    " protected secret key(s)");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2123
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2124
            if (certificateCount > 0) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2125
                debug.println("Loaded " + certificateCount +
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2126
                    " certificate(s)");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2127
            }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2128
        }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2129
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2130
        certEntries.clear();
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2131
        certsMap.clear();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2132
        keyList.clear();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2133
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2134
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2135
    /**
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2136
     * Locates a matched CertEntry from certEntries, and returns its cert.
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2137
     * @param entry the KeyEntry to match
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2138
     * @return a certificate, null if not found
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2139
     */
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2140
    private X509Certificate findMatchedCertificate(PrivateKeyEntry entry) {
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2141
        CertEntry keyIdMatch = null;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2142
        CertEntry aliasMatch = null;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2143
        for (CertEntry ce: certEntries) {
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2144
            if (Arrays.equals(entry.keyId, ce.keyId)) {
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2145
                keyIdMatch = ce;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2146
                if (entry.alias.equalsIgnoreCase(ce.alias)) {
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2147
                    // Full match!
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2148
                    return ce.cert;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2149
                }
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2150
            } else if (entry.alias.equalsIgnoreCase(ce.alias)) {
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2151
                aliasMatch = ce;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2152
            }
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2153
        }
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2154
        // keyId match first, for compatibility
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2155
        if (keyIdMatch != null) return keyIdMatch.cert;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2156
        else if (aliasMatch != null) return aliasMatch.cert;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2157
        else return null;
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2158
    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2159
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2160
    private void loadSafeContents(DerInputStream stream, char[] password)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2161
        throws IOException, NoSuchAlgorithmException, CertificateException
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2162
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2163
        DerValue[] safeBags = stream.getSequence(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2164
        int count = safeBags.length;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2165
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2166
        /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2167
         * Spin over the SafeBags.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2168
         */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2169
        for (int i = 0; i < count; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2170
            ObjectIdentifier bagId;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2171
            DerInputStream sbi;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2172
            DerValue bagValue;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2173
            Object bagItem = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2174
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2175
            sbi = safeBags[i].toDerInputStream();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2176
            bagId = sbi.getOID();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2177
            bagValue = sbi.getDerValue();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2178
            if (!bagValue.isContextSpecific((byte)0)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2179
                throw new IOException("unsupported PKCS12 bag value type "
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2180
                                        + bagValue.tag);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2181
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2182
            bagValue = bagValue.data.getDerValue();
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  2183
            if (bagId.equals(PKCS8ShroudedKeyBag_OID)) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2184
                PrivateKeyEntry kEntry = new PrivateKeyEntry();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2185
                kEntry.protectedPrivKey = bagValue.toByteArray();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2186
                bagItem = kEntry;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2187
                privateKeyCount++;
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  2188
            } else if (bagId.equals(CertBag_OID)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2189
                DerInputStream cs = new DerInputStream(bagValue.toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2190
                DerValue[] certValues = cs.getSequence(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2191
                ObjectIdentifier certId = certValues[0].getOID();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2192
                if (!certValues[1].isContextSpecific((byte)0)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2193
                    throw new IOException("unsupported PKCS12 cert value type "
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2194
                                        + certValues[1].tag);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2195
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2196
                DerValue certValue = certValues[1].data.getDerValue();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2197
                CertificateFactory cf = CertificateFactory.getInstance("X509");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2198
                X509Certificate cert;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2199
                cert = (X509Certificate)cf.generateCertificate
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2200
                        (new ByteArrayInputStream(certValue.getOctetString()));
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2201
                bagItem = cert;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2202
                certificateCount++;
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  2203
            } else if (bagId.equals(SecretBag_OID)) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2204
                DerInputStream ss = new DerInputStream(bagValue.toByteArray());
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2205
                DerValue[] secretValues = ss.getSequence(2);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2206
                ObjectIdentifier secretId = secretValues[0].getOID();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2207
                if (!secretValues[1].isContextSpecific((byte)0)) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2208
                    throw new IOException(
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2209
                        "unsupported PKCS12 secret value type "
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2210
                                        + secretValues[1].tag);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2211
                }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2212
                DerValue secretValue = secretValues[1].data.getDerValue();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2213
                SecretKeyEntry kEntry = new SecretKeyEntry();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2214
                kEntry.protectedSecretKey = secretValue.getOctetString();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2215
                bagItem = kEntry;
15538
02e547c0b530 8007483: attributes are ignored when loading keys from a PKCS12 keystore
vinnie
parents: 15308
diff changeset
  2216
                secretKeyCount++;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2217
            } else {
15297
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2218
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2219
                if (debug != null) {
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2220
                    debug.println("Unsupported PKCS12 bag type: " + bagId);
eb3d7b36b4c4 8006591: Protect keystore entries using stronger PBE algorithms
vinnie
parents: 14342
diff changeset
  2221
                }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2222
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2223
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2224
            DerValue[] attrSet;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2225
            try {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2226
                attrSet = sbi.getSet(3);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2227
            } catch (IOException e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2228
                // entry does not have attributes
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2229
                // Note: CA certs can have no attributes
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2230
                // OpenSSL generates pkcs12 with no attr for CA certs.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2231
                attrSet = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2232
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2233
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2234
            String alias = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2235
            byte[] keyId = null;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2236
            ObjectIdentifier[] trustedKeyUsage = null;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2237
            Set<PKCS12Attribute> attributes = new HashSet<>();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2238
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2239
            if (attrSet != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2240
                for (int j = 0; j < attrSet.length; j++) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2241
                    byte[] encoded = attrSet[j].toByteArray();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2242
                    DerInputStream as = new DerInputStream(encoded);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2243
                    DerValue[] attrSeq = as.getSequence(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2244
                    ObjectIdentifier attrId = attrSeq[0].getOID();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2245
                    DerInputStream vs =
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2246
                        new DerInputStream(attrSeq[1].toByteArray());
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2247
                    DerValue[] valSet;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2248
                    try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2249
                        valSet = vs.getSet(1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2250
                    } catch (IOException e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2251
                        throw new IOException("Attribute " + attrId +
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2252
                                " should have a value " + e.getMessage());
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2253
                    }
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  2254
                    if (attrId.equals(PKCS9FriendlyName_OID)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2255
                        alias = valSet[0].getBMPString();
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  2256
                    } else if (attrId.equals(PKCS9LocalKeyId_OID)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2257
                        keyId = valSet[0].getOctetString();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2258
                    } else if
31426
9cd672654f97 8022444: Remove sun.security.util.ObjectIdentifier.equals(ObjectIdentifier other) method
juh
parents: 30368
diff changeset
  2259
                        (attrId.equals(TrustedKeyUsage_OID)) {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2260
                        trustedKeyUsage = new ObjectIdentifier[valSet.length];
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2261
                        for (int k = 0; k < valSet.length; k++) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2262
                            trustedKeyUsage[k] = valSet[k].getOID();
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2263
                        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2264
                    } else {
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2265
                        attributes.add(new PKCS12Attribute(encoded));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2266
                    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2267
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2268
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2269
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2270
            /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2271
             * As per PKCS12 v1.0 friendlyname (alias) and localKeyId (keyId)
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2272
             * are optional PKCS12 bagAttributes. But entries in the keyStore
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2273
             * are identified by their alias. Hence we need to have an
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2274
             * Unfriendlyname in the alias, if alias is null. The keyId
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2275
             * attribute is required to match the private key with the
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2276
             * certificate. If we get a bagItem of type KeyEntry with a
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2277
             * null keyId, we should skip it entirely.
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2278
             */
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2279
            if (bagItem instanceof KeyEntry) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2280
                KeyEntry entry = (KeyEntry)bagItem;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2281
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2282
                if (bagItem instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2283
                    if (keyId == null) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2284
                       // Insert a localKeyID for the privateKey
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2285
                       // Note: This is a workaround to allow null localKeyID
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2286
                       // attribute in pkcs12 with one private key entry and
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2287
                       // associated cert-chain
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2288
                       if (privateKeyCount == 1) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2289
                            keyId = "01".getBytes("UTF8");
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2290
                       } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2291
                            continue;
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2292
                       }
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2293
                    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2294
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2295
                entry.keyId = keyId;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2296
                // restore date if it exists
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2297
                String keyIdStr = new String(keyId, "UTF8");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2298
                Date date = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2299
                if (keyIdStr.startsWith("Time ")) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2300
                    try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2301
                        date = new Date(
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2302
                                Long.parseLong(keyIdStr.substring(5)));
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2303
                    } catch (Exception e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2304
                        date = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2305
                    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2306
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2307
                if (date == null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2308
                    date = new Date();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2309
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2310
                entry.date = date;
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2311
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2312
                if (bagItem instanceof PrivateKeyEntry) {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2313
                    keyList.add((PrivateKeyEntry) entry);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2314
                }
15538
02e547c0b530 8007483: attributes are ignored when loading keys from a PKCS12 keystore
vinnie
parents: 15308
diff changeset
  2315
                if (entry.attributes == null) {
02e547c0b530 8007483: attributes are ignored when loading keys from a PKCS12 keystore
vinnie
parents: 15308
diff changeset
  2316
                    entry.attributes = new HashSet<>();
02e547c0b530 8007483: attributes are ignored when loading keys from a PKCS12 keystore
vinnie
parents: 15308
diff changeset
  2317
                }
02e547c0b530 8007483: attributes are ignored when loading keys from a PKCS12 keystore
vinnie
parents: 15308
diff changeset
  2318
                entry.attributes.addAll(attributes);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2319
                if (alias == null) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2320
                   alias = getUnfriendlyName();
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2321
                }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2322
                entry.alias = alias;
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10336
diff changeset
  2323
                entries.put(alias.toLowerCase(Locale.ENGLISH), entry);
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2324
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2325
            } else if (bagItem instanceof X509Certificate) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2326
                X509Certificate cert = (X509Certificate)bagItem;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2327
                // Insert a localKeyID for the corresponding cert
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2328
                // Note: This is a workaround to allow null localKeyID
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2329
                // attribute in pkcs12 with one private key entry and
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2330
                // associated cert-chain
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2331
                if ((keyId == null) && (privateKeyCount == 1)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2332
                    // insert localKeyID only for EE cert or self-signed cert
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2333
                    if (i == 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2334
                        keyId = "01".getBytes("UTF8");
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2335
                    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2336
                }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2337
                // Trusted certificate
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2338
                if (trustedKeyUsage != null) {
15307
6c19bd915338 8006946: PKCS12 test failure due to incorrect alias name
vinnie
parents: 15301
diff changeset
  2339
                    if (alias == null) {
6c19bd915338 8006946: PKCS12 test failure due to incorrect alias name
vinnie
parents: 15301
diff changeset
  2340
                        alias = getUnfriendlyName();
6c19bd915338 8006946: PKCS12 test failure due to incorrect alias name
vinnie
parents: 15301
diff changeset
  2341
                    }
15298
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2342
                    CertEntry certEntry =
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2343
                        new CertEntry(cert, keyId, alias, trustedKeyUsage,
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2344
                            attributes);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2345
                    entries.put(alias.toLowerCase(Locale.ENGLISH), certEntry);
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2346
                } else {
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2347
                    certEntries.add(new CertEntry(cert, keyId, alias));
06867bfe82ac 8005408: KeyStore API enhancements
vinnie
parents: 15297
diff changeset
  2348
                }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2349
                X500Principal subjectDN = cert.getSubjectX500Principal();
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2350
                if (subjectDN != null) {
5973
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2351
                    if (!certsMap.containsKey(subjectDN)) {
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2352
                        certsMap.put(subjectDN, cert);
b48e1702532e 6958026: Problem with PKCS12 keystore
weijun
parents: 5506
diff changeset
  2353
                    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2354
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2355
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2356
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2357
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2358
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2359
    private String getUnfriendlyName() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2360
        counter++;
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2361
        return (String.valueOf(counter));
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2362
    }
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2363
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2364
    /*
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2365
     * PKCS12 permitted first 24 bytes:
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2366
     *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2367
     * 30 82 -- -- 02 01 03 30 82 -- -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0 8-
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2368
     * 30 -- 02 01 03 30 -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0 -- 04 -- -- --
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2369
     * 30 81 -- 02 01 03 30 81 -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0 81 -- 04
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2370
     * 30 82 -- -- 02 01 03 30 81 -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0 81 --
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2371
     * 30 83 -- -- -- 02 01 03 30 82 -- -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2372
     * 30 83 -- -- -- 02 01 03 30 83 -- -- -- 06 09 2A 86 48 86 F7 0D 01 07 01
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2373
     * 30 84 -- -- -- -- 02 01 03 30 83 -- -- -- 06 09 2A 86 48 86 F7 0D 01 07
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2374
     * 30 84 -- -- -- -- 02 01 03 30 84 -- -- -- -- 06 09 2A 86 48 86 F7 0D 01
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2375
     */
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2376
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2377
    private static final long[][] PKCS12_HEADER_PATTERNS = {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2378
        { 0x3082000002010330L, 0x82000006092A8648L, 0x86F70D010701A080L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2379
        { 0x3000020103300006L, 0x092A864886F70D01L, 0x0701A00004000000L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2380
        { 0x3081000201033081L, 0x0006092A864886F7L, 0x0D010701A0810004L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2381
        { 0x3082000002010330L, 0x810006092A864886L, 0xF70D010701A08100L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2382
        { 0x3083000000020103L, 0x3082000006092A86L, 0x4886F70D010701A0L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2383
        { 0x3083000000020103L, 0x308200000006092AL, 0x864886F70D010701L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2384
        { 0x3084000000000201L, 0x0330820000000609L, 0x2A864886F70D0107L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2385
        { 0x3084000000000201L, 0x0330820000000006L, 0x092A864886F70D01L }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2386
    };
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2387
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2388
    private static final long[][] PKCS12_HEADER_MASKS = {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2389
        { 0xFFFF0000FFFFFFFFL, 0xFF0000FFFFFFFFFFL, 0xFFFFFFFFFFFFFFF0L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2390
        { 0xFF00FFFFFFFF00FFL, 0xFFFFFFFFFFFFFFFFL, 0xFFFFFF00FF000000L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2391
        { 0xFFFF00FFFFFFFFFFL, 0x00FFFFFFFFFFFFFFL, 0xFFFFFFFFFFFF00FFL },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2392
        { 0xFFFF0000FFFFFFFFL, 0xFF00FFFFFFFFFFFFL, 0xFFFFFFFFFFFFFF00L },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2393
        { 0xFFFF000000FFFFFFL, 0xFFFF0000FFFFFFFFL, 0xFFFFFFFFFFFFFFFFL },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2394
        { 0xFFFF000000FFFFFFL, 0xFFFF000000FFFFFFL, 0xFFFFFFFFFFFFFFFFL },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2395
        { 0xFFFF00000000FFFFL, 0xFFFFFF000000FFFFL, 0xFFFFFFFFFFFFFFFFL },
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2396
        { 0xFFFF00000000FFFFL, 0xFFFFFF00000000FFL, 0xFFFFFFFFFFFFFFFFL }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2397
    };
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2398
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2399
    /**
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2400
     * Probe the first few bytes of the keystore data stream for a valid
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2401
     * PKCS12 keystore encoding.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2402
     */
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2403
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2404
    public boolean engineProbe(InputStream stream) throws IOException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2405
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2406
        DataInputStream dataStream;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2407
        if (stream instanceof DataInputStream) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2408
            dataStream = (DataInputStream)stream;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2409
        } else {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2410
            dataStream = new DataInputStream(stream);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2411
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2412
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2413
        long firstPeek = dataStream.readLong();
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2414
        long nextPeek = dataStream.readLong();
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2415
        long finalPeek = dataStream.readLong();
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2416
        boolean result = false;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2417
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2418
        for (int i = 0; i < PKCS12_HEADER_PATTERNS.length; i++) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2419
            if (PKCS12_HEADER_PATTERNS[i][0] ==
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2420
                    (firstPeek & PKCS12_HEADER_MASKS[i][0]) &&
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2421
                (PKCS12_HEADER_PATTERNS[i][1] ==
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2422
                    (nextPeek & PKCS12_HEADER_MASKS[i][1])) &&
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2423
                (PKCS12_HEADER_PATTERNS[i][2] ==
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2424
                    (finalPeek & PKCS12_HEADER_MASKS[i][2]))) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2425
                result = true;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2426
                break;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2427
            }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2428
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2429
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2430
        return result;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents: 25859
diff changeset
  2431
    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
  2432
}