summaryrefslogtreecommitdiff
path: root/applet
diff options
context:
space:
mode:
authorrrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0>2006-10-04 17:35:18 +0000
committerrrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0>2006-10-04 17:35:18 +0000
commite0d85a32f47019379c5b512bb861e21d30d8f001 (patch)
tree5f5b0701388c40560e3fece1fd3d5fc771fe2d05 /applet
parentab3ee25a58eb8e5b4e0a9c29fc43c7df54befca3 (diff)
Update package names, fix compile issues
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@28 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
Diffstat (limited to 'applet')
-rw-r--r--applet/src/com/redhat/ckey/applet/ASN1.java2
-rw-r--r--applet/src/com/redhat/ckey/applet/CardEdge.java14
-rw-r--r--applet/src/com/redhat/ckey/applet/MemoryManager.java2
-rw-r--r--applet/src/com/redhat/ckey/applet/ObjectManager.java4
4 files changed, 11 insertions, 11 deletions
diff --git a/applet/src/com/redhat/ckey/applet/ASN1.java b/applet/src/com/redhat/ckey/applet/ASN1.java
index c5fbec6..c3567fa 100644
--- a/applet/src/com/redhat/ckey/applet/ASN1.java
+++ b/applet/src/com/redhat/ckey/applet/ASN1.java
@@ -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;
diff --git a/applet/src/com/redhat/ckey/applet/CardEdge.java b/applet/src/com/redhat/ckey/applet/CardEdge.java
index 5fa9299..c635dd6 100644
--- a/applet/src/com/redhat/ckey/applet/CardEdge.java
+++ b/applet/src/com/redhat/ckey/applet/CardEdge.java
@@ -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 javacardx.crypto.Cipher;
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 @@ public class CardEdge extends Applet
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 @@ public class CardEdge extends Applet
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)) {
diff --git a/applet/src/com/redhat/ckey/applet/MemoryManager.java b/applet/src/com/redhat/ckey/applet/MemoryManager.java
index 7d83cc8..1232f56 100644
--- a/applet/src/com/redhat/ckey/applet/MemoryManager.java
+++ b/applet/src/com/redhat/ckey/applet/MemoryManager.java
@@ -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;
diff --git a/applet/src/com/redhat/ckey/applet/ObjectManager.java b/applet/src/com/redhat/ckey/applet/ObjectManager.java
index 2f1f1f4..ee03761 100644
--- a/applet/src/com/redhat/ckey/applet/ObjectManager.java
+++ b/applet/src/com/redhat/ckey/applet/ObjectManager.java
@@ -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
/**