[Fedora-directory-commits] coolkey/applet/src/com/redhat/ckey/applet ASN1.java, 1.1, 1.2 CardEdge.java, 1.1, 1.2 MemoryManager.java, 1.1, 1.2 ObjectManager.java, 1.1, 1.2

[Robert Relyea (rrelyea)]

Author: rrelyea

Update of /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22105

Modified Files:
	ASN1.java CardEdge.java MemoryManager.java ObjectManager.java 
Log Message:

Update package names, fix compile issues


Index: ASN1.java
===================================================================
RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/ASN1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ASN1.java	18 Aug 2006 18:37:13 -0000	1.1
+++ ASN1.java	4 Oct 2006 17:35:18 -0000	1.2
@@ -49,7 +49,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // END LICENSE_BLOCK
 
-package com.redhat.nkey.applet;
+package com.redhat.ckey.applet;
 
 import javacard.framework.ISOException;
 import javacard.framework.JCSystem;


Index: CardEdge.java
===================================================================
RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/CardEdge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CardEdge.java	18 Aug 2006 18:37:13 -0000	1.1
+++ CardEdge.java	4 Oct 2006 17:35:18 -0000	1.2
@@ -59,7 +59,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // END LICENSE_BLOCK
 
-package com.redhat.nkey.applet;
+package com.redhat.ckey.applet;
 
 import javacard.framework.*;
 import javacard.security.*;
@@ -68,7 +68,7 @@
 import visa.openplatform.ProviderSecurityDomain;
 import visa.openplatform.OPSystem;
 
-// Referenced classes of package com.redhat.nkey.applet:
+// Referenced classes of package com.redhat.ckey.applet:
 //	    MemoryManager, ObjectManager, ASN1
 
 /**
@@ -123,8 +123,8 @@
     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) 0x4472;
-    private static final short BUILDID_MINOR = (short) 0x4aa7;
+    private static final short BUILDID_MAJOR = (short) 0x4523;
+    private static final short BUILDID_MINOR = (short) 0xee54;
     private static final short ZEROS = 0;
 
     // * Enable pin size check
@@ -2343,9 +2343,9 @@
 	    ISOException.throwIt(SW_OPERATION_NOT_ALLOWED);
 	}
 	create_object_ACL = Util.getShort(buffer, ISO7816.OFFSET_CDATA);
-	create_key_ACL = Util.getShort(buffer, (short)ISO7816.OFFSET_CDATA + 2);
-	create_pin_ACL = Util.getShort(buffer, (short)ISO7816.OFFSET_CDATA + 4);
-	enable_ACL_change = buffer[ISO719.OFFSET_CDATA+6];
+	create_key_ACL = Util.getShort(buffer,(short)(ISO7816.OFFSET_CDATA+2));
+	create_pin_ACL = Util.getShort(buffer,(short)(ISO7816.OFFSET_CDATA+4));
+	enable_ACL_change = buffer[ISO7816.OFFSET_CDATA+6];
 	isWritable = 0;
 	if (((create_object_ACL & 0xff) != 0) &&
 	    			((create_key_ACL & 0xff) != 0)) {


Index: MemoryManager.java
===================================================================
RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/MemoryManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemoryManager.java	18 Aug 2006 18:37:13 -0000	1.1
+++ MemoryManager.java	4 Oct 2006 17:35:18 -0000	1.2
@@ -56,7 +56,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // END LICENSE_BLOCK
 
-package com.redhat.nkey.applet;
+package com.redhat.ckey.applet;
 
 import javacard.framework.Util;
 


Index: ObjectManager.java
===================================================================
RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/ObjectManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectManager.java	18 Aug 2006 18:37:13 -0000	1.1
+++ ObjectManager.java	4 Oct 2006 17:35:18 -0000	1.2
@@ -57,12 +57,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // END LICENSE_BLOCK
 
-package com.redhat.nkey.applet;
+package com.redhat.ckey.applet;
 
 import javacard.framework.ISOException;
 import javacard.framework.Util;
 
-// Referenced classes of package com.redhat.nkey.applet:
+// Referenced classes of package com.redhat.ckey.applet:
 //			MemoryManager
 
 /**