c0de/SmartPGP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove checkPinFormat2 method

Browse Source
This commit is contained in:
Arnaud Fontaine
2018-11-30 13:42:10 +01:00
parent 44516dd79e
commit 2eec3e2f3f
1 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/fr/anssi/smartpgp/Common.java
View File

@@ -39,62 +39,6 @@ public final class Common {
} }
} }
protected static final void checkPinFormat2(final byte[] buf,
short off,
short lc,
final short minlen,
final short maxlen) {
if(lc != (short)8) {
ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
return;
}
if((buf[off] & (byte)0xf0) != (byte)0x20) {
ISOException.throwIt(ISO7816.SW_WRONG_DATA);
return;
}
lc = (byte)(buf[off++] & (byte)0xf);
if((lc < minlen) || (lc > maxlen)) {
ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
return;
}
for(short i = 0; i < lc; ++i) {
byte value;
if((byte)(i & (byte)0x1) == (byte)0) {
value = (byte)(buf[off] & (byte)0xf0);
value >>= 4;
} else {
value = (byte)(buf[off] & (byte)0x0f);
++off;
}
if((value < (byte)0) || (value > (byte)9)) {
ISOException.throwIt(ISO7816.SW_WRONG_DATA);
return;
}
}
for(short i = lc; i < (byte)14; ++i) {
byte value;
if((byte)(i & (byte)0x1) == (byte)0) {
value = (byte)(buf[off] & (byte)0xf0);
value >>= 4;
} else {
value = (byte)(buf[off] & (byte)0x0f);
++off;
}
if(value != (byte)0x0f) {
ISOException.throwIt(ISO7816.SW_WRONG_DATA);
return;
}
}
}
protected static final short writeLength(final byte[] buf, short off, final short len) { protected static final short writeLength(final byte[] buf, short off, final short len) {
if(len > 0xff) { if(len > 0xff) {
buf[off] = (byte)0x82; buf[off] = (byte)0x82;