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

Remove PIN2 format support

Browse Source
This commit is contained in:
Arnaud Fontaine
2018-05-23 17:09:23 +02:00
parent 79d9342827
commit 981899718f
3 changed files with 36 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/fr/anssi/smartpgp/Constants.java
View File

@@ -39,48 +39,24 @@ public final class Constants {
protected static final byte USER_PIN_RETRY_COUNT = 3;
protected static final byte USER_PIN_MIN_SIZE = 0x06;
protected static final byte USER_PIN_MAX_SIZE = 0x7f; /* max is 0x7f because PIN format 2 */
protected static final byte USER_PIN_MIN_SIZE_FORMAT_2 = 6;
protected static final byte USER_PIN_MAX_SIZE_FORMAT_2 = 12;
protected static final byte[] USER_PIN_DEFAULT = {
(byte)0x31, (byte)0x32, (byte)0x33, (byte)0x34,
(byte)0x35, (byte)0x36
(byte)0x31, (byte)0x32, (byte)0x33, (byte)0x34,
(byte)0x35, (byte)0x36
};
protected static final boolean USER_PIN_DEFAULT_IS_FORMAT_2 = false;
/*
protected static final byte[] USER_PIN_DEFAULT = {
(byte)0x26,
(byte)0x12, (byte)0x34, (byte)0x56, (byte)0xff, (byte)0xff,
(byte)0xff, (byte)0xff
};
protected static final boolean USER_PIN_DEFAULT_IS_FORMAT_2 = true;
*/
protected static final boolean USER_PIN_DEFAULT_FORCE_VERIFY_SIGNATURE = true;
protected static final byte USER_PUK_RETRY_COUNT = 3;
protected static final byte USER_PUK_MIN_SIZE = 0x08;
protected static final byte USER_PUK_MAX_SIZE = 0x7f; /* max is 0x7f because PIN format 2 */
protected static final byte USER_PUK_MIN_SIZE_FORMAT_2 = 8;
protected static final byte USER_PUK_MAX_SIZE_FORMAT_2 = 12;
protected static final byte ADMIN_PIN_RETRY_COUNT = 3;
protected static final byte ADMIN_PIN_MIN_SIZE = 0x08;
protected static final byte ADMIN_PIN_MAX_SIZE = 0x7f; /* max is 0x7f because PIN format 2 */
protected static final byte ADMIN_PIN_MIN_SIZE_FORMAT_2 = 8;
protected static final byte ADMIN_PIN_MAX_SIZE_FORMAT_2 = 12;
protected static final byte[] ADMIN_PIN_DEFAULT = {
(byte)0x31, (byte)0x32, (byte)0x33, (byte)0x34,
(byte)0x35, (byte)0x36, (byte)0x37, (byte)0x38
(byte)0x31, (byte)0x32, (byte)0x33, (byte)0x34,
(byte)0x35, (byte)0x36, (byte)0x37, (byte)0x38
};
protected static final boolean ADMIN_PIN_DEFAULT_IS_FORMAT_2 = false;
/*
protected static final byte[] ADMIN_PIN_DEFAULT = {
(byte)0x28,
(byte)0x12, (byte)0x34, (byte)0x56, (byte)0x78, (byte)0xff,
(byte)0xff, (byte)0xff
};
protected static final boolean ADMIN_PIN_DEFAULT_IS_FORMAT_2 = true;
*/
protected static final byte FINGERPRINT_SIZE = 20;
@@ -191,7 +167,7 @@ public final class Constants {
(byte)0x00, (byte)0x20, /* max length get challenge */
(byte)0x04, (byte)0x80, /* max length of carholder certificate */
(byte)0x00, (byte)0xff, /* max length of special DOs (private, login, url, KDF-DO) */
(byte)0x01, /* PIN format 2 is supported */
(byte)0x00, /* PIN format 2 is not supported */
(byte)0x00 /* MSE not supported */
};