summaryrefslogtreecommitdiff
path: root/smcc/src/test/java/at/gv/egiz/smcc/starcos
diff options
context:
space:
mode:
Diffstat (limited to 'smcc/src/test/java/at/gv/egiz/smcc/starcos')
-rw-r--r--smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java4
-rw-r--r--smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java30
-rw-r--r--smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java24
3 files changed, 28 insertions, 30 deletions
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java
index 2e0c54eb..f37f12dd 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardChannelEmul.java
@@ -364,7 +364,7 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
}
PIN pin;
- if (currentAppl != null) {
+ if ((command.getP2() & 0x80) > 0 && currentAppl != null) {
pin = currentAppl.pins.get(command.getP2());
} else {
pin = globalPins.get(command.getP2());
@@ -388,7 +388,7 @@ public class STARCOSCardChannelEmul extends CardChannelEmul {
if (response.getSW() == 0x9000) {
PIN pin;
- if (currentAppl != null) {
+ if ((command.getP2() & 0x80) > 0 && currentAppl != null) {
pin = currentAppl.pins.get(command.getP2());
} else {
pin = globalPins.get(command.getP2());
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
index 154884d4..82e48d64 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSCardTest.java
@@ -41,7 +41,7 @@ import at.gv.egiz.smcc.NotActivatedException;
import at.gv.egiz.smcc.PIN;
import at.gv.egiz.smcc.PINFormatException;
import at.gv.egiz.smcc.PINMgmtSignatureCard;
-import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.PinInfo;
import at.gv.egiz.smcc.SignatureCard;
import at.gv.egiz.smcc.SignatureCardException;
import at.gv.egiz.smcc.SignatureCardFactory;
@@ -258,17 +258,17 @@ public class STARCOSCardTest extends CardTest {
PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
STARCOSCardEmul.DEFAULT_SS_PIN, STARCOSCardEmul.DEFAULT_SS_PIN, PIN.STATE_RESET);
- for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+ for (PinInfo pinInfo : signatureCard.getPinInfos()) {
char[] pin = "123456".toCharArray();
- for (int i = pinSpec.getMinLength(); i <= pinSpec.getMaxLength(); i++) {
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+ for (int i = pinInfo.getMinLength(); i <= pinInfo.getMaxLength(); i++) {
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
char[] newPin = new char[i];
Arrays.fill(newPin, '0');
signatureCard
- .changePIN(pinSpec, new ChangePINProvider(pin, newPin));
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(newPin));
+ .changePIN(pinInfo, new ChangePINProvider(pin, newPin));
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(newPin));
pin = newPin;
}
}
@@ -283,20 +283,20 @@ public class STARCOSCardTest extends CardTest {
PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
null, null, PIN.STATE_PIN_NOTACTIVE);
- for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+ for (PinInfo pinInfo : signatureCard.getPinInfos()) {
- char[] pin = "1234567890".substring(0, pinSpec.getMinLength()).toCharArray();
+ char[] pin = "1234567890".substring(0, pinInfo.getMinLength()).toCharArray();
boolean notActive = false;
try {
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
} catch (NotActivatedException ex) {
notActive = true;
}
assertTrue(notActive);
- signatureCard.activatePIN(pinSpec, new ChangePINProvider(null, pin));
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+ signatureCard.activatePIN(pinInfo, new ChangePINProvider(null, pin));
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
}
}
@@ -307,13 +307,13 @@ public class STARCOSCardTest extends CardTest {
PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
- for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+ for (PinInfo pinInfo : signatureCard.getPinInfos()) {
char[] invalidPin = "999999".toCharArray();
int numInvalidTries = 2;
InvalidPINProvider invalidPinProvider = new InvalidPINProvider(invalidPin, numInvalidTries);
try {
- signatureCard.verifyPIN(pinSpec, invalidPinProvider);
+ signatureCard.verifyPIN(pinInfo, invalidPinProvider);
} catch (CancelledException ex) {
} finally {
assertTrue(invalidPinProvider.getProvided() == numInvalidTries);
@@ -328,7 +328,7 @@ public class STARCOSCardTest extends CardTest {
PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard();
- for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+ for (PinInfo pinInfo : signatureCard.getPinInfos()) {
char[] invalidPin = "999999".toCharArray();
int numInvalidTries = 2;
@@ -336,7 +336,7 @@ public class STARCOSCardTest extends CardTest {
new InvalidChangePINProvider(invalidPin, invalidPin, numInvalidTries);
try {
- signatureCard.changePIN(pinSpec, invalidPinProvider);
+ signatureCard.changePIN(pinInfo, invalidPinProvider);
} catch (CancelledException ex) {
} finally {
assertTrue(invalidPinProvider.getProvided() == numInvalidTries);
diff --git a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java
index 06744c82..1d8507b2 100644
--- a/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java
+++ b/smcc/src/test/java/at/gv/egiz/smcc/starcos/STARCOSG3CardTest.java
@@ -24,7 +24,6 @@ import java.util.Arrays;
import org.junit.Test;
import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.CardEmul;
import at.gv.egiz.smcc.CardNotSupportedException;
import at.gv.egiz.smcc.CardTerminalEmul;
import at.gv.egiz.smcc.CardTest;
@@ -34,12 +33,11 @@ import at.gv.egiz.smcc.NotActivatedException;
import at.gv.egiz.smcc.PIN;
import at.gv.egiz.smcc.PINFormatException;
import at.gv.egiz.smcc.PINMgmtSignatureCard;
-import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.PinInfo;
import at.gv.egiz.smcc.SignatureCard;
import at.gv.egiz.smcc.SignatureCardException;
import at.gv.egiz.smcc.SignatureCardFactory;
import at.gv.egiz.smcc.pin.gui.SMCCTestPINProvider;
-import org.junit.Ignore;
public class STARCOSG3CardTest extends CardTest {
@@ -72,17 +70,17 @@ public class STARCOSG3CardTest extends CardTest {
PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
STARCOSG3CardEmul.DEFAULT_SS_PIN, STARCOSG3CardEmul.DEFAULT_SS_PIN, PIN.STATE_RESET);
- for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+ for (PinInfo pinInfo : signatureCard.getPinInfos()) {
char[] pin = "123456".toCharArray();
- for (int i = pinSpec.getMinLength(); i <= pinSpec.getMaxLength(); i++) {
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+ for (int i = pinInfo.getMinLength(); i <= pinInfo.getMaxLength(); i++) {
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
char[] newPin = new char[i];
Arrays.fill(newPin, '0');
signatureCard
- .changePIN(pinSpec, new ChangePINProvider(pin, newPin));
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(newPin));
+ .changePIN(pinInfo, new ChangePINProvider(pin, newPin));
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(newPin));
pin = newPin;
}
}
@@ -97,21 +95,21 @@ public class STARCOSG3CardTest extends CardTest {
PINMgmtSignatureCard signatureCard = (PINMgmtSignatureCard) createSignatureCard(
STARCOSG3CardEmul.TRANSPORT_SS_PIN, STARCOSG3CardEmul.TRANSPORT_SS_PIN, PIN.STATE_PIN_NOTACTIVE);
- for (PINSpec pinSpec : signatureCard.getPINSpecs()) {
+ for (PinInfo pinInfo : signatureCard.getPinInfos()) {
- char[] pin = "123456789".substring(0, pinSpec.getMinLength()).toCharArray();
+ char[] pin = "123456789".substring(0, pinInfo.getMinLength()).toCharArray();
char[] transportPIN = "123456".toCharArray();
boolean notActive = false;
try {
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
} catch (NotActivatedException ex) {
notActive = true;
}
assertTrue(notActive);
- signatureCard.activatePIN(pinSpec, new ChangePINProvider(transportPIN, pin));
- signatureCard.verifyPIN(pinSpec, new SMCCTestPINProvider(pin));
+ signatureCard.activatePIN(pinInfo, new ChangePINProvider(transportPIN, pin));
+ signatureCard.verifyPIN(pinInfo, new SMCCTestPINProvider(pin));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 09:31:16 +0000