--- a/jdk/test/sun/security/pkcs11/tls/TestPRF.java Tue Jan 26 09:25:53 2016 +0000
+++ b/jdk/test/sun/security/pkcs11/tls/TestPRF.java Tue Jan 26 13:32:07 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -28,116 +28,116 @@
* @author Andreas Sterbenz
* @library ..
* @modules java.base/sun.security.internal.spec
+ * @run main/othervm TestPRF
+ * @run main/othervm TestPRF sm policy
*/
-import java.io.*;
-import java.util.*;
-
-import java.security.Security;
+import java.io.BufferedReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.security.Provider;
-
+import java.util.Arrays;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-
-import javax.crypto.spec.*;
-
-import sun.security.internal.spec.*;
+import javax.crypto.spec.SecretKeySpec;
+import sun.security.internal.spec.TlsPrfParameterSpec;
public class TestPRF extends PKCS11Test {
- private static int PREFIX_LENGTH = "prf-output: ".length();
+ private static final int PREFIX_LENGTH = "prf-output: ".length();
public static void main(String[] args) throws Exception {
- main(new TestPRF());
+ main(new TestPRF(), args);
}
+ @Override
public void main(Provider provider) throws Exception {
if (provider.getService("KeyGenerator", "SunTlsPrf") == null) {
System.out.println("Provider does not support algorithm, skipping");
return;
}
- InputStream in = new FileInputStream(new File(BASE, "prfdata.txt"));
- BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ try (BufferedReader reader = Files.newBufferedReader(
+ Paths.get(BASE, "prfdata.txt"))) {
- int n = 0;
- int lineNumber = 0;
+ int n = 0;
+ int lineNumber = 0;
- byte[] secret = null;
- String label = null;
- byte[] seed = null;
- int length = 0;
- byte[] output = null;
+ byte[] secret = null;
+ String label = null;
+ byte[] seed = null;
+ int length = 0;
+ byte[] output = null;
- while (true) {
- String line = reader.readLine();
- lineNumber++;
- if (line == null) {
- break;
- }
- if (line.startsWith("prf-") == false) {
- continue;
- }
+ while (true) {
+ String line = reader.readLine();
+ lineNumber++;
+ if (line == null) {
+ break;
+ }
+ if (line.startsWith("prf-") == false) {
+ continue;
+ }
- String data = line.substring(PREFIX_LENGTH);
- if (line.startsWith("prf-secret:")) {
- secret = parse(data);
- } else if (line.startsWith("prf-label:")) {
- label = data;
- } else if (line.startsWith("prf-seed:")) {
- seed = parse(data);
- } else if (line.startsWith("prf-length:")) {
- length = Integer.parseInt(data);
- } else if (line.startsWith("prf-output:")) {
- output = parse(data);
+ String data = line.substring(PREFIX_LENGTH);
+ if (line.startsWith("prf-secret:")) {
+ secret = parse(data);
+ } else if (line.startsWith("prf-label:")) {
+ label = data;
+ } else if (line.startsWith("prf-seed:")) {
+ seed = parse(data);
+ } else if (line.startsWith("prf-length:")) {
+ length = Integer.parseInt(data);
+ } else if (line.startsWith("prf-output:")) {
+ output = parse(data);
- System.out.print(".");
- n++;
+ System.out.print(".");
+ n++;
- KeyGenerator kg =
- KeyGenerator.getInstance("SunTlsPrf", provider);
- SecretKey inKey;
- if (secret == null) {
- inKey = null;
- } else {
- inKey = new SecretKeySpec(secret, "Generic");
- }
- TlsPrfParameterSpec spec =
- new TlsPrfParameterSpec(inKey, label, seed, length,
- null, -1, -1);
- SecretKey key;
- try {
- kg.init(spec);
- key = kg.generateKey();
- } catch (Exception e) {
+ KeyGenerator kg =
+ KeyGenerator.getInstance("SunTlsPrf", provider);
+ SecretKey inKey;
if (secret == null) {
- // This fails on Solaris, but since we never call this
- // API for this case in JSSE, ignore the failure.
- // (SunJSSE uses the CKM_TLS_KEY_AND_MAC_DERIVE
- // mechanism)
- System.out.print("X");
- continue;
+ inKey = null;
+ } else {
+ inKey = new SecretKeySpec(secret, "Generic");
}
- System.out.println();
- throw new Exception("Error on line: " + lineNumber, e);
+ TlsPrfParameterSpec spec =
+ new TlsPrfParameterSpec(inKey, label, seed, length,
+ null, -1, -1);
+ SecretKey key;
+ try {
+ kg.init(spec);
+ key = kg.generateKey();
+ } catch (Exception e) {
+ if (secret == null) {
+ // This fails on Solaris, but since we never call this
+ // API for this case in JSSE, ignore the failure.
+ // (SunJSSE uses the CKM_TLS_KEY_AND_MAC_DERIVE
+ // mechanism)
+ System.out.print("X");
+ continue;
+ }
+ System.out.println();
+ throw new Exception("Error on line: " + lineNumber, e);
+ }
+ byte[] enc = key.getEncoded();
+ if (Arrays.equals(output, enc) == false) {
+ System.out.println();
+ System.out.println("expected: " + toString(output));
+ System.out.println("actual: " + toString(enc));
+ throw new Exception("mismatch line: " + lineNumber);
+ }
+ } else {
+ throw new Exception("Unknown line: " + line);
}
- byte[] enc = key.getEncoded();
- if (Arrays.equals(output, enc) == false) {
- System.out.println();
- System.out.println("expected: " + toString(output));
- System.out.println("actual: " + toString(enc));
- throw new Exception("mismatch line: " + lineNumber);
- }
- } else {
- throw new Exception("Unknown line: " + line);
+ }
+ if (n == 0) {
+ throw new Exception("no tests");
}
- }
- if (n == 0) {
- throw new Exception("no tests");
+ System.out.println();
+ System.out.println("OK: " + n + " tests");
}
- in.close();
- System.out.println();
- System.out.println("OK: " + n + " tests");
}
}