src/java.base/share/classes/sun/security/util/KeyStoreDelegator.java
author weijun
Tue, 23 Apr 2019 08:34:51 +0800
changeset 55714 e17ec6bc670a
parent 47216 71c04702a3d5
permissions -rw-r--r--
8222751: closed/test/jdk/sun/security/util/DerIndefLenConverter/IndefBerPkcs12.java fail Reviewed-by: jnimeh, ascarpino, ssahoo, skoivu
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     1
/*
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     2
 * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     4
 *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    10
 *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    15
 * accompanied this code).
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    16
 *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    20
 *
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    23
 * questions.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    24
 */
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    25
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    26
package sun.security.util;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    27
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    28
import java.io.*;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    29
import java.security.*;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    30
import java.security.cert.Certificate;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    31
import java.security.cert.CertificateFactory;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    32
import java.security.cert.CertificateException;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    33
import java.util.*;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    34
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    35
import sun.security.util.Debug;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    36
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    37
/**
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    38
 * This class delegates to a primary or secondary keystore implementation.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    39
 *
35302
e4d2275861c3 8136494: Update "@since 1.9" to "@since 9" to match java.version.specification
iris
parents: 32661
diff changeset
    40
 * @since 9
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    41
 */
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    42
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    43
public class KeyStoreDelegator extends KeyStoreSpi {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    44
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    45
    private static final String KEYSTORE_TYPE_COMPAT = "keystore.type.compat";
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    46
    private static final Debug debug = Debug.getInstance("keystore");
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    47
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    48
    private String primaryType;   // the primary keystore's type
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    49
    private String secondaryType; // the secondary keystore's type
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    50
    private Class<? extends KeyStoreSpi> primaryKeyStore;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    51
                                  // the primary keystore's class
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    52
    private Class<? extends KeyStoreSpi> secondaryKeyStore;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    53
                                  // the secondary keystore's class
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    54
    private String type; // the delegate's type
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    55
    private KeyStoreSpi keystore; // the delegate
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    56
    private boolean compatModeEnabled = true;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    57
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    58
    public KeyStoreDelegator(
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    59
        String primaryType,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    60
        Class<? extends KeyStoreSpi> primaryKeyStore,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    61
        String secondaryType,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    62
        Class<? extends KeyStoreSpi> secondaryKeyStore) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    63
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    64
        // Check whether compatibility mode has been disabled
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    65
        compatModeEnabled = "true".equalsIgnoreCase(
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    66
            AccessController.doPrivileged((PrivilegedAction<String>) () ->
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    67
                Security.getProperty(KEYSTORE_TYPE_COMPAT)));
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    68
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    69
        if (compatModeEnabled) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    70
            this.primaryType = primaryType;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    71
            this.secondaryType = secondaryType;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    72
            this.primaryKeyStore = primaryKeyStore;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    73
            this.secondaryKeyStore = secondaryKeyStore;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    74
        } else {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    75
            this.primaryType = primaryType;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    76
            this.secondaryType = null;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    77
            this.primaryKeyStore = primaryKeyStore;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    78
            this.secondaryKeyStore = null;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    79
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    80
            if (debug != null) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    81
                debug.println("WARNING: compatibility mode disabled for " +
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    82
                    primaryType + " and " + secondaryType + " keystore types");
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    83
            }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    84
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    85
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    86
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    87
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    88
    public Key engineGetKey(String alias, char[] password)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    89
        throws NoSuchAlgorithmException, UnrecoverableKeyException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    90
        return keystore.engineGetKey(alias, password);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    91
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    92
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    93
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    94
    public Certificate[] engineGetCertificateChain(String alias) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    95
        return keystore.engineGetCertificateChain(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    96
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    97
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    98
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
    99
    public Certificate engineGetCertificate(String alias) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   100
        return keystore.engineGetCertificate(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   101
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   102
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   103
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   104
    public Date engineGetCreationDate(String alias) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   105
        return keystore.engineGetCreationDate(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   106
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   107
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   108
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   109
    public void engineSetKeyEntry(String alias, Key key, char[] password,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   110
        Certificate[] chain) throws KeyStoreException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   111
        keystore.engineSetKeyEntry(alias, key, password, chain);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   112
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   113
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   114
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   115
    public void engineSetKeyEntry(String alias, byte[] key, Certificate[] chain)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   116
        throws KeyStoreException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   117
        keystore.engineSetKeyEntry(alias, key, chain);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   118
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   119
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   120
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   121
    public void engineSetCertificateEntry(String alias, Certificate cert)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   122
        throws KeyStoreException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   123
        keystore.engineSetCertificateEntry(alias, cert);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   124
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   125
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   126
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   127
    public void engineDeleteEntry(String alias) throws KeyStoreException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   128
        keystore.engineDeleteEntry(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   129
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   130
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   131
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   132
    public Enumeration<String> engineAliases() {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   133
        return keystore.engineAliases();
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   134
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   135
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   136
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   137
    public boolean engineContainsAlias(String alias) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   138
        return keystore.engineContainsAlias(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   139
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   140
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   141
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   142
    public int engineSize() {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   143
        return keystore.engineSize();
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   144
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   145
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   146
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   147
    public boolean engineIsKeyEntry(String alias) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   148
        return keystore.engineIsKeyEntry(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   149
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   150
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   151
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   152
    public boolean engineIsCertificateEntry(String alias) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   153
        return keystore.engineIsCertificateEntry(alias);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   154
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   155
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   156
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   157
    public String engineGetCertificateAlias(Certificate cert) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   158
        return keystore.engineGetCertificateAlias(cert);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   159
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   160
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   161
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   162
    public KeyStore.Entry engineGetEntry(String alias,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   163
        KeyStore.ProtectionParameter protParam)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   164
            throws KeyStoreException, NoSuchAlgorithmException,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   165
                UnrecoverableEntryException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   166
        return keystore.engineGetEntry(alias, protParam);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   167
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   168
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   169
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   170
    public void engineSetEntry(String alias, KeyStore.Entry entry,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   171
        KeyStore.ProtectionParameter protParam)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   172
            throws KeyStoreException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   173
        keystore.engineSetEntry(alias, entry, protParam);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   174
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   175
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   176
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   177
    public boolean engineEntryInstanceOf(String alias,
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   178
        Class<? extends KeyStore.Entry> entryClass) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   179
        return keystore.engineEntryInstanceOf(alias, entryClass);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   180
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   181
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   182
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   183
    public void engineStore(OutputStream stream, char[] password)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   184
        throws IOException, NoSuchAlgorithmException, CertificateException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   185
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   186
        if (debug != null) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   187
            debug.println("Storing keystore in " + type + " format");
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   188
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   189
        keystore.engineStore(stream, password);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   190
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   191
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   192
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   193
    public void engineLoad(InputStream stream, char[] password)
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   194
        throws IOException, NoSuchAlgorithmException, CertificateException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   195
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   196
        // A new keystore is always created in the primary keystore format
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   197
        if (stream == null) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   198
            try {
37782
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   199
                @SuppressWarnings("deprecation")
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   200
                KeyStoreSpi tmp = primaryKeyStore.newInstance();
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   201
                keystore = tmp;
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   202
            } catch (InstantiationException | IllegalAccessException e) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   203
                // can safely ignore
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   204
            }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   205
            type = primaryType;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   206
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   207
            if (debug != null) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   208
                debug.println("Creating a new keystore in " + type + " format");
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   209
            }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   210
            keystore.engineLoad(stream, password);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   211
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   212
        } else {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   213
            // First try the primary keystore then try the secondary keystore
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   214
            InputStream bufferedStream = new BufferedInputStream(stream);
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   215
            bufferedStream.mark(Integer.MAX_VALUE);
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   216
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   217
            try {
37782
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   218
                @SuppressWarnings("deprecation")
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   219
                KeyStoreSpi tmp = primaryKeyStore.newInstance();
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   220
                keystore = tmp;
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   221
                type = primaryType;
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   222
                keystore.engineLoad(bufferedStream, password);
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   223
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   224
            } catch (Exception e) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   225
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   226
                // incorrect password
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   227
                if (e instanceof IOException &&
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   228
                    e.getCause() instanceof UnrecoverableKeyException) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   229
                    throw (IOException)e;
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   230
                }
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   231
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   232
                try {
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   233
                    // Ignore secondary keystore when no compatibility mode
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   234
                    if (!compatModeEnabled) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   235
                        throw e;
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   236
                    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   237
37782
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   238
                    @SuppressWarnings("deprecation")
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   239
                    KeyStoreSpi tmp= secondaryKeyStore.newInstance();
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   240
                    keystore = tmp;
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   241
                    type = secondaryType;
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   242
                    bufferedStream.reset();
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   243
                    keystore.engineLoad(bufferedStream, password);
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   244
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   245
                    if (debug != null) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   246
                        debug.println("WARNING: switching from " +
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   247
                          primaryType + " to " + secondaryType +
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   248
                          " keystore file format has altered the " +
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   249
                          "keystore security level");
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   250
                    }
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   251
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   252
                } catch (InstantiationException |
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   253
                    IllegalAccessException e2) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   254
                    // can safely ignore
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   255
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   256
                } catch (IOException |
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   257
                    NoSuchAlgorithmException |
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   258
                    CertificateException e3) {
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   259
32661
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   260
                    // incorrect password
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   261
                    if (e3 instanceof IOException &&
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   262
                        e3.getCause() instanceof UnrecoverableKeyException) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   263
                        throw (IOException)e3;
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   264
                    }
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   265
                    // rethrow the outer exception
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   266
                    if (e instanceof IOException) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   267
                        throw (IOException)e;
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   268
                    } else if (e instanceof CertificateException) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   269
                        throw (CertificateException)e;
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   270
                    } else if (e instanceof NoSuchAlgorithmException) {
42a0bafb4767 8136534: Loading JKS keystore using non-null InputStream results in closed stream
vinnie
parents: 28243
diff changeset
   271
                        throw (NoSuchAlgorithmException)e;
55714
e17ec6bc670a 8222751: closed/test/jdk/sun/security/util/DerIndefLenConverter/IndefBerPkcs12.java fail
weijun
parents: 47216
diff changeset
   272
                    } else if (e instanceof RuntimeException){
e17ec6bc670a 8222751: closed/test/jdk/sun/security/util/DerIndefLenConverter/IndefBerPkcs12.java fail
weijun
parents: 47216
diff changeset
   273
                        throw (RuntimeException)e;
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   274
                    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   275
                }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   276
            }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   277
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   278
            if (debug != null) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   279
                debug.println("Loaded a keystore in " + type + " format");
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   280
            }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   281
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   282
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   283
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   284
    /**
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   285
     * Probe the first few bytes of the keystore data stream for a valid
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   286
     * keystore encoding. Only the primary keystore implementation is probed.
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   287
     */
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   288
    @Override
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   289
    public boolean engineProbe(InputStream stream) throws IOException {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   290
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   291
        boolean result = false;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   292
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   293
        try {
37782
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   294
            @SuppressWarnings("deprecation")
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   295
            KeyStoreSpi tmp = primaryKeyStore.newInstance();
ad8fe7507ecc 6850612: Deprecate Class.newInstance since it violates the checked exception language contract
darcy
parents: 35302
diff changeset
   296
            keystore = tmp;
28243
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   297
            type = primaryType;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   298
            result = keystore.engineProbe(stream);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   299
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   300
        } catch (Exception e) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   301
            throw new IOException(e);
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   302
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   303
        } finally {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   304
            // reset
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   305
            if (result == false) {
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   306
                type = null;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   307
                keystore = null;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   308
            }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   309
        }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   310
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   311
        return result;
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   312
    }
47080f9ae750 8044445: JEP 229: Create PKCS12 Keystores by Default
vinnie
parents:
diff changeset
   313
}