src/share/classes/sun/security/provider/JavaKeyStore.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 29,41 ****
  import java.security.*;
  import java.security.cert.Certificate;
  import java.security.cert.CertificateFactory;
  import java.security.cert.CertificateException;
  import java.util.*;
- import sun.misc.IOUtils;
  
  import sun.security.pkcs.EncryptedPrivateKeyInfo;
  
  /**
   * This class provides the keystore implementation referred to as "JKS".
   *
   * @author Jan Luehe
--- 29,42 ----
  import java.security.*;
  import java.security.cert.Certificate;
  import java.security.cert.CertificateFactory;
  import java.security.cert.CertificateException;
  import java.util.*;
  
+ import sun.misc.IOUtils;
  import sun.security.pkcs.EncryptedPrivateKeyInfo;
+ import sun.security.pkcs12.PKCS12KeyStore;
  
  /**
   * This class provides the keystore implementation referred to as "JKS".
   *
   * @author Jan Luehe
*** 62,71 ****
--- 63,79 ----
      public static final class CaseExactJKS extends JavaKeyStore {
          String convertAlias(String alias) {
              return alias;
          }
      }
+ 
+     // special JKS that supports JKS and PKCS12 file formats
+     public static final class DualFormatJKS extends KeyStoreDelegator {
+         public DualFormatJKS() {
+             super("JKS", JKS.class, "PKCS12", PKCS12KeyStore.class);
+         }
+     }
  
      private static final int MAGIC = 0xfeedfeed;
      private static final int VERSION_1 = 0x01;
      private static final int VERSION_2 = 0x02;