test/jdk/javax/crypto/SecretKeyFactory/SecKeyFacSunJCEPrf.java

*** 1,7 ***
  /*
!  * Copyright (c) 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.
--- 1,7 ---
  /*
!  * Copyright (c) 2019, 2020, 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.

*** 25,31 ***
   * @test
   * @bug 8218723
   * @summary Use SunJCE Mac in SecretKeyFactory PBKDF2 implementation
   * @library evilprov.jar
   * @library /test/lib
-  * @build jdk.test.lib.Convert
   * @run main/othervm SecKeyFacSunJCEPrf
   */
  
  import java.util.Arrays;
  import javax.crypto.SecretKeyFactory;
  import javax.crypto.SecretKey;
  import javax.crypto.spec.PBEKeySpec;
  import java.security.Provider;
  import java.security.Security;
  import com.evilprovider.*;
- import jdk.test.lib.Convert;
  
  public class SecKeyFacSunJCEPrf {
  
      // One of the PBKDF2 HMAC-SHA1 test vectors from RFC 6070
      private static final byte[] SALT = "salt".getBytes();
      private static final char[] PASS = "password".toCharArray();
      private static final int ITER = 4096;
!     private static final byte[] EXP_OUT = Convert.hexStringToByteArray(
!             "4B007901B765489ABEAD49D926F721D065A429C1");
  
      public static void main(String[] args) throws Exception {
          // Instantiate the Evil Provider and insert it in the
          // most-preferred position.
          Provider evilProv = new EvilProvider();
--- 25,30 ---
   * @test
   * @bug 8218723
   * @summary Use SunJCE Mac in SecretKeyFactory PBKDF2 implementation
   * @library evilprov.jar
   * @library /test/lib
   * @run main/othervm SecKeyFacSunJCEPrf
   */
  
  import java.util.Arrays;
+ import java.util.Hex;
  import javax.crypto.SecretKeyFactory;
  import javax.crypto.SecretKey;
  import javax.crypto.spec.PBEKeySpec;
  import java.security.Provider;
  import java.security.Security;
  import com.evilprovider.*;
  
  public class SecKeyFacSunJCEPrf {
  
      // One of the PBKDF2 HMAC-SHA1 test vectors from RFC 6070
      private static final byte[] SALT = "salt".getBytes();
      private static final char[] PASS = "password".toCharArray();
      private static final int ITER = 4096;
!     private static final byte[] EXP_OUT =
!             Hex.decoder().decode("4B007901B765489ABEAD49D926F721D065A429C1");
  
      public static void main(String[] args) throws Exception {
          // Instantiate the Evil Provider and insert it in the
          // most-preferred position.
          Provider evilProv = new EvilProvider();

*** 60,17 ***
                  SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1", "SunJCE");
          PBEKeySpec pbks = new PBEKeySpec(PASS, SALT, ITER, 160);
  
          SecretKey secKey1 = pbkdf2.generateSecret(pbks);
          System.out.println("PBKDF2WithHmacSHA1:\n" +
!                     Convert.byteArrayToHexString(secKey1.getEncoded()));
          if (Arrays.equals(secKey1.getEncoded(), EXP_OUT)) {
              System.out.println("Test Vector Passed");
          } else {
              System.out.println("Test Vector Failed");
              System.out.println("Expected Output:\n" +
!                     Convert.byteArrayToHexString(EXP_OUT));
              throw new RuntimeException();
          }
      }
  }
  
--- 59,17 ---
                  SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1", "SunJCE");
          PBEKeySpec pbks = new PBEKeySpec(PASS, SALT, ITER, 160);
  
          SecretKey secKey1 = pbkdf2.generateSecret(pbks);
          System.out.println("PBKDF2WithHmacSHA1:\n" +
!                     Hex.encoder().encode(secKey1.getEncoded()));
          if (Arrays.equals(secKey1.getEncoded(), EXP_OUT)) {
              System.out.println("Test Vector Passed");
          } else {
              System.out.println("Test Vector Failed");
              System.out.println("Expected Output:\n" +
!                     Hex.encoder().encode(EXP_OUT));
              throw new RuntimeException();
          }
      }
  }