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

Simplify install process

Browse Source
This commit is contained in:
Arnaud Fontaine
2016-11-21 18:26:39 +01:00
parent f4785eced8
commit b3f8ab7bc5
1 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/fr/anssi/smartpgp/SmartPGPApplet.java
View File

@@ -33,45 +33,16 @@ public final class SmartPGPApplet extends Applet {
private final Transients transients;
private final byte aid_length;
public SmartPGPApplet(final byte aid_len) {
public SmartPGPApplet() {
ec = new ECCurves();
data = new Persistent();
transients = new Transients();
sm = new SecureMessaging(transients);
aid_length = aid_len;
}
public static final void install(byte[] buf, short off, byte len) {
final short boff = off;
off += (short)(buf[boff] + 1);
off += (short)(buf[off] + 1);
final short data_len_off = off;
if(buf[data_len_off] != 4) {
ISOException.throwIt(ISO7816.SW_FUNC_NOT_SUPPORTED);
return;
}
final byte[] aid = new byte[(short)(buf[boff] + buf[data_len_off] + 2)];
off = 0;
off = Util.arrayCopyNonAtomic(buf, (short)(boff + 1),
aid, off,
buf[boff]);
off = Util.arrayCopyNonAtomic(buf, (short)(data_len_off + 1),
aid, off,
buf[data_len_off]);
off = Util.arrayFillNonAtomic(buf, off, (byte)2, (byte)0);
new SmartPGPApplet((byte)off).register(aid, (short)0, (byte)off);
new SmartPGPApplet().register();
}
private final PGPKey currentTagOccurenceToKey() {
@@ -395,13 +366,14 @@ public final class SmartPGPApplet extends Applet {
1 + 1 + (3 * Constants.FINGERPRINT_SIZE) +
1 + 1 + (3 * Constants.GENERATION_DATE_SIZE));
final byte aid_length = JCSystem.getAID().getBytes(buf, off);
buf[off++] = (byte)Constants.TAG_APPLICATION_RELATED_DATA;
off = Common.writeLength(buf, off, (short)(tlen + 1 + aid_length + 2 + 1 + Constants.HISTORICAL_BYTES.length));
buf[off++] = (byte)Constants.TAG_AID;
off = Common.writeLength(buf, off, aid_length);
JCSystem.getAID().getBytes(buf, off);
off += aid_length;
off += JCSystem.getAID().getBytes(buf, off);
off = Util.setShort(buf, off, Constants.TAG_HISTORICAL_BYTES_CARD_SERVICE_CARD_CAPABILITIES);
off = Common.writeLength(buf, off, (short)Constants.HISTORICAL_BYTES.length);
off = Util.arrayCopyNonAtomic(Constants.HISTORICAL_BYTES, (short)0,