fixes #12

Author: overheadhunter

pom.xml

@@ -48,9 +48,9 @@
 
 		<!-- Tests -->
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.4.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -59,6 +59,12 @@
 			<version>2.27.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest</artifactId>
+			<version>2.1</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -109,6 +115,7 @@
 					<release>7</release>
 					<source>1.7</source> <!-- redundant to <release> but needed until https://bugs.openjdk.java.net/browse/JDK-8219474 is fixed (see javadoc config) -->
 					<target>1.7</target>
+					<testRelease>8</testRelease>
 					<encoding>UTF-8</encoding>
 					<showWarnings>true</showWarnings>
 				</configuration>
@@ -195,6 +202,31 @@
 	</build>
 
 	<profiles>
+		<profile>
+			<id>intellij</id>
+			<!-- workaround for intellij bug: https://youtrack.jetbrains.com/issue/IDEA-85478 -->
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<property>
+					<name>idea.maven.embedder.version</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<version>3.8.1</version>
+						<configuration>
+							<release>8</release>
+							<source>1.8</source>
+							<target>1.8</target>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
 		<profile>
 			<id>dependency-check</id>
 			<build>

src/test/go/siv-test-vectors.go

@@ -76,18 +76,18 @@ func printTestCases() {
 // Print a single test case to STDOUT.
 func printTestCase(key []byte, plaintext []byte, associatedData [][]byte) {
 	// CTR mode encryption key
-	fmt.Println(hex.EncodeToString(key[len(key)/2:]))
+	fmt.Printf("%s;", hex.EncodeToString(key[len(key)/2:]))
 
 	// MAC (authentication) key
-	fmt.Println(hex.EncodeToString(key[:len(key)/2]))
+	fmt.Printf("%s;", hex.EncodeToString(key[:len(key)/2]))
 
 	// Plaintext
-	fmt.Println(hex.EncodeToString(plaintext))
+	fmt.Printf("%s;", hex.EncodeToString(plaintext))
 
 	// Additional associated data
-	fmt.Printf("%v\n", len(associatedData))
+	fmt.Printf("%v;", len(associatedData))
 	for _, adElem := range associatedData {
-		fmt.Println(hex.EncodeToString(adElem))
+		fmt.Printf("%s;", hex.EncodeToString(adElem))
 	}
 
 	// Ciphertext
@@ -97,7 +97,4 @@ func printTestCase(key []byte, plaintext []byte, associatedData [][]byte) {
 		os.Exit(7)
 	}
 	fmt.Println(hex.EncodeToString(ciphertext));
-
-	// End of test case
-	fmt.Println("---")
 }

src/test/java/org/cryptomator/siv/BenchmarkTest.java

@@ -8,7 +8,8 @@
  ******************************************************************************/
 package org.cryptomator.siv;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
@@ -18,22 +19,17 @@ public class BenchmarkTest {
 
 	@Test
 	public void runBenchmarks() throws RunnerException {
-		if (System.getProperty("java.version").startsWith("1.8")) {
-			// Taken from http://stackoverflow.com/a/30486197/4014509:
-			Options opt = new OptionsBuilder()
-					// Specify which benchmarks to run
-					.include(getClass().getPackage().getName() + ".*Benchmark.*")
-					// Set the following options as needed
-					.threads(2).forks(2) //
-					.shouldFailOnError(true).shouldDoGC(true)
-					// .jvmArgs("-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining")
-					// .addProfiler(WinPerfAsmProfiler.class)
-					.build();
-
-			new Runner(opt).run();
-		} else {
-			System.out.println("Skipping Benchmarks");
-		}
+		// Taken from http://stackoverflow.com/a/30486197/4014509:
+		Options opt = new OptionsBuilder()
+				// Specify which benchmarks to run
+				.include(getClass().getPackage().getName() + ".*Benchmark.*")
+				// Set the following options as needed
+				.threads(2).forks(2) //
+				.shouldFailOnError(true).shouldDoGC(true)
+				// .jvmArgs("-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining")
+				// .addProfiler(WinPerfAsmProfiler.class)
+				.build();
+		new Runner(opt).run();
 	}
 
 }

src/test/java/org/cryptomator/siv/EncryptionTestCase.java

@@ -1,66 +1,53 @@
 package org.cryptomator.siv;
 
+import com.google.common.base.Splitter;
+import com.google.common.io.BaseEncoding;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
-import com.google.common.io.BaseEncoding;
+import java.util.Optional;
 
 public class EncryptionTestCase {
+
+	private static int TESTCASE_CTR = 0;
+
+	private final int testCaseNumber;
 	private final byte[] ctrKey;
 	private final byte[] macKey;
 	private final byte[] plaintext;
 	private final byte[][] additionalData;
 	private final byte[] ciphertext;
 
-	public EncryptionTestCase(byte[] ctrKey, byte[] macKey, byte[] plaintext, byte[][] additionalData, byte[] ciphertext) {
+	public EncryptionTestCase(int testCaseNumber, byte[] ctrKey, byte[] macKey, byte[] plaintext, byte[][] additionalData, byte[] ciphertext) {
+		this.testCaseNumber = testCaseNumber;
 		this.ctrKey = ctrKey;
 		this.macKey = macKey;
 		this.plaintext = plaintext;
 		this.additionalData = additionalData;
 		this.ciphertext = ciphertext;
 	}
 
-	// Read and parse the test cases generated with `siv-test-vectors.go`
-	public static EncryptionTestCase[] readTestCases() throws IOException {
-		// testcases.txt should contain an output from `siv-test-vectors.go`
-		BufferedReader reader = new BufferedReader(new InputStreamReader(EncryptionTestCase.class.getResourceAsStream("/testcases.txt"), StandardCharsets.US_ASCII));
-
-		try {
-			List<EncryptionTestCase> result = new ArrayList<EncryptionTestCase>();
-
-			for (;;) {
-				String ctrKeyStr = reader.readLine();
-				if (ctrKeyStr == null) {
-					// No more test cases
-					break;
-				}
-				byte[] ctrKey = BaseEncoding.base16().decode(ctrKeyStr.toUpperCase());
-				byte[] macKey = BaseEncoding.base16().decode(reader.readLine().toUpperCase());
-				byte[] plaintext = BaseEncoding.base16().decode(reader.readLine().toUpperCase());
-				int adCount = Integer.parseInt(reader.readLine());
-				byte[][] ad = new byte[adCount][];
-				for (int adIdx = 0; adIdx < adCount; adIdx++) {
-					ad[adIdx] = BaseEncoding.base16().decode(reader.readLine().toUpperCase());
-				}
-				byte[] ciphertext = BaseEncoding.base16().decode(reader.readLine().toUpperCase());
-
-				String divider = reader.readLine();
-				if (!divider.equals("---")) {
-					throw new IllegalStateException("expected test case divider but found: " + divider);
-				}
-
-				result.add(new EncryptionTestCase(ctrKey, macKey, plaintext, ad, ciphertext));
-			}
-
-			return result.toArray(new EncryptionTestCase[result.size()]);
-		} finally {
-			reader.close();
+	public static EncryptionTestCase fromLine(String line) {
+		List<String> fields = Splitter.on(';').splitToList(line);
+		byte[] ctrKey = BaseEncoding.base16().decode(fields.get(0).toUpperCase());
+		byte[] macKey = BaseEncoding.base16().decode(fields.get(1).toUpperCase());
+		byte[] plaintext = BaseEncoding.base16().decode(fields.get(2).toUpperCase());
+		int adCount = Integer.parseInt(fields.get(3));
+		byte[][] ad = new byte[adCount][];
+		for (int adIdx = 0; adIdx < adCount; adIdx++) {
+			ad[adIdx] = BaseEncoding.base16().decode(fields.get(4+adIdx).toUpperCase());
 		}
+		byte[] ciphertext = BaseEncoding.base16().decode(fields.get(4+adCount).toUpperCase());
+		return new EncryptionTestCase(TESTCASE_CTR++, ctrKey, macKey, plaintext, ad, ciphertext);
+	}
+
+	public int getTestCaseNumber() {
+		return testCaseNumber;
 	}
 
 	public byte[] getCtrKey() {

src/test/java/org/cryptomator/siv/JceAesBlockCipherTest.java

@@ -11,41 +11,41 @@
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
 import org.bouncycastle.crypto.params.KeyParameter;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.security.Provider;
 import java.security.Security;
 
 public class JceAesBlockCipherTest {
 
-	@Rule
-	public final ExpectedException thrown = ExpectedException.none();
-
 	@Test
 	public void testInitWithNullParam() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("missing parameter of type KeyParameter");
-		cipher.init(true, null);
+		IllegalArgumentException e = Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			cipher.init(true, null);
+		});
+		MatcherAssert.assertThat(e.getMessage(), CoreMatchers.containsString("missing parameter of type KeyParameter"));
 	}
 
 	@Test
 	public void testInitWithMissingKey() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("missing parameter of type KeyParameter");
-		cipher.init(true, new AsymmetricKeyParameter(true));
+		IllegalArgumentException e = Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			cipher.init(true, new AsymmetricKeyParameter(true));
+		});
+		MatcherAssert.assertThat(e.getMessage(), CoreMatchers.containsString("missing parameter of type KeyParameter"));
 	}
 
 	@Test
 	public void testInitWithInvalidKey() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
-		thrown.expect(IllegalArgumentException.class);
-		thrown.expectMessage("Invalid key");
-		cipher.init(true, new KeyParameter(new byte[7]));
+		IllegalArgumentException e = Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			cipher.init(true, new KeyParameter(new byte[7]));
+		});
+		MatcherAssert.assertThat(e.getMessage(), CoreMatchers.containsString("Invalid key"));
 	}
 
 	@Test
