Upgrade apdu4j

martinpaljak · Mar 30, 2016 · 770bceb · 770bceb
1 parent bc2d035
commit 770bceb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.classpath b/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="lib" path="lib/bcprov-jdk15on-154.jar"/>
 	<classpathentry kind="lib" path="lib/bcpkix-jdk15on-154.jar"/>
 	<classpathentry kind="lib" path="lib/jopt-simple-4.9.jar"/>
-	<classpathentry kind="lib" path="lib/apdu4j.jar"/>
+	<classpathentry kind="lib" path="lib/apdu4j-pcsc.jar"/>
 	<classpathentry kind="lib" path="lib/gp.jar"/>
 	<classpathentry kind="lib" path="lib/vjcre.jar"/>
 	<classpathentry kind="lib" path="lib/FakeEstEID.jar"/>

diff --git a/Manifest.mf b/Manifest.mf
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: org.esteid.hacker.CLI
-Class-Path: lib/bcpkix-jdk15on-154.jar lib/bcprov-jdk15on-154.jar lib/jopt-simple-4.9.jar lib/apdu4j.jar lib/gp.jar lib/vjcre.jar
+Class-Path: lib/bcpkix-jdk15on-154.jar lib/bcprov-jdk15on-154.jar lib/jopt-simple-4.9.jar lib/apdu4j-pcsc.jar lib/gp.jar lib/vjcre.jar
diff --git a/build.xml b/build.xml
@@ -9,17 +9,16 @@
     <get src="http://repo2.maven.org/maven2/org/slf4j/slf4j-simple/1.7.13/slf4j-simple-1.7.13.jar" dest="lib" verbose="true" skipexisting="true"/>
     <get src="http://downloads.bouncycastle.org/java/bcprov-jdk15on-154.jar" dest="lib" verbose="true" skipexisting="true"/>
     <get src="http://downloads.bouncycastle.org/java/bcpkix-jdk15on-154.jar" dest="lib" verbose="true" skipexisting="true"/>
-    <get src="https://github.com/martinpaljak/apdu4j/releases/download/v0.0.27/apdu4j.jar" dest="lib" verbose="true" skipexisting="true"/>
+    <get src="https://github.com/martinpaljak/apdu4j/releases/download/v0.0.34/apdu4j-pcsc.jar" dest="lib" verbose="true" skipexisting="true"/>
     <get src="https://github.com/martinpaljak/GlobalPlatformPro/releases/download/v0.3.7/gp.jar" dest="lib" verbose="true" skipexisting="true"/>
     <get src="https://github.com/martinpaljak/vJCRE/releases/download/r1/vjcre.jar" dest="lib" verbose="true" skipexisting="true"/>
     <get src="https://github.com/martinpaljak/esteid-applets/releases/download/v0.0.2/FakeEstEID.jar" dest="lib" verbose="true" skipexisting="true"/>
-
     <checksum algorithm="SHA-256" file="lib/jopt-simple-4.9.jar" property="26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5" verifyProperty="joptOK"/>
     <checksum algorithm="SHA-256" file="lib/slf4j-api-1.7.13.jar" property="20d68d0c2e4fb984ffc164852b8b68df49a2b8716076f576881bcef7649a0e35" verifyProperty="slfjapiOK"/>
     <checksum algorithm="SHA-256" file="lib/slf4j-simple-1.7.13.jar" property="4709c0b535057c6a9a794da9522b1291de9c72b6d61f41b7ecf63156bc7bee35" verifyProperty="slfjsimpleOK"/>
     <checksum algorithm="SHA-256" file="lib/bcprov-jdk15on-154.jar" property="d0ae14598f9c528d2ab7bb8ed00e785a5440f692712cd362d69328aba25efb57" verifyProperty="bouncy1OK"/>
     <checksum algorithm="SHA-256" file="lib/bcpkix-jdk15on-154.jar" property="d618dcfbf0337b91015b21d4b398175ae96382a82c7e1d6e8c657fcd236463c7" verifyProperty="bouncy2OK"/>
-    <checksum algorithm="SHA-256" file="lib/apdu4j.jar" property="be34feccb5bb654683e833e8079cb8d3d17925569caed28eeab25bdaa73dbaeb" verifyProperty="apduOK"/>
+    <checksum algorithm="SHA-256" file="lib/apdu4j-pcsc.jar" property="c83739847a7b1e323e4d0cad94fe50858ecc9435a59ee429d55ec02934d52a30" verifyProperty="apduOK"/>
     <checksum algorithm="SHA-256" file="lib/gp.jar" property="ec41e4294fe4277183254887da3303e1aba817a20d20c78713ef453b66f4595b" verifyProperty="gpOK"/>
     <checksum algorithm="SHA-256" file="lib/vjcre.jar" property="20260d4c63d54eba540eb6eee931b9bff9df0ad97823841848126ea36c04e6b4" verifyProperty="vjcreOK"/>
     <checksum algorithm="SHA-256" file="lib/FakeEstEID.jar" property="c6387f4750c286e3faf566bfac6acd53f46c327ee60f22e796700939c14bf2f5" verifyProperty="appletOK"/>
@@ -45,7 +44,7 @@
     <pathelement location="lib/bcprov-jdk15on-154.jar"/>
     <pathelement location="lib/bcpkix-jdk15on-154.jar"/>
     <pathelement location="lib/jopt-simple-4.9.jar"/>
-    <pathelement location="lib/apdu4j.jar"/>    
+    <pathelement location="lib/apdu4j-pcsc.jar"/>
     <pathelement location="lib/gp.jar"/>
     <pathelement location="lib/vjcre.jar"/>
     <pathelement location="lib/FakeEstEID.jar"/>

diff --git a/src/org/esteid/hacker/CLI.java b/src/org/esteid/hacker/CLI.java
@@ -264,7 +264,8 @@ public static void main(String argv[]) throws Exception {
 				term = TerminalFactory.getInstance("PC/SC", vre, new VJCREProvider()).terminals().list().get(0);
 			} else {
 				if (args.has(OPT_LIST)) {
-					TerminalFactory tf = TerminalManager.getTerminalFactory();
+					// Use the default
+					TerminalFactory tf = TerminalManager.getTerminalFactory(null);
 					CardTerminals terms = tf.terminals();
 					System.out.println("Found terminals: " + terms.list().size());
 					for (CardTerminal t: terms.list()) {
@@ -280,7 +281,7 @@ public static void main(String argv[]) throws Exception {
 					}
 				}
 				// Connect to the found reader.
-				term = TerminalManager.getTheReader();
+				term = TerminalManager.getTheReader(null);
 			}
 
 			if (args.has(OPT_DEBUG)) {