Merge branch 'dev'

Author: non-bin

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+  "java.project.sourcePaths": [
+    "src"
+  ],
+  "java.project.referencedLibraries": [
+    "lib/**/*.jar",
+    "ext/javacard-sdks/jc310r20210706_kit/lib/api_classic-3.0.4.jar",
+    "ext/javacard-sdks/jc310r20210706_kit/lib/api_classic_annotations-3.0.4.jar"
+  ]
+}

README.md

@@ -3,11 +3,28 @@
 A (hopfully) highly feature-packed NDEF applet, [available through Fidesmo](https://apps.fidesmo.com/8210647A)
 A constant work in progress, but I use it personally.
 
-### Credits
+## Building
 
-This project is based on [OpenJavaCard NDEF](https://github.com/OpenJavaCard/openjavacard-ndef), which contains some code from the fine [IsoApplet](https://github.com/philipWendland/IsoApplet).
+Install [Apache Ant](https://ant.apache.org/) from the wesite or through your package manager, change any properties at the top of build.xml, then run:
+````
+ant clean
+ant build
+````
 
-### Legal
+The resulting cap file will be at `build/main.cap`.
+
+The main ant targets are:
+
+ - `clean`: Delete build files and extensions
+ - `build`: Build the applet (download ant-javacard if nesssary)
+ - `deploy`: Deploy the applet to Fidesmo, requires the FIDESMO_AUTH env variable (download fdsm if nesssary)
+
+## Credits
+
+ - Based on [OpenJavaCard NDEF](https://github.com/OpenJavaCard/openjavacard-ndef), which contains some code from the fine [IsoApplet by philipWendland](https://github.com/philipWendland/IsoApplet)
+ - Uses code from [htop_via_ndef by Petris](https://github.com/petrs/hotp_via_ndef)
+
+## Legal
 
     coolNDEFthing - a javacard applet that provides services through NDEF
     Copyright (C) 2022  non-bin
@@ -24,10 +41,3 @@ This project is based on [OpenJavaCard NDEF](https://github.com/OpenJavaCard/ope
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-### Standards
-
-The applet is intended to comply with the following standards, where applicable:
- * ISO 7816-4 Organization, security and commands for interchange (Release 2013)
- * GlobalPlatform Card Specification (Version 2.1)
- * NFC Forum Type 4 Tag Operation Specification (Version 2.0)

build.xml

@@ -5,41 +5,41 @@
 
     <description>JavaCard implementation of an NDEF Type 4 tag, plus some extras</description>
 
-    <property name="ext.ant-javacard" value="ext/ant-javacard"/>
-
-    <property name="sdk.globalplatform" value="ext/globalplatform-exports"/>
-    <property name="sdk.jckit" value="ext/javacard-sdks/jc305u3_kit"/>
-    <property name="sdk.jctarget" value="ext/javacard-sdks/jc304_kit"/>
-
     <property name="aid.NDEF" value="D2760000850101"/>
     <property name="fidesmo.appID" value="8210647A"/>
 
-    <taskdef name="javacard"
-             classpath="${ext.ant-javacard}/ant-javacard.jar"
-             classname="pro.javacard.ant.JavaCard"/>
+    <property name="sdk.jckit" value="ext/javacard-sdks/jc310r20210706_kit"/>
+    <property name="sdk.jctarget" value="ext/javacard-sdks/jc304_kit"/>
+    <!-- Remember to update the java project referenced libraries -->
+
+    <property name="ext.ant-javacard" value="ext/ant-javacard"/>
 
     <target name="default">
-        <antcall target="prepare" />
         <antcall target="build" />
-        <antcall target="deploy" />
     </target>
 
-    <target name="clean" description="Delete build output">
+    <target name="clean" description="Delete build output and downloaded libs">
         <delete dir="build"/>
         <delete dir="ext/ant-javacard"/>
         <delete dir="ext/fidesmo"/>
+
+        <mkdir dir="build"/>
     </target>
 
-    <target name="prepare" description="Prepare build">
-        <mkdir dir="build/javacard"/>
+    <target name="ant-javacard" description="Include ant-javacard">
         <mkdir dir="ext/ant-javacard"/>
-        <mkdir dir="ext/fidesmo"/>
-
         <get src="https://github.com/martinpaljak/ant-javacard/releases/latest/download/ant-javacard.jar" verbose="on" dest="ext/ant-javacard/ant-javacard.jar" skipexisting="true"/>
+        <taskdef name="javacard"
+                 classpath="${ext.ant-javacard}/ant-javacard.jar"
+                 classname="pro.javacard.ant.JavaCard"/>
+    </target>
+
+    <target name="fdsm" description="Include fdsm">
+        <mkdir dir="ext/fidesmo"/>
         <get src="https://github.com/fidesmo/fdsm/releases/latest/download/fdsm.jar" verbose="on" dest="ext/fidesmo/fdsm.jar" skipexisting="true"/>
     </target>
 
-    <target name="deploy" description="Deploy to Fidesmo">
+    <target name="deploy" description="Deploy to Fidesmo" depends="fdsm">
         <java jar="ext/fidesmo/fdsm.jar"
               fork="true">
             <arg line="--verbose"/>
@@ -49,12 +49,12 @@
         </java>
     </target>
 
-    <target name="build">
+    <target name="build" depends="ant-javacard">
         <javacard jckit="${sdk.jckit}">
             <cap targetsdk="${sdk.jctarget}"
                  output="build/main.cap"
                  jar="build/main.jar"
-                 sources="src/main/java"
+                 sources="src"
                  aid="${aid.NDEF}"
                  version="1.0">
                 <applet aid="${aid.NDEF}01"

…/net/jacka/coolNDEFthing/NdefApplet.java …/net/jacka/coolNDEFthing/NdefApplet.javasrc/main/java/au/net/jacka/coolNDEFthing/NdefApplet.java renamed to src/au/net/jacka/coolNDEFthing/NdefApplet.java src/main/java/au/net/jacka/coolNDEFthing/NdefApplet.java renamed to src/au/net/jacka/coolNDEFthing/NdefApplet.java

@@ -80,8 +80,8 @@ public final class NdefApplet extends Applet {
     private static final byte CC_LEN_NDEF_FILE_CONTROL = 6;
 
     /* Constants related to file control data in capabilities */
-    private static final byte FC_OFF_FILE_ID      = 0x00;
-    private static final byte FC_OFF_SIZE         = 0x02;
+    // private static final byte FC_OFF_FILE_ID      = 0x00;
+    // private static final byte FC_OFF_SIZE         = 0x02;
     private static final byte FC_OFF_READ_ACCESS  = 0x04;
     private static final byte FC_OFF_WRITE_ACCESS = 0x05;
 
@@ -182,7 +182,7 @@ public static void install(byte[] buf, short off, byte len) {
         pos += lenAID;
         // find control information (ignored)
         byte  lenCI = buf[pos++];
-        short offCI = pos;
+        // short offCI = pos;
         pos += lenCI;
         // find applet data
         byte  lenAD = buf[pos++];