src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java

rev 52903 : 8234027: Better JCEKS key support
Reviewed-by: ahgross, mullan, rriggs, rhalade

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2018, 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) 1998, 2019, 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
*** 350,361 ****
          return new SealedObjectForKeyProtector(key, cipher);
      }
  
      /**
       * Unseals the sealed key.
       */
!     Key unseal(SealedObject so)
          throws NoSuchAlgorithmException, UnrecoverableKeyException {
          SecretKey sKey = null;
          try {
              // create PBE key from password
              PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
--- 350,364 ----
          return new SealedObjectForKeyProtector(key, cipher);
      }
  
      /**
       * Unseals the sealed key.
+      *
+      * @param maxLength Maximum possible length of so.
+      *                  If bigger, must be illegal.
       */
!     Key unseal(SealedObject so, int maxLength)
          throws NoSuchAlgorithmException, UnrecoverableKeyException {
          SecretKey sKey = null;
          try {
              // create PBE key from password
              PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
*** 387,397 ****
              cipherSpi = new PBEWithMD5AndTripleDESCipher();
              Cipher cipher = new CipherForKeyProtector(cipherSpi,
                                                        SunJCE.getInstance(),
                                                        "PBEWithMD5AndTripleDES");
              cipher.init(Cipher.DECRYPT_MODE, sKey, params);
!             return soForKeyProtector.getKey(cipher);
          } catch (NoSuchAlgorithmException ex) {
              // Note: this catch needed to be here because of the
              // later catch of GeneralSecurityException
              throw ex;
          } catch (IOException ioe) {
--- 390,400 ----
              cipherSpi = new PBEWithMD5AndTripleDESCipher();
              Cipher cipher = new CipherForKeyProtector(cipherSpi,
                                                        SunJCE.getInstance(),
                                                        "PBEWithMD5AndTripleDES");
              cipher.init(Cipher.DECRYPT_MODE, sKey, params);
!             return soForKeyProtector.getKey(cipher, maxLength);
          } catch (NoSuchAlgorithmException ex) {
              // Note: this catch needed to be here because of the
              // later catch of GeneralSecurityException
              throw ex;
          } catch (IOException ioe) {