summaryrefslogtreecommitdiff
path: root/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'smcc/src/test/java/at/gv/egiz/smcc/CardTest.java')
-rw-r--r--smcc/src/test/java/at/gv/egiz/smcc/CardTest.java62
1 files changed, 26 insertions, 36 deletions
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java
index 2a55357d..b3bd07ab 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/CardTest.java
@@ -18,6 +18,8 @@ package at.gv.egiz.smcc;
import static org.junit.Assert.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -178,13 +180,10 @@ public abstract class CardTest {
@Test(expected = CancelledException.class)
public void testSignSIGCancel() throws SignatureCardException,
InterruptedException, CardNotSupportedException,
- NoSuchAlgorithmException, UnsupportedEncodingException {
+ NoSuchAlgorithmException, IOException {
SignatureCard signatureCard = createSignatureCard();
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] hash = md.digest("MOCCA".getBytes("ASCII"));
-
PINProvider pinProvider = new PINProvider() {
@Override
public char[] providePIN(PINSpec spec, int retries)
@@ -193,21 +192,19 @@ public abstract class CardTest {
}
};
- signatureCard.createSignature(hash, KeyboxName.SECURE_SIGNATURE_KEYPAIR,
- pinProvider);
+ signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
+ .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR, pinProvider,
+ null);
}
@Test(expected = CancelledException.class)
public void testSignDECCancel() throws SignatureCardException,
InterruptedException, CardNotSupportedException,
- NoSuchAlgorithmException, UnsupportedEncodingException {
+ NoSuchAlgorithmException, IOException {
SignatureCard signatureCard = createSignatureCard();
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] hash = md.digest("MOCCA".getBytes("ASCII"));
-
PINProvider pinProvider = new PINProvider() {
@Override
public char[] providePIN(PINSpec spec, int retries)
@@ -216,21 +213,19 @@ public abstract class CardTest {
}
};
- signatureCard.createSignature(hash, KeyboxName.CERITIFIED_KEYPAIR,
- pinProvider);
+ signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
+ .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
+ pinProvider, null);
}
@Test(expected = InterruptedException.class)
public void testSignSIGInterrrupted() throws SignatureCardException,
InterruptedException, CardNotSupportedException,
- NoSuchAlgorithmException, UnsupportedEncodingException {
+ NoSuchAlgorithmException, IOException {
SignatureCard signatureCard = createSignatureCard();
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] hash = md.digest("MOCCA".getBytes("ASCII"));
-
PINProvider pinProvider = new PINProvider() {
@Override
public char[] providePIN(PINSpec spec, int retries)
@@ -239,21 +234,19 @@ public abstract class CardTest {
}
};
- signatureCard.createSignature(hash, KeyboxName.SECURE_SIGNATURE_KEYPAIR,
- pinProvider);
+ signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
+ .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR,
+ pinProvider, null);
}
@Test(expected = InterruptedException.class)
public void testSignDECInterrrupted() throws SignatureCardException,
InterruptedException, CardNotSupportedException,
- NoSuchAlgorithmException, UnsupportedEncodingException {
+ NoSuchAlgorithmException, IOException {
SignatureCard signatureCard = createSignatureCard();
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] hash = md.digest("MOCCA".getBytes("ASCII"));
-
PINProvider pinProvider = new PINProvider() {
@Override
public char[] providePIN(PINSpec spec, int retries)
@@ -262,21 +255,19 @@ public abstract class CardTest {
}
};
- signatureCard.createSignature(hash, KeyboxName.CERITIFIED_KEYPAIR,
- pinProvider);
+ signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
+ .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
+ pinProvider, null);
}
@Test(expected = CancelledException.class)
public void testSignSIGConcurrent() throws SignatureCardException,
InterruptedException, CardNotSupportedException,
- NoSuchAlgorithmException, UnsupportedEncodingException {
+ NoSuchAlgorithmException, IOException {
final SignatureCard signatureCard = createSignatureCard();
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] hash = md.digest("MOCCA".getBytes("ASCII"));
-
PINProvider pinProvider = new PINProvider() {
@Override
public char[] providePIN(PINSpec spec, int retries)
@@ -294,21 +285,19 @@ public abstract class CardTest {
}
};
- signatureCard.createSignature(hash, KeyboxName.SECURE_SIGNATURE_KEYPAIR,
- pinProvider);
+ signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
+ .getBytes("ASCII")), KeyboxName.SECURE_SIGNATURE_KEYPAIR,
+ pinProvider, null);
}
@Test(expected = CancelledException.class)
public void testSignDECConcurrent() throws SignatureCardException,
InterruptedException, CardNotSupportedException,
- NoSuchAlgorithmException, UnsupportedEncodingException {
+ NoSuchAlgorithmException, IOException {
final SignatureCard signatureCard = createSignatureCard();
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] hash = md.digest("MOCCA".getBytes("ASCII"));
-
PINProvider pinProvider = new PINProvider() {
@Override
public char[] providePIN(PINSpec spec, int retries)
@@ -326,8 +315,9 @@ public abstract class CardTest {
}
};
- signatureCard.createSignature(hash, KeyboxName.CERITIFIED_KEYPAIR,
- pinProvider);
+ signatureCard.createSignature(new ByteArrayInputStream("MOCCA"
+ .getBytes("ASCII")), KeyboxName.CERITIFIED_KEYPAIR,
+ pinProvider, null);
}