From 6c58a28038a96eb80f212a4fe2dbea65545b1271 Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Thu, 1 Nov 2018 17:04:52 +0000 Subject: [PATCH] Fix merge --- .../corda/core/internal/JarSignatureCollectorTest.kt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt b/core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt index 6be9bbec29..91a77194bd 100644 --- a/core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt +++ b/core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt @@ -131,18 +131,6 @@ class JarSignatureCollectorTest { assertFailsWith { dir.getJarSigners(FILENAME) } } - // Signing using EC algorithm produced JAR File spec incompatible signature block (META-INF/*.EC) which is anyway accepted by jarsiner, see [JarSignatureCollector] - @Test - fun `one signer with EC sign algorithm`() { - dir.createJar(FILENAME, "_signable1", "_signable2") - val charlieKey = dir.signJar(FILENAME, CHARLIE, CHARLIE_PASS) - assertEquals(setOf(charlieKey), dir.getJarSigners(FILENAME).toSet()) // We only reused CHARLIE's distinguished name, so the keys will be different. - - (dir / "my-dir").createDirectory() - dir.updateJar(FILENAME, "my-dir") - assertEquals(setOf(charlieKey), dir.getJarSigners(FILENAME).toSet()) // Unsigned directory is irrelevant. - } - // Signing with EC algorithm produces META-INF/*.EC file name not compatible with JAR File Spec however it's compatible with java.util.JarVerifier // and our JarSignatureCollector @Test