test/jdk/sun/security/ec/SignatureDigestTruncate.java

@@ -19,12 +19,10 @@
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
- import jdk.test.lib.Convert;
- 
  import java.security.*;
  import java.security.spec.*;
  import java.math.*;
  import java.util.*;
  

@@ -77,28 +75,27 @@
      }
  
      private static void assertEquals(byte[] expected, byte[] actual,
              String name) {
          if (!Arrays.equals(actual, expected)) {
-             System.out.println("expect: "
-                     + Convert.byteArrayToHexString(expected));
-             System.out.println("actual: "
-                     + Convert.byteArrayToHexString(actual));
+             System.out.println("expect: " + Hex.encoder().encode(expected));
+             System.out.println("actual: " + Hex.encoder().encode(actual));
              throw new RuntimeException("Incorrect " + name + " value");
          }
      }
  
      private static void runTest(String alg, String curveName,
          String privateKeyStr, String msgStr, String kStr, String sigStr)
          throws Exception {
  
          System.out.println("Testing " + alg + " with " + curveName);
  
-         byte[] privateKey = Convert.hexStringToByteArray(privateKeyStr);
-         byte[] msg = Convert.hexStringToByteArray(msgStr);
-         byte[] k = Convert.hexStringToByteArray(kStr);
-         byte[] expectedSig = Convert.hexStringToByteArray(sigStr);
+         Hex.Decoder decoder = Hex.decoder();
+         byte[] privateKey = decoder.decode(privateKeyStr);
+         byte[] msg = decoder.decode(msgStr);
+         byte[] k = decoder.decode(kStr);
+         byte[] expectedSig = decoder.decode(sigStr);
  
          AlgorithmParameters params =
              AlgorithmParameters.getInstance("EC", "SunEC");
          params.init(new ECGenParameterSpec(curveName));
          ECParameterSpec ecParams =