Skip to content

Commit 07c7f89

Browse files
committed
Address #391: DMTokenizer can be extended.
1 parent 17e7d6c commit 07c7f89

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

library/src/main/java/pro/javacard/gp/DMTokenizer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public abstract class DMTokenizer {
3737
private static final Logger log = LoggerFactory.getLogger(DMTokenizer.class);
3838

39-
private DMTokenizer() {
39+
protected DMTokenizer() {
4040
}
4141

4242
abstract protected byte[] getToken(CommandAPDU apdu);
@@ -47,9 +47,9 @@ public CommandAPDU tokenize(CommandAPDU apdu) {
4747
try {
4848
ByteArrayOutputStream data = new ByteArrayOutputStream();
4949
data.write(apdu.getData());
50-
if (!canTokenize(apdu))
50+
if (!canTokenize(apdu)) {
5151
throw new IllegalArgumentException("No DM token for APDU: " + apdu);
52-
52+
}
5353
byte[] token = getToken(apdu);
5454

5555
if (token.length > 0) {
@@ -59,8 +59,9 @@ public CommandAPDU tokenize(CommandAPDU apdu) {
5959
data.write(GPUtils.encodeLength(token.length));
6060
data.write(token);
6161
} else {
62-
if (apdu.getINS() != 0xE4)
62+
if (apdu.getINS() != 0xE4) {
6363
data.write(0); // No token in LV chain and no tag in TLV case
64+
}
6465
}
6566
return new CommandAPDU(apdu.getCLA(), apdu.getINS(), apdu.getP1(), apdu.getP2(), data.toByteArray()); // FIXME: Le handling
6667
} catch (IOException e) {

0 commit comments

Comments
 (0)