Fix merge

This commit is contained in:
Tudor Malene 2018-11-01 17:04:52 +00:00 committed by tudor.malene@gmail.com
parent d97d64d954
commit 6c58a28038

View File

@ -131,18 +131,6 @@ class JarSignatureCollectorTest {
assertFailsWith<SecurityException> { 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