@@ -74,45 +74,48 @@ public void testInitForDecryptionWithProvider() {
 
     private Provider getSunJceProvider() {
         Provider provider = Security.getProvider("SunJCE");
-        Assert.assertNotNull(provider);
+        Assertions.assertNotNull(provider);
         return provider;
     }
 
     @Test
 	public void testGetAlgorithmName() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
-		Assert.assertEquals("AES", cipher.getAlgorithmName());
+		Assertions.assertEquals("AES", cipher.getAlgorithmName());
 	}
 
 	@Test
 	public void testGetBlockSize() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
-		Assert.assertEquals(16, cipher.getBlockSize());
+		Assertions.assertEquals(16, cipher.getBlockSize());
 	}
 
 	@Test
 	public void testProcessBlockWithUninitializedCipher() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
-		thrown.expect(IllegalStateException.class);
-		cipher.processBlock(new byte[16], 0, new byte[16], 0);
+		Assertions.assertThrows(IllegalStateException.class, () -> {
+			cipher.processBlock(new byte[16], 0, new byte[16], 0);
+		});
 	}
 
 	@Test
 	public void testProcessBlockWithInsufficientInput() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
 		cipher.init(true, new KeyParameter(new byte[16]));
-		thrown.expect(DataLengthException.class);
-		thrown.expectMessage("Insufficient data in 'in'");
-		cipher.processBlock(new byte[16], 1, new byte[16], 0);
+		DataLengthException e = Assertions.assertThrows(DataLengthException.class, () -> {
+			cipher.processBlock(new byte[16], 1, new byte[16], 0);
+		});
+		MatcherAssert.assertThat(e.getMessage(), CoreMatchers.containsString("Insufficient data in 'in'"));
 	}
 
 	@Test
 	public void testProcessBlockWithInsufficientOutput() {
 		JceAesBlockCipher cipher = new JceAesBlockCipher();
 		cipher.init(true, new KeyParameter(new byte[16]));
-		thrown.expect(DataLengthException.class);
-		thrown.expectMessage("Insufficient space in 'out'");
-		cipher.processBlock(new byte[16], 0, new byte[16], 1);
+		DataLengthException e = Assertions.assertThrows(DataLengthException.class, () -> {
+			cipher.processBlock(new byte[16], 0, new byte[16], 1);
+		});
+		MatcherAssert.assertThat(e.getMessage(), CoreMatchers.containsString("Insufficient space in 'out'"));
 	}
 
 	@Test
@@ -129,13 +132,13 @@ private void testProcessBlock(JceAesBlockCipher cipher) {
         cipher.init(true, new KeyParameter(new byte[16]));
         byte[] ciphertext = new byte[16];
         int encrypted = cipher.processBlock(new byte[20], 0, ciphertext, 0);
-        Assert.assertEquals(16, encrypted);
+        Assertions.assertEquals(16, encrypted);
 
         cipher.init(false, new KeyParameter(new byte[16]));
         byte[] cleartext = new byte[16];
         int decrypted = cipher.processBlock(ciphertext, 0, cleartext, 0);
-        Assert.assertEquals(16, decrypted);
-        Assert.assertArrayEquals(new byte[16], cleartext);
+        Assertions.assertEquals(16, decrypted);
+        Assertions.assertArrayEquals(new byte[16], cleartext);
     }
 
     @Test