From f1cba2de17ba136292291f38021dd8c9f10de740 Mon Sep 17 00:00:00 2001 From: tkellner Date: Tue, 30 Aug 2011 10:30:26 +0000 Subject: smcc update for ECDSA/RIPEMD160 * RIPEMD160 support for old cards which don't support SHA-256 yet * Rename CERITIFIED_KEYPAIR -> CERTIFIED_KEYPAIR git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@960 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../test/java/at/gv/egiz/smcc/test/AbstractCardTest.java | 14 +++++++------- .../java/at/gv/egiz/smcc/test/AbstractInvalidCardTest.java | 2 +- .../at/gv/egiz/smcc/test/AbstractNotActivatedCardTest.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'smcc/src/test') diff --git a/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractCardTest.java index f47afcfa..28ad9090 100644 --- a/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractCardTest.java +++ b/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractCardTest.java @@ -62,7 +62,7 @@ public abstract class AbstractCardTest extends AbstractCardTestBase { byte[] certificateGSRef = (byte[]) applicationContext.getBean("certificateGS", byte[].class); - byte[] certificateGS = signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR, null); + byte[] certificateGS = signatureCard.getCertificate(KeyboxName.CERTIFIED_KEYPAIR, null); assertArrayEquals(certificateGSRef, certificateGS); @@ -113,7 +113,7 @@ public abstract class AbstractCardTest extends AbstractCardTestBase { byte[] signature = signatureCard.createSignature(new ByteArrayInputStream("MOCCA" .getBytes("ASCII")), - KeyboxName.CERITIFIED_KEYPAIR, new SMCCTestPINProvider(pin), null); + KeyboxName.CERTIFIED_KEYPAIR, new SMCCTestPINProvider(pin), null); assertNotNull(signature); @@ -126,7 +126,7 @@ public abstract class AbstractCardTest extends AbstractCardTestBase { byte[] signature = signatureCard.createSignature(new ByteArrayInputStream("MOCCA" .getBytes("ASCII")), - KeyboxName.CERITIFIED_KEYPAIR, new SMCCTestPINProvider(pin), null); + KeyboxName.CERTIFIED_KEYPAIR, new SMCCTestPINProvider(pin), null); assertNotNull(signature); @@ -140,7 +140,7 @@ public abstract class AbstractCardTest extends AbstractCardTestBase { PINGUI pinProvider = new CancelPINProvider(); signatureCard.createSignature(new ByteArrayInputStream(MOCCA), - KeyboxName.CERITIFIED_KEYPAIR, pinProvider, null); + KeyboxName.CERTIFIED_KEYPAIR, pinProvider, null); } @@ -164,7 +164,7 @@ public abstract class AbstractCardTest extends AbstractCardTestBase { PINGUI pinProvider = new InterruptPINProvider(); signatureCard.createSignature(new ByteArrayInputStream(MOCCA), - KeyboxName.CERITIFIED_KEYPAIR, pinProvider, null); + KeyboxName.CERTIFIED_KEYPAIR, pinProvider, null); } @@ -206,7 +206,7 @@ public abstract class AbstractCardTest extends AbstractCardTestBase { throws CancelledException, InterruptedException { try { - signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR, null); + signatureCard.getCertificate(KeyboxName.CERTIFIED_KEYPAIR, null); assertTrue(false); return null; } catch (SignatureCardException e) { @@ -217,7 +217,7 @@ public abstract class AbstractCardTest extends AbstractCardTestBase { }; signatureCard.createSignature(new ByteArrayInputStream(MOCCA), - KeyboxName.CERITIFIED_KEYPAIR, pinProvider, null); + KeyboxName.CERTIFIED_KEYPAIR, pinProvider, null); } diff --git a/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractInvalidCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractInvalidCardTest.java index d9aa4b87..e586f951 100644 --- a/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractInvalidCardTest.java +++ b/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractInvalidCardTest.java @@ -50,7 +50,7 @@ public abstract class AbstractInvalidCardTest extends AbstractCardTestBase { } try { - signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR, null); + signatureCard.getCertificate(KeyboxName.CERTIFIED_KEYPAIR, null); fail(); } catch (SignatureCardException e) { // expected diff --git a/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractNotActivatedCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractNotActivatedCardTest.java index 53eb6692..fb86a773 100644 --- a/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractNotActivatedCardTest.java +++ b/smcc/src/test/java/at/gv/egiz/smcc/test/AbstractNotActivatedCardTest.java @@ -56,7 +56,7 @@ public abstract class AbstractNotActivatedCardTest extends AbstractCardTestBase } try { - signatureCard.getCertificate(KeyboxName.CERITIFIED_KEYPAIR, null); + signatureCard.getCertificate(KeyboxName.CERTIFIED_KEYPAIR, null); fail(); } catch (NotActivatedException e) { // expected -- cgit v1.2.3