test/jdk/sun/security/krb5/RFC396xTest.java

@@ -38,10 +38,11 @@
  import sun.security.krb5.internal.crypto.crc32;
  import sun.security.krb5.internal.crypto.dk.AesDkCrypto;
  import sun.security.krb5.internal.crypto.dk.Des3DkCrypto;
  import sun.security.krb5.internal.crypto.dk.DkCrypto;
  import java.nio.*;
+ import java.util.Hex;
  import javax.crypto.*;
  import javax.crypto.spec.*;
  
  public class RFC396xTest {
  

@@ -214,33 +215,16 @@
          bb.get(b);
          return b;
      }
  
      static String hex(byte[] bs) {
-         StringBuffer sb = new StringBuffer(bs.length * 2);
-         for(byte b: bs) {
-             char c = (char)((b+256)%256);
-             if (c / 16 < 10)
-                 sb.append((char)(c/16+'0'));
-             else
-                 sb.append((char)(c/16-10+'a'));
-             if (c % 16 < 10)
-                 sb.append((char)(c%16+'0'));
-             else
-                 sb.append((char)(c%16-10+'a'));
-         }
-         return new String(sb);
+         return Hex.encoder("", "", "", false).encode(bs);
      }
  
      static byte[] xeh(String in) {
          in = in.replaceAll(" ", "");
-         int len = in.length()/2;
-         byte[] out = new byte[len];
-         for (int i=0; i<len; i++) {
-             out[i] = (byte)Integer.parseInt(in.substring(i*2, i*2+2), 16);
-         }
-         return out;
+         return Hex.decoder().decode(in);
      }
  
      static void assertStringEquals(String a, String b) {
          a = a.replaceAll(" ", "");
          b = b.replaceAll(" ", "");