Author: jmagne
Update of /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1416
Modified Files:
Tag: COOLKEY_330J_BRANCH
CardEdge.java
Log Message:
Fix to allow tokens with small amounts of volatile memory to run. Bug#480111.
Index: CardEdge.java
===================================================================
RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/CardEdge.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- CardEdge.java 12 Nov 2007 19:24:51 -0000 1.4
+++ CardEdge.java 24 Jan 2009 00:54:20 -0000 1.4.2.1
@@ -122,9 +122,9 @@
private static final byte VERSION_PROTOCOL_MAJOR = 1;
private static final byte VERSION_PROTOCOL_MINOR = 1;
private static final byte VERSION_APPLET_MAJOR = 1;
- private static final byte VERSION_APPLET_MINOR = 3;
- private static final short BUILDID_MAJOR = (short) 0x4734;
- private static final short BUILDID_MINOR = (short) 0xb002;
+ private static final byte VERSION_APPLET_MINOR = 4;
+ private static final short BUILDID_MAJOR = (short) 0x4979;
+ private static final short BUILDID_MINOR = (short) 0x178d;
private static final short ZEROS = 0;
// * Enable pin size check
@@ -484,6 +484,7 @@
private byte[] keyTries; // persistent
private byte[] issuerInfo; // persistent
+
/**
* Instance variable array declarations - TRANSIENT
* Allocated by JCSystem.makeTransientXxxxxArray calls below.
@@ -524,6 +525,7 @@
signatures = new Signature [MAX_NUM_KEYS];
default_nonce = new byte [NONCE_SIZE];
issuerInfo = new byte [ISSUER_INFO_SIZE];
+ iobuf = new byte [IOBUF_ALLOC];
for (byte i = 0; i < MAX_NUM_KEYS; i++) {
keyTries[i] = MAX_KEY_TRIES;
@@ -2792,8 +2794,8 @@
private void initTransient()
{
- iobuf = JCSystem.makeTransientByteArray(IOBUF_ALLOC,
- JCSystem.CLEAR_ON_DESELECT);
+ //iobuf = JCSystem.makeTransientByteArray(IOBUF_ALLOC,
+ // JCSystem.CLEAR_ON_DESELECT);
ciph_dirs = JCSystem.makeTransientByteArray(MAX_NUM_KEYS,
JCSystem.CLEAR_ON_DESELECT);
//
Show replies by date