From 3efe0b4cf87443058bd750a8601d0f896819d2a6 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Mon, 19 Feb 2018 15:10:51 +0100 Subject: [PATCH 01/10] eclipse -> android studio step 1 --- .classpath | 7 ---- .gitignore | 3 -- .project | 33 ------------------ .../src/main/AndroidManifest.xml | 0 .../android/hellosmartcard/MainActivity.java | 0 .../src/main/res}/drawable-hdpi/icon.png | Bin .../src/main/res}/drawable-ldpi/icon.png | Bin .../src/main/res}/drawable-mdpi/icon.png | Bin {res => app/src/main/res}/layout/main.xml | 0 {res => app/src/main/res}/values/strings.xml | 0 project.properties | 16 --------- 11 files changed, 59 deletions(-) delete mode 100644 .classpath delete mode 100644 .gitignore delete mode 100644 .project rename AndroidManifest.xml => app/src/main/AndroidManifest.xml (100%) rename {src => app/src/main/java}/com/gieseckedevrient/android/hellosmartcard/MainActivity.java (100%) rename {res => app/src/main/res}/drawable-hdpi/icon.png (100%) rename {res => app/src/main/res}/drawable-ldpi/icon.png (100%) rename {res => app/src/main/res}/drawable-mdpi/icon.png (100%) rename {res => app/src/main/res}/layout/main.xml (100%) rename {res => app/src/main/res}/values/strings.xml (100%) delete mode 100644 project.properties diff --git a/.classpath b/.classpath deleted file mode 100644 index 6c635c0..0000000 --- a/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ff2422f..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/assets -/bin -/gen diff --git a/.project b/.project deleted file mode 100644 index e39595e..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - HelloSmartcard - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/src/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java similarity index 100% rename from src/com/gieseckedevrient/android/hellosmartcard/MainActivity.java rename to app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java diff --git a/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from res/drawable-hdpi/icon.png rename to app/src/main/res/drawable-hdpi/icon.png diff --git a/res/drawable-ldpi/icon.png b/app/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from res/drawable-ldpi/icon.png rename to app/src/main/res/drawable-ldpi/icon.png diff --git a/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from res/drawable-mdpi/icon.png rename to app/src/main/res/drawable-mdpi/icon.png diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to app/src/main/res/layout/main.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/project.properties b/project.properties deleted file mode 100644 index 7320fca..0000000 --- a/project.properties +++ /dev/null @@ -1,16 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=Giesecke & Devrient GmbH:Open Mobile API:15 From c12856aa1199c712e0ba4d7bcbbe4f0fbb21d299 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Mon, 19 Feb 2018 15:12:33 +0100 Subject: [PATCH 02/10] eclipse -> android studio step 2 --- .gitignore | 114 ++++++++++++++++ app/build.gradle | 21 +++ build.gradle | 15 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 160 +++++++++++++++++++++++ gradlew.bat | 90 +++++++++++++ settings.gradle | 1 + 8 files changed, 407 insertions(+) create mode 100644 .gitignore create mode 100644 app/build.gradle create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..37c3137 --- /dev/null +++ b/.gitignore @@ -0,0 +1,114 @@ + +# Created by https://www.gitignore.io/api/androidstudio + +### AndroidStudio ### +# Covers files to be ignored for android development using Android Studio. + +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle +.gradle/ +build/ + +# Signing files +.signing/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +captures/ +.navigation/ +*.ipr +*~ +*.swp + +# Android Patch +gen-external-apklibs + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# NDK +obj/ + +# IntelliJ IDEA +*.iml +*.iws +/out/ + +# https://stackoverflow.com/questions/26336709/android-studio-should-the-entire-idea-directory-be-in-git-ignore +.idea + +# Keystore files +*.jks + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Legacy Eclipse project files +.classpath +.project + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) +hs_err_pid* + +## Plugin-specific files: + + +# JIRA plugin +atlassian-ide-plugin.xml + + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +### AndroidStudio Patch ### +# Google Services plugin +google-services.json + +!/gradle/wrapper/gradle-wrapper.jar + +# End of https://www.gitignore.io/api/androidstudio diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..5187c3c --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,21 @@ +apply plugin: 'com.android.application' +android { + compileSdkVersion 'Giesecke Devrient GmbH:Open Mobile API:21' + buildToolsVersion "27.0.2" + + defaultConfig { + applicationId "com.gieseckedevrient.android.hellosmartcard" + minSdkVersion 4 + targetSdkVersion 15 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e4467f8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,15 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 GIT binary patch literal 53636 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ⅅ8zCNKueM5c!$)^mKpZNR!eIlFST57ePGQcqCqedAQ3UaUEzpjM--5V4YO zY22VxQm%$2NDnwfK+jkz=i2>NjAM6&P1DdcO<*Xs1-lzdXWn#LGSxwhPH7N%D8-zCgpFWt@`LgNYI+Fh^~nSiQmwH0^>E>*O$47MqfQza@Ce z1wBw;igLc#V2@y-*~Hp?jA1)+MYYyAt|DV_8RQCrRY@sAviO}wv;3gFdO>TE(=9o? z=S(r=0oT`w24=ihA=~iFV5z$ZG74?rmYn#eanx(!Hkxcr$*^KRFJKYYB&l6$WVsJ^ z-Iz#HYmE)Da@&seqG1fXsTER#adA&OrD2-T(z}Cwby|mQf{0v*v3hq~pzF`U`jenT z=XHXeB|fa?Ws$+9ADO0rco{#~+`VM?IXg7N>M0w1fyW1iiKTA@p$y zSiAJ%-Mg{m>&S4r#Tw@?@7ck}#oFo-iZJCWc`hw_J$=rw?omE{^tc59ftd`xq?jzf zo0bFUI=$>O!45{!c4?0KsJmZ#$vuYpZLo_O^oHTmmLMm0J_a{Nn`q5tG1m=0ecv$T z5H7r0DZGl6be@aJ+;26EGw9JENj0oJ5K0=^f-yBW2I0jqVIU};NBp*gF7_KlQnhB6 z##d$H({^HXj@il`*4^kC42&3)(A|tuhs;LygA-EWFSqpe+%#?6HG6}mE215Z4mjO2 zY2^?5$<8&k`O~#~sSc5Fy`5hg5#e{kG>SAbTxCh{y32fHkNryU_c0_6h&$zbWc63T z7|r?X7_H!9XK!HfZ+r?FvBQ$x{HTGS=1VN<>Ss-7M3z|vQG|N}Frv{h-q623@Jz*@ ziXlZIpAuY^RPlu&=nO)pFhML5=ut~&zWDSsn%>mv)!P1|^M!d5AwmSPIckoY|0u9I zTDAzG*U&5SPf+@c_tE_I!~Npfi$?gX(kn=zZd|tUZ_ez(xP+)xS!8=k(<{9@<+EUx zYQgZhjn(0qA#?~Q+EA9oh_Jx5PMfE3#KIh#*cFIFQGi)-40NHbJO&%ZvL|LAqU=Rw zf?Vr4qkUcKtLr^g-6*N-tfk+v8@#Lpl~SgKyH!+m9?T8B>WDWK22;!i5&_N=%f{__ z-LHb`v-LvKqTJZCx~z|Yg;U_f)VZu~q7trb%C6fOKs#eJosw&b$nmwGwP;Bz`=zK4 z>U3;}T_ptP)w=vJaL8EhW;J#SHA;fr13f=r#{o)`dRMOs-T;lp&Toi@u^oB_^pw=P zp#8Geo2?@!h2EYHY?L;ayT}-Df0?TeUCe8Cto{W0_a>!7Gxmi5G-nIIS;X{flm2De z{SjFG%knZoVa;mtHR_`*6)KEf=dvOT3OgT7C7&-4P#4X^B%VI&_57cBbli()(%zZC?Y0b;?5!f22UleQ=9h4_LkcA!Xsqx@q{ko&tvP_V@7epFs}AIpM{g??PA>U(sk$Gum>2Eu zD{Oy{$OF%~?B6>ixQeK9I}!$O0!T3#Ir8MW)j2V*qyJ z8Bg17L`rg^B_#rkny-=<3fr}Y42+x0@q6POk$H^*p3~Dc@5uYTQ$pfaRnIT}Wxb;- zl!@kkZkS=l)&=y|21veY8yz$t-&7ecA)TR|=51BKh(@n|d$EN>18)9kSQ|GqP?aeM ztXd9C&Md$PPF*FVs*GhoHM2L@D$(Qf%%x zwQBUt!jM~GgwluBcwkgwQ!249uPkNz3u@LSYZgmpHgX|P#8!iKk^vSKZ;?)KE$92d z2U>y}VWJ0&zjrIqddM3dz-nU%>bL&KU%SA|LiiUU7Ka|c=jF|vQ1V)Jz`JZe*j<5U6~RVuBEVJoY~ z&GE+F$f>4lN=X4-|9v*5O*Os>>r87u z!_1NSV?_X&HeFR1fOFb8_P)4lybJ6?1BWK`Tv2;4t|x1<#@17UO|hLGnrB%nu)fDk zfstJ4{X4^Y<8Lj<}g2^kksSefQTMuTo?tJLCh zC~>CR#a0hADw!_Vg*5fJwV{~S(j8)~sn>Oyt(ud2$1YfGck77}xN@3U_#T`q)f9!2 zf>Ia;Gwp2_C>WokU%(z2ec8z94pZyhaK+e>3a9sj^-&*V494;p9-xk+u1Jn#N_&xs z59OI2w=PuTErv|aNcK*>3l^W*p3}fjXJjJAXtBA#%B(-0--s;1U#f8gFYW!JL+iVG zV0SSx5w8eVgE?3Sg@eQv)=x<+-JgpVixZQNaZr}3b8sVyVs$@ndkF5FYKka@b+YAh z#nq_gzlIDKEs_i}H4f)(VQ!FSB}j>5znkVD&W0bOA{UZ7h!(FXrBbtdGA|PE1db>s z$!X)WY)u#7P8>^7Pjjj-kXNBuJX3(pJVetTZRNOnR5|RT5D>xmwxhAn)9KF3J05J; z-Mfb~dc?LUGqozC2p!1VjRqUwwDBnJhOua3vCCB-%ykW_ohSe?$R#dz%@Gym-8-RA zjMa_SJSzIl8{9dV+&63e9$4;{=1}w2=l+_j_Dtt@<(SYMbV-18&%F@Zl7F_5! z@xwJ0wiDdO%{}j9PW1(t+8P7Ud79yjY>x>aZYWJL_NI?bI6Y02`;@?qPz_PRqz(7v``20`- z033Dy|4;y6di|>cz|P-z|6c&3f&g^OAt8aN0Zd&0yZ>dq2aFCsE<~Ucf$v{sL=*++ zBxFSa2lfA+Y%U@B&3D=&CBO&u`#*nNc|PCY7XO<}MnG0VR764XrHtrb5zwC*2F!Lp zE<~Vj0;z!S-|3M4DFxuQ=`ShTf28<9p!81(0hFbGNqF%0gg*orez9!qt8e%o@Yfl@ zhvY}{@3&f??}7<`p>FyU;7?VkKbh8_=csozU=|fH&szgZ{=NDCylQ>EH^x5!K3~-V z)_2Y>0uJ`Z0Pb58y`RL+&n@m9tJ)O<%q#&u#DAIt+-rRt0eSe1MTtMl@W)H$b3D)@ z*A-1bUgZI)>HdcI4&W>P4W5{-j=s5p5`cbQ+{(g0+RDnz!TR^mxSLu_y#SDVKrj8i zA^hi6>jMGM;`$9Vfb-Yf!47b)Ow`2OKtNB=z|Kxa$5O}WPo;(Dc^`q(7X8kkeFyO8 z{XOq^07=u|7*P2`m;>PIFf=i80MKUxsN{d2cX0M+REsE*20+WQ79T9&cqT>=I_U% z{=8~^Isg(Nzo~`4iQfIb_#CVCD>#5h>=-Z#5dH}WxYzn%0)GAm6L2WdUdP=0_h>7f z(jh&7%1i(ZOn+}D8$iGK4Vs{pmHl_w4Qm-46H9>4^{3dz^DZDh+dw)6Xd@CpQNK$j z{CU;-cmpK=egplZ3y3%y=sEnCJ^eYVKXzV8H2_r*fJ*%*B;a1_lOpt6)IT1IAK2eB z{rie|uDJUrbgfUE>~C>@RO|m5ex55F{=~Bb4Cucp{ok7Yf9V}QuZ`#Gc|WaqsQlK- zKaV)iMRR__&Ak2Z=IM9R9g5$WM4u{a^C-7uX*!myEym z#_#p^T!P~#Dx$%^K>Y_nj_3J*E_LwJ60-5Xu=LkJAwcP@|0;a&+|+ZX`Jbj9P5;T% z|KOc}4*#4o{U?09`9Hz`Xo-I!P=9XfIrr*MQ}y=$!qgv?_J38^bNb4kM&_OVg^_=Eu-qG5U(fw0KMgH){C8pazq~51rN97hf#20-7=aK0)N|UM H-+%o-(+5aQ literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..fc9b829 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app' From 0f81e65d48875277e0a86fc598a1157b48d35d48 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Mon, 19 Feb 2018 15:32:21 +0100 Subject: [PATCH 03/10] applet van Joost --- .../android/hellosmartcard/MainActivity.java | 92 +++++++++++++------ 1 file changed, 64 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index 3a3f210..6d28a8f 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -19,8 +19,29 @@ public class MainActivity extends Activity implements SEService.CallBack { private SEService seService; private Button button; - - + private Button joost; + + private byte[] runApplet(byte[] aid, byte[] instruction) { + try { + Log.i(LOG_TAG, "Retrieve available readers..."); + Reader[] readers = seService.getReaders(); + if (readers.length < 1) + return null; + + Log.i(LOG_TAG, "Create Session from the first reader..."); + Session session = readers[0].openSession(); + Log.i(LOG_TAG, "Create logical channel within the session..."); + Channel channel = session.openLogicalChannel(aid); + + Log.i(LOG_TAG, "Send HelloWorld APDU command"); + byte[] respApdu = channel.transmit(instruction); + channel.close(); + return respApdu; + } catch (Exception e) { + Log.e(LOG_TAG, "Error occured:", e); + return null; + } + } @Override public void onCreate(Bundle savedInstanceState) { @@ -30,49 +51,63 @@ public void onCreate(Bundle savedInstanceState) { layout.setLayoutParams(new LayoutParams( LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - + button = new Button(this); button.setLayoutParams(new LayoutParams( - LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - + button.setText("Click Me"); button.setEnabled(false); button.setOnClickListener(new OnClickListener() { public void onClick(View v) { - try { - Log.i(LOG_TAG, "Retrieve available readers..."); - Reader[] readers = seService.getReaders(); - if (readers.length < 1) - return; - - Log.i(LOG_TAG, "Create Session from the first reader..."); - Session session = readers[0].openSession(); - - Log.i(LOG_TAG, "Create logical channel within the session..."); - Channel channel = session.openLogicalChannel(new byte[] { - (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, - (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, - (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }); - - Log.i(LOG_TAG, "Send HelloWorld APDU command"); - byte[] respApdu = channel.transmit(new byte[] { - (byte) 0x90, 0x10, 0x00, 0x00, 0x00 }); + byte[] respApdu = runApplet( + new byte[] { + (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, + (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, + (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }, + new byte[] { + (byte) 0x90, 0x10, 0x00, 0x00, 0x00 } + ); + if (respApdu == null) { + Toast.makeText(MainActivity.this, "ERROR", Toast.LENGTH_LONG).show(); + } else { + // Parse response APDU and show text but remove SW1 SW2 first + byte[] helloStr = new byte[respApdu.length - 2]; + System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); + Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); + } + } + }); - channel.close(); + layout.addView(button); + joost = new Button(this); + joost.setLayoutParams(new LayoutParams( + LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT)); + joost.setText("Joost"); + joost.setEnabled(false); + joost.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + byte[] respApdu = runApplet( + new byte[] { + (byte)0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }, + new byte[] { + (byte)0x80, 0x00, 0x00, 0x00, 0x04 } + ); + if (respApdu == null) { + Toast.makeText(MainActivity.this, "ERROR", Toast.LENGTH_LONG).show(); + } else { // Parse response APDU and show text but remove SW1 SW2 first byte[] helloStr = new byte[respApdu.length - 2]; System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); - } catch (Exception e) { - Log.e(LOG_TAG, "Error occured:", e); - return; } } }); - layout.addView(button); + layout.addView(joost); setContentView(layout); @@ -97,5 +132,6 @@ protected void onDestroy() { public void serviceConnected(SEService service) { Log.i(LOG_TAG, "seviceConnected()"); button.setEnabled(true); + joost.setEnabled(true); } } From 4450a51d824d5b8658dfb51b605f37cecdf52e33 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Fri, 23 Feb 2018 14:03:53 +0100 Subject: [PATCH 04/10] improvements --- .../android/hellosmartcard/MainActivity.java | 100 ++++++++++-------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index 6d28a8f..3355a32 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -21,26 +21,21 @@ public class MainActivity extends Activity implements SEService.CallBack { private Button button; private Button joost; - private byte[] runApplet(byte[] aid, byte[] instruction) { - try { - Log.i(LOG_TAG, "Retrieve available readers..."); - Reader[] readers = seService.getReaders(); - if (readers.length < 1) - return null; - - Log.i(LOG_TAG, "Create Session from the first reader..."); - Session session = readers[0].openSession(); - Log.i(LOG_TAG, "Create logical channel within the session..."); - Channel channel = session.openLogicalChannel(aid); - - Log.i(LOG_TAG, "Send HelloWorld APDU command"); - byte[] respApdu = channel.transmit(instruction); - channel.close(); - return respApdu; - } catch (Exception e) { - Log.e(LOG_TAG, "Error occured:", e); + private byte[] runApplet(byte[] aid, byte[] instruction) throws Exception { + Log.i(LOG_TAG, "Retrieve available readers..."); + Reader[] readers = seService.getReaders(); + if (readers.length < 1) return null; - } + + Log.i(LOG_TAG, "Create Session from the first reader..."); + Session session = readers[0].openSession(); + Log.i(LOG_TAG, "Create logical channel within the session..."); + Channel channel = session.openLogicalChannel(aid); + + Log.i(LOG_TAG, "Send HelloWorld APDU command"); + byte[] respApdu = channel.transmit(instruction); + channel.close(); + return respApdu; } @Override public void onCreate(Bundle savedInstanceState) { @@ -61,21 +56,27 @@ public void onCreate(Bundle savedInstanceState) { button.setEnabled(false); button.setOnClickListener(new OnClickListener() { public void onClick(View v) { - byte[] respApdu = runApplet( - new byte[] { - (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, - (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, - (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }, - new byte[] { - (byte) 0x90, 0x10, 0x00, 0x00, 0x00 } - ); - if (respApdu == null) { - Toast.makeText(MainActivity.this, "ERROR", Toast.LENGTH_LONG).show(); - } else { - // Parse response APDU and show text but remove SW1 SW2 first - byte[] helloStr = new byte[respApdu.length - 2]; - System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); - Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); + try { + byte[] respApdu = runApplet( + new byte[] { + (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, + (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, + (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }, + new byte[] { + (byte) 0x90, 0x10, 0x00, 0x00, 0x00 } + ); + if (respApdu == null) { + Toast.makeText(MainActivity.this, "Error: respApdu == null", Toast.LENGTH_LONG).show(); + } else { + // Parse response APDU and show text but remove SW1 SW2 first + byte[] helloStr = new byte[respApdu.length - 2]; + System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); + Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); + } + } catch (Exception e) { + String message = "Exception:" + e.getMessage(); + Log.e(LOG_TAG, message); + Toast.makeText(MainActivity.this, message, Toast.LENGTH_LONG).show(); } } }); @@ -90,19 +91,24 @@ public void onClick(View v) { joost.setEnabled(false); joost.setOnClickListener(new OnClickListener() { public void onClick(View v) { - byte[] respApdu = runApplet( - new byte[] { - (byte)0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }, - new byte[] { - (byte)0x80, 0x00, 0x00, 0x00, 0x04 } - ); - if (respApdu == null) { - Toast.makeText(MainActivity.this, "ERROR", Toast.LENGTH_LONG).show(); - } else { - // Parse response APDU and show text but remove SW1 SW2 first - byte[] helloStr = new byte[respApdu.length - 2]; - System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); - Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); + try { + byte[] respApdu = runApplet( + new byte[] { + (byte)0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }, + new byte[] { + (byte)0x80, 0x00, 0x00, 0x00, 0x04 } + ); + if (respApdu == null) { + Toast.makeText(MainActivity.this, "Error: respApdu == null", Toast.LENGTH_LONG).show(); + } else { + // Parse response APDU and show text but remove SW1 SW2 first + byte[] helloStr = new byte[respApdu.length - 2]; + System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); + Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); + } + } catch (Exception e) { + String message = "Exception:" + e.getMessage(); + Log.e(LOG_TAG, message); } } }); From c0befda5896f253677119e8b53b5c5474bae5e08 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Fri, 23 Feb 2018 17:51:33 +0100 Subject: [PATCH 05/10] better logging, cleanup --- .../android/hellosmartcard/MainActivity.java | 161 ++++++++++-------- 1 file changed, 87 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index 3355a32..87bdb8f 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -1,6 +1,7 @@ package com.gieseckedevrient.android.hellosmartcard; import android.app.Activity; +import android.content.Context; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -21,26 +22,78 @@ public class MainActivity extends Activity implements SEService.CallBack { private Button button; private Button joost; - private byte[] runApplet(byte[] aid, byte[] instruction) throws Exception { - Log.i(LOG_TAG, "Retrieve available readers..."); - Reader[] readers = seService.getReaders(); - if (readers.length < 1) - return null; - - Log.i(LOG_TAG, "Create Session from the first reader..."); - Session session = readers[0].openSession(); - Log.i(LOG_TAG, "Create logical channel within the session..."); - Channel channel = session.openLogicalChannel(aid); - - Log.i(LOG_TAG, "Send HelloWorld APDU command"); - byte[] respApdu = channel.transmit(instruction); - channel.close(); - return respApdu; + private static class MyOnClickListener implements OnClickListener{ + final String LOG_TAG = "HelloSmartcard"; + private Context mContext; + private byte[] mAid; + private byte[] mInstruction; + private SEService mSeService; + + public MyOnClickListener(Context context, byte[] aid, byte[] instruction, SEService seService) { + mContext = context; + mAid = aid; + mInstruction = instruction; + mSeService = seService; + } + + private void loge(String message) { + Log.e(LOG_TAG, message); + Toast.makeText(mContext, message, Toast.LENGTH_LONG).show(); + } + + private void logd(String message) { + Log.d(LOG_TAG, message); + Toast.makeText(mContext, message, Toast.LENGTH_LONG).show(); + } + + @Override + public void onClick(View view) { + try { + Log.d(LOG_TAG, "Retrieve available readers..."); + Reader[] readers = mSeService.getReaders(); + if (readers.length < 1) { + loge("No readers found"); + } + Log.d(LOG_TAG, "Create Session from the first reader..."); + Session session = readers[0].openSession(); + Log.d(LOG_TAG, "Create logical channel within the session..."); + Channel channel = session.openLogicalChannel(mAid); + + Log.d(LOG_TAG, "Send HelloWorld APDU command"); + byte[] respApdu = channel.transmit(mInstruction); + channel.close(); + if (respApdu == null) { + loge("Error: respApdu == null"); + } else { + int length = respApdu.length; + int status = (respApdu[length - 2] & 0xff) << 8 | (respApdu[length - 1] & 0xff); + if (status == 0x9000) { + // Parse response APDU and show text but remove SW1 SW2 first + byte[] helloStr = new byte[respApdu.length - 2]; + System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); + String hello = new String(helloStr); + logd(hello); + } else { + loge("status: " + Integer.toString(status, 16)); + } + } + } catch (Exception e) { + loge("Exception:" + e.getMessage()); + } + } } @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + try { + Log.d(LOG_TAG, "creating SEService object"); + seService = new SEService(this, this); + } catch (SecurityException e) { + Log.e(LOG_TAG, "Binding not allowed, uses-permission org.simalliance.openmobileapi.SMARTCARD?"); + } catch (Exception e) { + Log.e(LOG_TAG, "Exception: " + e.getMessage()); + } LinearLayout layout = new LinearLayout(this); layout.setLayoutParams(new LayoutParams( @@ -54,32 +107,16 @@ public void onCreate(Bundle savedInstanceState) { button.setText("Click Me"); button.setEnabled(false); - button.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - try { - byte[] respApdu = runApplet( - new byte[] { - (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, - (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, - (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }, - new byte[] { - (byte) 0x90, 0x10, 0x00, 0x00, 0x00 } - ); - if (respApdu == null) { - Toast.makeText(MainActivity.this, "Error: respApdu == null", Toast.LENGTH_LONG).show(); - } else { - // Parse response APDU and show text but remove SW1 SW2 first - byte[] helloStr = new byte[respApdu.length - 2]; - System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); - Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); - } - } catch (Exception e) { - String message = "Exception:" + e.getMessage(); - Log.e(LOG_TAG, message); - Toast.makeText(MainActivity.this, message, Toast.LENGTH_LONG).show(); - } - } - }); + button.setOnClickListener(new MyOnClickListener( + MainActivity.this, + new byte[] { + (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, + (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, + (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }, + new byte[] { + (byte) 0xA0, 0x10, 0x00, 0x00, 0x00 }, + seService + )); layout.addView(button); joost = new Button(this); @@ -89,42 +126,18 @@ public void onClick(View v) { joost.setText("Joost"); joost.setEnabled(false); - joost.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - try { - byte[] respApdu = runApplet( - new byte[] { - (byte)0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }, - new byte[] { - (byte)0x80, 0x00, 0x00, 0x00, 0x04 } - ); - if (respApdu == null) { - Toast.makeText(MainActivity.this, "Error: respApdu == null", Toast.LENGTH_LONG).show(); - } else { - // Parse response APDU and show text but remove SW1 SW2 first - byte[] helloStr = new byte[respApdu.length - 2]; - System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); - Toast.makeText(MainActivity.this, new String(helloStr), Toast.LENGTH_LONG).show(); - } - } catch (Exception e) { - String message = "Exception:" + e.getMessage(); - Log.e(LOG_TAG, message); - } - } - }); - + joost.setOnClickListener(new MyOnClickListener( + MainActivity.this, + new byte[] { + (byte)0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }, + new byte[] { + (byte)0x80, 0x00, 0x00, 0x00, 0x04 }, + seService + )); layout.addView(joost); setContentView(layout); - try { - Log.i(LOG_TAG, "creating SEService object"); - seService = new SEService(this, this); - } catch (SecurityException e) { - Log.e(LOG_TAG, "Binding not allowed, uses-permission org.simalliance.openmobileapi.SMARTCARD?"); - } catch (Exception e) { - Log.e(LOG_TAG, "Exception: " + e.getMessage()); - } } @Override @@ -136,7 +149,7 @@ protected void onDestroy() { } public void serviceConnected(SEService service) { - Log.i(LOG_TAG, "seviceConnected()"); + Log.d(LOG_TAG, "serviceConnected()"); button.setEnabled(true); joost.setEnabled(true); } From 340265ff8ca3f67680c3d018e2f16caac6545251 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Fri, 23 Feb 2018 17:57:02 +0100 Subject: [PATCH 06/10] correct instruction voor hello applet restored --- .../gieseckedevrient/android/hellosmartcard/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index 87bdb8f..d6cb129 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -114,7 +114,7 @@ public void onCreate(Bundle savedInstanceState) { (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }, new byte[] { - (byte) 0xA0, 0x10, 0x00, 0x00, 0x00 }, + (byte) 0x90, 0x10, 0x00, 0x00, 0x00 }, seService )); From 6ac81efaf6c643c9cf6140a0261c02b2658d2fb9 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Wed, 11 Apr 2018 21:15:56 +0200 Subject: [PATCH 07/10] Eduroam --- app/build.gradle | 2 +- app/release/output.json | 1 + .../android/hellosmartcard/MainActivity.java | 293 ++++++++++-------- .../android/hellosmartcard/SmartcardIO.java | 98 ++++++ .../android/hellosmartcard/Telecom.java | 89 ++++++ build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 7 files changed, 351 insertions(+), 140 deletions(-) create mode 100644 app/release/output.json create mode 100644 app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java create mode 100644 app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java diff --git a/app/build.gradle b/app/build.gradle index 5187c3c..5b39783 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 'Giesecke Devrient GmbH:Open Mobile API:21' - buildToolsVersion "27.0.2" + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.gieseckedevrient.android.hellosmartcard" diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..1f374f8 --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.gieseckedevrient.android.hellosmartcard","split":"","minSdkVersion":"4"}}] \ No newline at end of file diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index d6cb129..3d07fa8 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -1,7 +1,6 @@ package com.gieseckedevrient.android.hellosmartcard; import android.app.Activity; -import android.content.Context; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -10,147 +9,169 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.Toast; -import org.simalliance.openmobileapi.*; +import org.simalliance.openmobileapi.SEService; +import org.simalliance.openmobileapi.util.CommandApdu; -public class MainActivity extends Activity implements SEService.CallBack { +import java.io.IOException; - final String LOG_TAG = "HelloSmartcard"; - - private SEService seService; - - private Button button; - private Button joost; - - private static class MyOnClickListener implements OnClickListener{ - final String LOG_TAG = "HelloSmartcard"; - private Context mContext; - private byte[] mAid; - private byte[] mInstruction; - private SEService mSeService; - - public MyOnClickListener(Context context, byte[] aid, byte[] instruction, SEService seService) { - mContext = context; - mAid = aid; - mInstruction = instruction; - mSeService = seService; - } - - private void loge(String message) { - Log.e(LOG_TAG, message); - Toast.makeText(mContext, message, Toast.LENGTH_LONG).show(); - } - - private void logd(String message) { - Log.d(LOG_TAG, message); - Toast.makeText(mContext, message, Toast.LENGTH_LONG).show(); - } - - @Override - public void onClick(View view) { - try { - Log.d(LOG_TAG, "Retrieve available readers..."); - Reader[] readers = mSeService.getReaders(); - if (readers.length < 1) { - loge("No readers found"); - } - Log.d(LOG_TAG, "Create Session from the first reader..."); - Session session = readers[0].openSession(); - Log.d(LOG_TAG, "Create logical channel within the session..."); - Channel channel = session.openLogicalChannel(mAid); - - Log.d(LOG_TAG, "Send HelloWorld APDU command"); - byte[] respApdu = channel.transmit(mInstruction); - channel.close(); - if (respApdu == null) { - loge("Error: respApdu == null"); - } else { - int length = respApdu.length; - int status = (respApdu[length - 2] & 0xff) << 8 | (respApdu[length - 1] & 0xff); - if (status == 0x9000) { - // Parse response APDU and show text but remove SW1 SW2 first - byte[] helloStr = new byte[respApdu.length - 2]; - System.arraycopy(respApdu, 0, helloStr, 0, respApdu.length - 2); - String hello = new String(helloStr); - logd(hello); - } else { - loge("status: " + Integer.toString(status, 16)); - } - } - } catch (Exception e) { - loge("Exception:" + e.getMessage()); - } - } - } - @Override + +public class MainActivity extends Activity implements SEService.CallBack { + final String TAG = MainActivity.class.getSimpleName(); + public final static byte[] AID_HELLOAPPLET = { + (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, + (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, + (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 + }; + public final static byte[] AID_JOOSTAPPLET = { (byte) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }; + public final static byte[] AID_3GPP = { (byte) 0xA0, 0x00, 0x00, 0x00, (byte) 0x87 }; + + private Button hello; + private Button joost; + private Button eduroam; + private SmartcardIO mSmartcardIO; + + private void loge(String message) { + Log.e(TAG, message); + Toast.makeText(this, message, Toast.LENGTH_LONG).show(); + } + + private void logd(String message) { + Log.d(TAG, message); + Toast.makeText(this, message, Toast.LENGTH_LONG).show(); + } + + interface ResponseCallback { + void responseCallback(byte response[]); + } + + class ShowText implements ResponseCallback { + @Override + public void responseCallback(byte response[]) { + String hello = new String(response); + logd(hello); + } + } + + private static class MyOnClickListener implements OnClickListener { + final String LOG_TAG = MyOnClickListener.class.getSimpleName(); + private byte[] mAid; + private CommandApdu mCommandApdu[]; + private SmartcardIO mSmartcardIO; + private ResponseCallback mResponseCallback; + + + public MyOnClickListener(SmartcardIO smartcardIO, byte[] aid, CommandApdu commandApdu[], ResponseCallback responseCallback) throws IOException { + mSmartcardIO = smartcardIO; + mAid = aid; + mCommandApdu = commandApdu; + mResponseCallback = responseCallback; + } + + @Override + public void onClick(View view) { + try { + mSmartcardIO.openChannel(mAid); + int length = mCommandApdu.length; + for (int i = 0; i < length; i++) { + CommandApdu commandApdu = mCommandApdu[i]; + byte[] response = mSmartcardIO.runAPDU(commandApdu); + if (response != null) { + Log.d(LOG_TAG, "response: " + SmartcardIO.hex(response)); + if (mResponseCallback != null) { + mResponseCallback.responseCallback(response); + } + } else { + Log.d(LOG_TAG, "response: null"); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + private class MyOnClickListener1 implements OnClickListener { + final String TAG = MyOnClickListener1.class.getSimpleName(); + private SmartcardIO mSmartcardIO; + + public MyOnClickListener1(SmartcardIO smartcardIO) throws IOException { + mSmartcardIO = smartcardIO; + } + + @Override + public void onClick(View view) { + try { + mSmartcardIO.openChannel(AID_3GPP); + // select EXT1 + Telecom telecom = new Telecom(mSmartcardIO); + logd("user: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_USER)); + logd("password: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_PASSWORD)); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - try { - Log.d(LOG_TAG, "creating SEService object"); - seService = new SEService(this, this); - } catch (SecurityException e) { - Log.e(LOG_TAG, "Binding not allowed, uses-permission org.simalliance.openmobileapi.SMARTCARD?"); - } catch (Exception e) { - Log.e(LOG_TAG, "Exception: " + e.getMessage()); - } - - LinearLayout layout = new LinearLayout(this); - layout.setLayoutParams(new LayoutParams( - LayoutParams.WRAP_CONTENT, - LayoutParams.WRAP_CONTENT)); - - button = new Button(this); - button.setLayoutParams(new LayoutParams( - LayoutParams.WRAP_CONTENT, - LayoutParams.WRAP_CONTENT)); - - button.setText("Click Me"); - button.setEnabled(false); - button.setOnClickListener(new MyOnClickListener( - MainActivity.this, - new byte[] { - (byte) 0xD2, 0x76, 0x00, 0x01, 0x18, 0x00, 0x02, - (byte) 0xFF, 0x49, 0x50, 0x25, (byte) 0x89, - (byte) 0xC0, 0x01, (byte) 0x9B, 0x01 }, - new byte[] { - (byte) 0x90, 0x10, 0x00, 0x00, 0x00 }, - seService - )); - - layout.addView(button); - joost = new Button(this); - joost.setLayoutParams(new LayoutParams( - LayoutParams.WRAP_CONTENT, - LayoutParams.WRAP_CONTENT)); - - joost.setText("Joost"); - joost.setEnabled(false); - joost.setOnClickListener(new MyOnClickListener( - MainActivity.this, - new byte[] { - (byte)0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }, - new byte[] { - (byte)0x80, 0x00, 0x00, 0x00, 0x04 }, - seService - )); - layout.addView(joost); - setContentView(layout); - - + try { + super.onCreate(savedInstanceState); + + mSmartcardIO = new SmartcardIO(); + mSmartcardIO.setup(this, this); + LinearLayout layout = new LinearLayout(this); + layout.setLayoutParams(new LayoutParams( + LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT)); + + hello = new Button(this); + hello.setLayoutParams(new LayoutParams( + LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT)); + + hello.setEnabled(false); + hello.setText("Click Me"); + hello.setOnClickListener(new MyOnClickListener( + mSmartcardIO, + AID_HELLOAPPLET, + new CommandApdu[] { new CommandApdu((byte) 0x90, (byte) 0x10, (byte) 0x00, (byte) 0x00,(byte) 0x00 ) }, + new ShowText() + )); + layout.addView(hello); + joost = new Button(this); + joost.setLayoutParams(new LayoutParams( + LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT)); + joost.setEnabled(false); + joost.setText("Joost"); + joost.setOnClickListener(new MyOnClickListener( + mSmartcardIO, + AID_JOOSTAPPLET, + new CommandApdu[] { new CommandApdu((byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00,(byte) 0x04 ) }, + new ShowText() + )); + layout.addView(joost); + eduroam = new Button(this); + eduroam.setLayoutParams(new LayoutParams( + LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT)); + + eduroam.setEnabled(false); + eduroam.setText("eduroam"); + eduroam.setOnClickListener(new MyOnClickListener1(mSmartcardIO)); + layout.addView(eduroam); + setContentView(layout); + } catch (IOException e) { + e.printStackTrace(); + } } - @Override - protected void onDestroy() { - if (seService != null && seService.isConnected()) { - seService.shutdown(); - } - super.onDestroy(); - } + @Override + public void serviceConnected(SEService seService) { + hello.setEnabled(true); + joost.setEnabled(true); + eduroam.setEnabled(true); + } - public void serviceConnected(SEService service) { - Log.d(LOG_TAG, "serviceConnected()"); - button.setEnabled(true); - joost.setEnabled(true); - } } diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java new file mode 100644 index 0000000..e871689 --- /dev/null +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java @@ -0,0 +1,98 @@ +package com.gieseckedevrient.android.hellosmartcard; + +import android.content.Context; +import android.util.Log; + +import org.simalliance.openmobileapi.Channel; +import org.simalliance.openmobileapi.Reader; +import org.simalliance.openmobileapi.SEService; +import org.simalliance.openmobileapi.Session; +import org.simalliance.openmobileapi.util.CommandApdu; +import org.simalliance.openmobileapi.util.ResponseApdu; + +import java.io.IOException; + +public class SmartcardIO implements SEService.CallBack{ + private final String TAG = SmartcardIO.class.getSimpleName(); + private Session session; + private Channel cardChannel; + private SEService mSeService; + private SEService.CallBack mCallBack; + + public byte[] runAPDU(CommandApdu commandApdu) throws IOException { + byte[] data = null; + byte cmdApdu[] = commandApdu.toByteArray(); + ResponseApdu responseApdu = new ResponseApdu(cardChannel.transmit(cmdApdu)); + + if (responseApdu.isSuccess()) { + data = responseApdu.getData(); + } else { + Log.e(TAG,"ERROR: status: " + String.format("%04X", responseApdu.getSwValue())); + } + return data; + } + + public void setup(Context context, SEService.CallBack callBack) throws IOException { + mCallBack = callBack; + mSeService = new SEService(context, this); + } + + public void teardown() { + Reader[] readers = mSeService.getReaders(); + if (readers.length < 1) { + Log.e(TAG, "No readers found"); + } + closeChannel(); + readers[0].closeSessions(); + if (mSeService != null && mSeService.isConnected()) { + mSeService.shutdown(); + } + } + + public void closeChannel() { + if (cardChannel != null && !cardChannel.isClosed()) { + cardChannel.close(); + } + } + public void openChannel(byte aid[]) throws IOException { + closeChannel(); + cardChannel = session.openLogicalChannel(aid); + } + + public static String hex2(int hex) { + return String.format("%02X", hex & 0xff); + } + + public static String hex(byte[] barr) { + String result; + if (barr == null) { + result = "null"; + } else { + result = ""; + for (byte b : barr) { + result += " " + hex2(b); + } + } + return result; + } + + @Override + public void serviceConnected(SEService seService) { + try { + Log.d(TAG, "serviceConnected()"); + Log.d(TAG, "Retrieve available readers..."); + Reader[] readers = mSeService.getReaders(); + if (readers.length < 1) { + Log.e(TAG, "No readers found"); + } + Log.d(TAG, "Create Session from the first reader..."); + session = readers[0].openSession(); + Log.d(TAG, "Create logical channel within the session..."); + if (mCallBack != null) { + mCallBack.serviceConnected(seService); + } + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java new file mode 100644 index 0000000..156501e --- /dev/null +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java @@ -0,0 +1,89 @@ +package com.gieseckedevrient.android.hellosmartcard; + +import android.util.Log; + +import org.simalliance.openmobileapi.util.CommandApdu; + +import java.io.IOException; + +public class Telecom { + private final String TAG = Telecom.class.getSimpleName(); + private SmartcardIO mSmartcardIO; + public final static int EXT_RECORD_SIZE = 13; + public final static int EF_EXT1 = 0x6F4A; + public final static int EF_EXT2 = 0x6F4B; + public final static int RECORD_USER = 1; + public final static int RECORD_PASSWORD = 3; + + public Telecom(SmartcardIO smartcardIO) { + mSmartcardIO = smartcardIO; + } + + public byte[] readRecord(int record) throws IOException { + CommandApdu c = new CommandApdu((byte)0x00, (byte)0xB2, (byte)record, (byte)0x04); + return mSmartcardIO.runAPDU(c); + } + + public void readRecords() throws IOException { + int record = 1; + byte data[]; + while ((data = readRecord(record++)) != null) { + Log.d(TAG, SmartcardIO.hex(data)); + } + } + public static byte hi(int x) { + return (byte) (x >> 8); + } + + public static byte lo(int x) { + return (byte) (x & 0xff); + } + + public byte[] selectTelecom(int fid) throws IOException { + CommandApdu c = new CommandApdu((byte)0x00, (byte)0xA4, (byte)0x08, (byte)0x04, new byte[] { 0x7f, 0x10, hi(fid), lo(fid) }); + return mSmartcardIO.runAPDU(c); + } + + public byte[] readTelecomRecord(int fid, int record) throws IOException { + byte result[] = null; + if (selectTelecom(fid) != null) { + Log.d(TAG, String.format("reading telecom %04X", fid)); + result = readRecord(record); + } + return result; + } + + public void readTelecomRecords(int fid) throws IOException { + if (selectTelecom(fid) != null) { + Log.d(TAG, String.format("reading telecom %04X", fid)); + readRecords(); + } + } + public void updateRecord(int record, byte[] data) throws IOException { + CommandApdu c = new CommandApdu((byte)0x00, (byte)0xdc, (byte)record, (byte)0x04, data); + mSmartcardIO.runAPDU(c); + } + + public void writeTelecom(int fid, int record, byte[] data) throws IOException { + if (selectTelecom(fid) != null) { + Log.d(TAG, String.format("write telecom %04X, record %d", fid, record)); + updateRecord(record, data); + } + } + + public String readData(int ext, int recordnr) throws IOException { + String result = ""; + byte record[]; + while ((record = readTelecomRecord(ext, recordnr++)) != null) { + for (int i = 1; i < EXT_RECORD_SIZE; i++) { + int val = (record[i] & 0xFF); + if (val == 0xFF) { + return result; + } + result += String.valueOf((char) val); + } + } + return result; + } + +} diff --git a/build.gradle b/build.gradle index e4467f8..58039f1 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,16 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.1' } } allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc9b829..d08c250 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Tue Apr 10 19:04:30 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip From fc25c19beec6f4bf1200434e4805d6ec8ecd9ab6 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Sat, 14 Apr 2018 11:26:19 +0200 Subject: [PATCH 08/10] telecom --- app/release/output.json | 2 +- .../android/hellosmartcard/Eduroam.java | 54 ++++++++++++++++ .../android/hellosmartcard/MainActivity.java | 64 ++++++++++++++++--- 3 files changed, 110 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java diff --git a/app/release/output.json b/app/release/output.json index 1f374f8..b651919 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.gieseckedevrient.android.hellosmartcard","split":"","minSdkVersion":"4"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.1-SNAPSHOT","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java new file mode 100644 index 0000000..7480983 --- /dev/null +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java @@ -0,0 +1,54 @@ +package com.gieseckedevrient.android.hellosmartcard; + +import android.util.Log; + +import org.simalliance.openmobileapi.util.CommandApdu; + +import java.io.IOException; + +public class Eduroam { + private final String TAG = Eduroam.class.getSimpleName(); + public final static int OFFSET_USER = 0x00; + public final static int OFFSET_PASSWORD = 0x20; + private SmartcardIO mSmartcardIO; + + public Eduroam(SmartcardIO smartcardIO) { + mSmartcardIO = smartcardIO; + } + + public byte[] selectEduroam() throws IOException { + CommandApdu c = new CommandApdu((byte)0x00, (byte)0xA4, (byte)0x00, (byte)0x00, new byte[] { 0x10, 0x00 }); + return mSmartcardIO.runAPDU(c); + } + + public byte[] readEduroam() throws IOException { + byte result[] = null; + if (selectEduroam() != null) { + Log.d(TAG, "reading eduroam"); + CommandApdu c = new CommandApdu((byte)0x00, (byte)0xB0, (byte)0x00, (byte)0x00); + result = mSmartcardIO.runAPDU(c); + } + return result; + } + + public boolean updateEduroam(byte[] data) throws IOException { + boolean result = false; + if (selectEduroam() != null) { + Log.d(TAG, "updating eduroam"); + CommandApdu c = new CommandApdu((byte)0x00, (byte)0xD6, (byte)0x00, (byte)0x00, data); + result = mSmartcardIO.runAPDU(c) != null; + } + return result; + } + + public static String readStringFromByteArray(byte[] barr, int offset) { + String result = ""; + byte b; + int i = offset; + while ((b = barr[i++]) != (byte) 0xFF) { + result += (char) b; + } + return result; + } + +} diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index 3d07fa8..f13978e 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -25,10 +25,13 @@ public class MainActivity extends Activity implements SEService.CallBack { }; public final static byte[] AID_JOOSTAPPLET = { (byte) 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x01 }; public final static byte[] AID_3GPP = { (byte) 0xA0, 0x00, 0x00, 0x00, (byte) 0x87 }; + public final static byte[] AID_ISOAPPLET = { (byte) 0xF2, (byte) 0x76, (byte) 0xA2, (byte) 0x88, (byte) 0xBC, (byte) 0xFB, (byte) 0xA6, (byte) 0x9D, (byte) 0x34, (byte) 0xF3, (byte) 0x10, (byte) 0x01 }; private Button hello; private Button joost; private Button eduroam; + private Button telecom; + private SmartcardIO mSmartcardIO; private void loge(String message) { @@ -90,22 +93,55 @@ public void onClick(View view) { } } } - private class MyOnClickListener1 implements OnClickListener { - final String TAG = MyOnClickListener1.class.getSimpleName(); + + private class EduroamOnClickListener implements OnClickListener { + final String TAG = EduroamOnClickListener.class.getSimpleName(); + private SmartcardIO mSmartcardIO; + + public EduroamOnClickListener(SmartcardIO smartcardIO) throws IOException { + mSmartcardIO = smartcardIO; + } + + public void showEduroam() throws IOException { + mSmartcardIO.openChannel(AID_ISOAPPLET); + Eduroam eduroam = new Eduroam(mSmartcardIO); + byte data[] = eduroam.readEduroam(); + if (data != null) { + logd("user: " + Eduroam.readStringFromByteArray(data, Eduroam.OFFSET_USER)); + logd("password: " + Eduroam.readStringFromByteArray(data, Eduroam.OFFSET_PASSWORD)); + } + } + + @Override + public void onClick(View view) { + try { + showEduroam(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + private class TelecomOnClickListener implements OnClickListener { + final String TAG = EduroamOnClickListener.class.getSimpleName(); private SmartcardIO mSmartcardIO; - public MyOnClickListener1(SmartcardIO smartcardIO) throws IOException { + public TelecomOnClickListener(SmartcardIO smartcardIO) throws IOException { mSmartcardIO = smartcardIO; } + public void showTelecom() throws IOException { + mSmartcardIO.openChannel(AID_3GPP); + // select EXT1 + Telecom telecom = new Telecom(mSmartcardIO); + logd("user: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_USER)); + logd("password: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_PASSWORD)); + } + @Override public void onClick(View view) { try { - mSmartcardIO.openChannel(AID_3GPP); - // select EXT1 - Telecom telecom = new Telecom(mSmartcardIO); - logd("user: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_USER)); - logd("password: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_PASSWORD)); + showTelecom(); } catch (IOException e) { e.printStackTrace(); } @@ -159,8 +195,17 @@ public void onCreate(Bundle savedInstanceState) { eduroam.setEnabled(false); eduroam.setText("eduroam"); - eduroam.setOnClickListener(new MyOnClickListener1(mSmartcardIO)); + eduroam.setOnClickListener(new EduroamOnClickListener(mSmartcardIO)); layout.addView(eduroam); + telecom = new Button(this); + telecom.setLayoutParams(new LayoutParams( + LayoutParams.WRAP_CONTENT, + LayoutParams.WRAP_CONTENT)); + + telecom.setEnabled(false); + telecom.setText("telecom"); + telecom.setOnClickListener(new TelecomOnClickListener(mSmartcardIO)); + layout.addView(telecom); setContentView(layout); } catch (IOException e) { e.printStackTrace(); @@ -172,6 +217,7 @@ public void serviceConnected(SEService seService) { hello.setEnabled(true); joost.setEnabled(true); eduroam.setEnabled(true); + telecom.setEnabled(true); } } From a8f7ed94306482b2916ab0ba75807ae3993f34a7 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Mon, 7 May 2018 12:51:31 +0200 Subject: [PATCH 09/10] Error handling --- .../android/hellosmartcard/Eduroam.java | 9 +-- .../android/hellosmartcard/MainActivity.java | 58 ++++++++++++------- .../android/hellosmartcard/SmartcardIO.java | 57 +++++++++--------- .../android/hellosmartcard/Telecom.java | 16 +++-- build.gradle | 2 +- 5 files changed, 83 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java index 7480983..4f12cd5 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java @@ -3,6 +3,7 @@ import android.util.Log; import org.simalliance.openmobileapi.util.CommandApdu; +import org.simalliance.openmobileapi.util.ResponseApdu; import java.io.IOException; @@ -16,14 +17,14 @@ public Eduroam(SmartcardIO smartcardIO) { mSmartcardIO = smartcardIO; } - public byte[] selectEduroam() throws IOException { + public ResponseApdu selectEduroam() throws IOException { CommandApdu c = new CommandApdu((byte)0x00, (byte)0xA4, (byte)0x00, (byte)0x00, new byte[] { 0x10, 0x00 }); return mSmartcardIO.runAPDU(c); } - public byte[] readEduroam() throws IOException { - byte result[] = null; - if (selectEduroam() != null) { + public ResponseApdu readEduroam() throws IOException { + ResponseApdu result = selectEduroam(); + if (result.isSuccess()) { Log.d(TAG, "reading eduroam"); CommandApdu c = new CommandApdu((byte)0x00, (byte)0xB0, (byte)0x00, (byte)0x00); result = mSmartcardIO.runAPDU(c); diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index f13978e..47b2d75 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -12,6 +12,7 @@ import org.simalliance.openmobileapi.SEService; import org.simalliance.openmobileapi.util.CommandApdu; +import org.simalliance.openmobileapi.util.ResponseApdu; import java.io.IOException; @@ -34,7 +35,7 @@ public class MainActivity extends Activity implements SEService.CallBack { private SmartcardIO mSmartcardIO; - private void loge(String message) { + void loge(String message) { Log.e(TAG, message); Toast.makeText(this, message, Toast.LENGTH_LONG).show(); } @@ -56,7 +57,7 @@ public void responseCallback(byte response[]) { } } - private static class MyOnClickListener implements OnClickListener { + private class MyOnClickListener implements OnClickListener { final String LOG_TAG = MyOnClickListener.class.getSimpleName(); private byte[] mAid; private CommandApdu mCommandApdu[]; @@ -78,18 +79,19 @@ public void onClick(View view) { int length = mCommandApdu.length; for (int i = 0; i < length; i++) { CommandApdu commandApdu = mCommandApdu[i]; - byte[] response = mSmartcardIO.runAPDU(commandApdu); - if (response != null) { - Log.d(LOG_TAG, "response: " + SmartcardIO.hex(response)); + ResponseApdu response = mSmartcardIO.runAPDU(commandApdu); + if (response.isSuccess()) { + byte data[] = response.getData(); + Log.d(LOG_TAG, "response: " + SmartcardIO.hex(data)); if (mResponseCallback != null) { - mResponseCallback.responseCallback(response); + mResponseCallback.responseCallback(data); } } else { Log.d(LOG_TAG, "response: null"); } } - } catch (IOException e) { - e.printStackTrace(); + } catch (Exception e) { + loge(e.getMessage()); } } } @@ -102,22 +104,26 @@ public EduroamOnClickListener(SmartcardIO smartcardIO) throws IOException { mSmartcardIO = smartcardIO; } - public void showEduroam() throws IOException { + public void showEduroam() throws Exception { mSmartcardIO.openChannel(AID_ISOAPPLET); Eduroam eduroam = new Eduroam(mSmartcardIO); - byte data[] = eduroam.readEduroam(); - if (data != null) { + ResponseApdu responseApdu = eduroam.readEduroam(); + if (responseApdu.isSuccess()) { + byte data[] = responseApdu.getData(); logd("user: " + Eduroam.readStringFromByteArray(data, Eduroam.OFFSET_USER)); logd("password: " + Eduroam.readStringFromByteArray(data, Eduroam.OFFSET_PASSWORD)); + } else { + loge("No credentials found on SIM card"); } + mSmartcardIO.closeChannel(); } @Override public void onClick(View view) { try { showEduroam(); - } catch (IOException e) { - e.printStackTrace(); + } catch (Exception e) { + loge(e.getMessage()); } } } @@ -130,20 +136,21 @@ public TelecomOnClickListener(SmartcardIO smartcardIO) throws IOException { mSmartcardIO = smartcardIO; } - public void showTelecom() throws IOException { + public void showTelecom() throws Exception { mSmartcardIO.openChannel(AID_3GPP); // select EXT1 Telecom telecom = new Telecom(mSmartcardIO); logd("user: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_USER)); logd("password: " + telecom.readData(Telecom.EF_EXT1, Telecom.RECORD_PASSWORD)); + mSmartcardIO.closeChannel(); } @Override public void onClick(View view) { try { showTelecom(); - } catch (IOException e) { - e.printStackTrace(); + } catch (Exception e) { + loge(e.getMessage()); } } } @@ -212,12 +219,23 @@ public void onCreate(Bundle savedInstanceState) { } } + @Override + protected void onDestroy() { + mSmartcardIO.teardown(); + super.onDestroy(); + } + @Override public void serviceConnected(SEService seService) { - hello.setEnabled(true); - joost.setEnabled(true); - eduroam.setEnabled(true); - telecom.setEnabled(true); + try { + mSmartcardIO.setSession(); + hello.setEnabled(true); + joost.setEnabled(true); + eduroam.setEnabled(true); + telecom.setEnabled(true); + } catch (IOException e) { + loge(e.getMessage()); + } } } diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java index e871689..0e8fedc 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java @@ -2,6 +2,7 @@ import android.content.Context; import android.util.Log; +import android.widget.Toast; import org.simalliance.openmobileapi.Channel; import org.simalliance.openmobileapi.Reader; @@ -12,38 +13,46 @@ import java.io.IOException; -public class SmartcardIO implements SEService.CallBack{ +public class SmartcardIO { private final String TAG = SmartcardIO.class.getSimpleName(); private Session session; private Channel cardChannel; private SEService mSeService; - private SEService.CallBack mCallBack; + private Context mContext; - public byte[] runAPDU(CommandApdu commandApdu) throws IOException { - byte[] data = null; + private void loge(String message) { + Log.e(TAG, message); + Toast.makeText(mContext, message, Toast.LENGTH_LONG).show(); + } + + private void logd(String message) { + Log.d(TAG, message); + Toast.makeText(mContext, message, Toast.LENGTH_LONG).show(); + } + + public ResponseApdu runAPDU(CommandApdu commandApdu) throws IOException { byte cmdApdu[] = commandApdu.toByteArray(); ResponseApdu responseApdu = new ResponseApdu(cardChannel.transmit(cmdApdu)); - if (responseApdu.isSuccess()) { - data = responseApdu.getData(); - } else { + if (!responseApdu.isSuccess()) { Log.e(TAG,"ERROR: status: " + String.format("%04X", responseApdu.getSwValue())); } - return data; + return responseApdu; } public void setup(Context context, SEService.CallBack callBack) throws IOException { - mCallBack = callBack; - mSeService = new SEService(context, this); + mContext = context; + mSeService = new SEService(context, callBack); } public void teardown() { Reader[] readers = mSeService.getReaders(); + closeChannel(); if (readers.length < 1) { Log.e(TAG, "No readers found"); + } else { + readers[0].closeSessions(); } - closeChannel(); - readers[0].closeSessions(); if (mSeService != null && mSeService.isConnected()) { mSeService.shutdown(); } @@ -54,7 +63,7 @@ public void closeChannel() { cardChannel.close(); } } - public void openChannel(byte aid[]) throws IOException { + public void openChannel(byte aid[]) throws Exception { closeChannel(); cardChannel = session.openLogicalChannel(aid); } @@ -76,23 +85,15 @@ public static String hex(byte[] barr) { return result; } - @Override - public void serviceConnected(SEService seService) { - try { - Log.d(TAG, "serviceConnected()"); - Log.d(TAG, "Retrieve available readers..."); - Reader[] readers = mSeService.getReaders(); - if (readers.length < 1) { - Log.e(TAG, "No readers found"); - } + public void setSession() throws IOException { + Log.d(TAG, "serviceConnected()"); + Log.d(TAG, "Retrieve available readers..."); + Reader[] readers = mSeService.getReaders(); + if (readers.length < 1) { + loge("No readers found"); + } else { Log.d(TAG, "Create Session from the first reader..."); session = readers[0].openSession(); - Log.d(TAG, "Create logical channel within the session..."); - if (mCallBack != null) { - mCallBack.serviceConnected(seService); - } - } catch (IOException e) { - e.printStackTrace(); } } } diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java index 156501e..cb21e7a 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java @@ -3,6 +3,7 @@ import android.util.Log; import org.simalliance.openmobileapi.util.CommandApdu; +import org.simalliance.openmobileapi.util.ResponseApdu; import java.io.IOException; @@ -19,16 +20,16 @@ public Telecom(SmartcardIO smartcardIO) { mSmartcardIO = smartcardIO; } - public byte[] readRecord(int record) throws IOException { + public ResponseApdu readRecord(int record) throws IOException { CommandApdu c = new CommandApdu((byte)0x00, (byte)0xB2, (byte)record, (byte)0x04); return mSmartcardIO.runAPDU(c); } public void readRecords() throws IOException { int record = 1; - byte data[]; - while ((data = readRecord(record++)) != null) { - Log.d(TAG, SmartcardIO.hex(data)); + ResponseApdu responseApdu; + while ((responseApdu = readRecord(record++)).isSuccess()) { + Log.d(TAG, SmartcardIO.hex(responseApdu.getData())); } } public static byte hi(int x) { @@ -39,7 +40,7 @@ public static byte lo(int x) { return (byte) (x & 0xff); } - public byte[] selectTelecom(int fid) throws IOException { + public ResponseApdu selectTelecom(int fid) throws IOException { CommandApdu c = new CommandApdu((byte)0x00, (byte)0xA4, (byte)0x08, (byte)0x04, new byte[] { 0x7f, 0x10, hi(fid), lo(fid) }); return mSmartcardIO.runAPDU(c); } @@ -48,7 +49,10 @@ public byte[] readTelecomRecord(int fid, int record) throws IOException { byte result[] = null; if (selectTelecom(fid) != null) { Log.d(TAG, String.format("reading telecom %04X", fid)); - result = readRecord(record); + ResponseApdu responseApdu = readRecord(record); + if (responseApdu.isSuccess()) { + result = responseApdu.getData(); + } } return result; } diff --git a/build.gradle b/build.gradle index 58039f1..2b3fa29 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.1' + classpath 'com.android.tools.build:gradle:3.1.2' } } From 801259f16ce29b40b1fb7b0ed41b3fcb40eb1c25 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Tue, 24 Jul 2018 15:18:38 +0200 Subject: [PATCH 10/10] nl.mansoft.openmobileapi.util --- .../android/hellosmartcard/Eduroam.java | 4 +- .../android/hellosmartcard/MainActivity.java | 4 +- .../android/hellosmartcard/SmartcardIO.java | 4 +- .../android/hellosmartcard/Telecom.java | 4 +- .../openmobileapi/util/CommandApdu.java | 476 ++++++++++++++ .../mansoft/openmobileapi/util/ISO7816.java | 585 ++++++++++++++++++ .../openmobileapi/util/ResponseApdu.java | 125 ++++ build.gradle | 2 +- 8 files changed, 1195 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/nl/mansoft/openmobileapi/util/CommandApdu.java create mode 100644 app/src/main/java/nl/mansoft/openmobileapi/util/ISO7816.java create mode 100644 app/src/main/java/nl/mansoft/openmobileapi/util/ResponseApdu.java diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java index 4f12cd5..485de38 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Eduroam.java @@ -2,8 +2,8 @@ import android.util.Log; -import org.simalliance.openmobileapi.util.CommandApdu; -import org.simalliance.openmobileapi.util.ResponseApdu; +import nl.mansoft.openmobileapi.util.CommandApdu; +import nl.mansoft.openmobileapi.util.ResponseApdu; import java.io.IOException; diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java index 47b2d75..23b7ae5 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/MainActivity.java @@ -11,8 +11,8 @@ import android.widget.Toast; import org.simalliance.openmobileapi.SEService; -import org.simalliance.openmobileapi.util.CommandApdu; -import org.simalliance.openmobileapi.util.ResponseApdu; +import nl.mansoft.openmobileapi.util.CommandApdu; +import nl.mansoft.openmobileapi.util.ResponseApdu; import java.io.IOException; diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java index 0e8fedc..d8775c9 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/SmartcardIO.java @@ -8,8 +8,8 @@ import org.simalliance.openmobileapi.Reader; import org.simalliance.openmobileapi.SEService; import org.simalliance.openmobileapi.Session; -import org.simalliance.openmobileapi.util.CommandApdu; -import org.simalliance.openmobileapi.util.ResponseApdu; +import nl.mansoft.openmobileapi.util.CommandApdu; +import nl.mansoft.openmobileapi.util.ResponseApdu; import java.io.IOException; diff --git a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java index cb21e7a..b64bf2a 100644 --- a/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java +++ b/app/src/main/java/com/gieseckedevrient/android/hellosmartcard/Telecom.java @@ -2,8 +2,8 @@ import android.util.Log; -import org.simalliance.openmobileapi.util.CommandApdu; -import org.simalliance.openmobileapi.util.ResponseApdu; +import nl.mansoft.openmobileapi.util.CommandApdu; +import nl.mansoft.openmobileapi.util.ResponseApdu; import java.io.IOException; diff --git a/app/src/main/java/nl/mansoft/openmobileapi/util/CommandApdu.java b/app/src/main/java/nl/mansoft/openmobileapi/util/CommandApdu.java new file mode 100644 index 0000000..b735900 --- /dev/null +++ b/app/src/main/java/nl/mansoft/openmobileapi/util/CommandApdu.java @@ -0,0 +1,476 @@ +/* + * Copyright 2013 Giesecke & Devrient GmbH. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package nl.mansoft.openmobileapi.util; + +/** + * This object represents a command APDU as specified by ISO/IEC 7816. + * + * @author Giesecke & Devrient + * + */ +public class CommandApdu { + + /** + * CLA field of command APDU. + */ + private byte mCla; + + /** + * INS field of command APDU. + */ + private byte mIns; + + /** + * P1 field of command APDU. + */ + private byte mP1; + + /** + * P2 field of command APDU. + */ + private byte mP2; + + /** + * DATA field of command APDU. + */ + private byte[] mData; + + /** + * Le field of command APDU. + */ + private Integer mLe; + + /** + * Override default constructor. + */ + private CommandApdu() { + } + + /** + * Creates a case 1 Command APDU. + * + * @param cla Value of CLA field. + * @param ins Value of INS field. + * @param p1 Value of P1 field. + * @param p2 Value of P2 field. + * + * @throws IllegalArgumentException if CLA or INS are invalid. + */ + public CommandApdu(byte cla, byte ins, byte p1, byte p2) + throws IllegalArgumentException { + setCla(cla); + setIns(ins); + setP1(p1); + setP2(p2); + } + + /** + * Creates a case 2 Command APDU. + * + * @param cla Value of CLA field. + * @param ins Value of INS field. + * @param p1 Value of P1 field. + * @param p2 Value of P2 field. + * @param le Value of Le field. + * + * @throws IllegalArgumentException if CLA, INS or Le are invalid. + */ + public CommandApdu(byte cla, byte ins, byte p1, byte p2, int le) + throws IllegalArgumentException { + setCla(cla); + setIns(ins); + setP1(p1); + setP2(p2); + setLe(le); + } + + /** + * Creates case 3 Command APDU. + * + * @param cla Value of CLA field. + * @param ins Value of INS field. + * @param p1 Value of P1 field. + * @param p2 Value of P2 field. + * @param data Value of DATA field. + * + * @throws IllegalArgumentException if CLA, INS or Data are invalid. + */ + public CommandApdu(byte cla, byte ins, byte p1, byte p2, byte[] data) + throws IllegalArgumentException { + setCla(cla); + setIns(ins); + setP1(p1); + setP2(p2); + setData(data); + } + + /** + * Creates a case 4 Command APDU. + * + * @param cla Value of CLA field. + * @param ins Value of INS field. + * @param p1 Value of P1 field. + * @param p2 Value of P2 field. + * @param data Value of DATA field. + * @param le Value of Le field. + * + * @throws IllegalArgumentException if CLA, INS, Data or Le are invalid. + */ + public CommandApdu( + byte cla, byte ins, byte p1, byte p2, byte[] data, int le) + throws IllegalArgumentException { + setCla(cla); + setIns(ins); + setP1(p1); + setP2(p2); + setData(data); + setLe(le); + } + + /** + * Creates a command APDU object from a byte Array. + * + * @param cmdApduAsByteArray Command APDU as byte array. + * + * @throws IllegalArgumentException If cmdApduAsByteArray does not + * contain a valid APDU. + */ + public CommandApdu(byte[] cmdApduAsByteArray) + throws IllegalArgumentException { + if (cmdApduAsByteArray.length < ISO7816.CMD_APDU_LENGTH_CASE1) { + throw new IllegalArgumentException("Invalid length for command (" + + cmdApduAsByteArray.length + ")."); + } + + setCla(cmdApduAsByteArray[ISO7816.OFFSET_CLA]); + setIns(cmdApduAsByteArray[ISO7816.OFFSET_INS]); + setP1(cmdApduAsByteArray[ISO7816.OFFSET_P1]); + setP2(cmdApduAsByteArray[ISO7816.OFFSET_P2]); + + if (cmdApduAsByteArray.length == ISO7816.CMD_APDU_LENGTH_CASE1) { + // Case 1 APDU -- Nothing left to be done + } else if (cmdApduAsByteArray.length == ISO7816.CMD_APDU_LENGTH_CASE2) { + // Case 2 APDU + setLe((int) 0x0FF & cmdApduAsByteArray[ISO7816.OFFSET_P3]); + } else if (cmdApduAsByteArray[ISO7816.OFFSET_P3] != (byte) 0x00) { + // Case 3 or Case 4 APDU + + // Get Lc and check that it's not 0 + int lc = ((int) 0x0FF & cmdApduAsByteArray[ISO7816.OFFSET_P3]); + if (lc == 0) { + throw new IllegalArgumentException( + "Lc can't be 0"); + } + + if (cmdApduAsByteArray.length + == ISO7816.CMD_APDU_LENGTH_CASE3_WITHOUT_DATA + lc) { + // Case 3 APDU -- nothing to be done here + } else if (cmdApduAsByteArray.length + == ISO7816.CMD_APDU_LENGTH_CASE4_WITHOUT_DATA + lc) { + // Case 4 APDU -- get Le: + setLe((int) 0x0FF + & cmdApduAsByteArray[cmdApduAsByteArray.length - 1]); + } else { + // Lc has a wrong value! + throw new IllegalArgumentException( + "Unexpected value of Lc (" + lc + ")"); + } + + // Store the data + mData = new byte[lc]; + System.arraycopy( + cmdApduAsByteArray, + ISO7816.OFFSET_DATA, + mData, + 0, + lc); + } else if (cmdApduAsByteArray.length + == ISO7816.CMD_APDU_LENGTH_CASE2_EXTENDED) { + // Case 2 extended APDU + setLe((((int) 0x0FF + & cmdApduAsByteArray[ISO7816.OFFSET_DATA]) << 8) + + ((int) 0x0FF + & cmdApduAsByteArray[ISO7816.OFFSET_DATA + 1])); + } else { + // Case 3 or Case 4 APDU + + if (cmdApduAsByteArray.length <= ISO7816.OFFSET_DATA_EXTENDED) { + throw new IllegalArgumentException( + "Unexpected value of Lc or Le" + cmdApduAsByteArray.length); + } + // Get Lc and check that it's not 0 + int lc = (((int) 0x0FF + & cmdApduAsByteArray[ISO7816.OFFSET_DATA]) << 8) + + ((int) 0x0FF + & cmdApduAsByteArray[ISO7816.OFFSET_DATA + 1]); + if (lc == 0) { + throw new IllegalArgumentException( + "Lc can't be 0"); + } + + if (cmdApduAsByteArray.length + == ISO7816.CMD_APDU_LENGTH_CASE3_WITHOUT_DATA_EXTENDED + + lc) { + // Case 3 APDU -- nothing to be done here + } else if (cmdApduAsByteArray.length + == ISO7816.CMD_APDU_LENGTH_CASE4_WITHOUT_DATA_EXTENDED + + lc) { + // Case 4 APDU -- get Le: + setLe((((int) 0x0FF + & cmdApduAsByteArray[cmdApduAsByteArray.length - 2]) + << 8) + + ((int) 0x0FF + & cmdApduAsByteArray[cmdApduAsByteArray.length - 1])); + } else { + // Lc has a wrong value! + throw new IllegalArgumentException( + "Unexpected value of Lc (" + lc + ")--- 9 -" + cmdApduAsByteArray.length); + } + + // Store the data + mData = new byte[lc]; + System.arraycopy( + cmdApduAsByteArray, + ISO7816.OFFSET_DATA_EXTENDED, + mData, + 0, + lc); + } + } + + /** + * Returns this Command APDU as a byte array. + * + * @return Command APDU as byte array. + */ + public byte[] toByteArray() { + byte[] array; + if (!isExtendedLength()) { + if (mData == null && mLe == null) { + // APDU Case 1 + array = new byte[ISO7816.CMD_APDU_LENGTH_CASE1]; + array[ISO7816.OFFSET_CLA] = mCla; + array[ISO7816.OFFSET_INS] = mIns; + array[ISO7816.OFFSET_P1] = mP1; + array[ISO7816.OFFSET_P2] = mP2; + } else if (mData == null && mLe != null) { + // APDU Case 2 + array = new byte[ISO7816.CMD_APDU_LENGTH_CASE2]; + array[ISO7816.OFFSET_CLA] = mCla; + array[ISO7816.OFFSET_INS] = mIns; + array[ISO7816.OFFSET_P1] = mP1; + array[ISO7816.OFFSET_P2] = mP2; + array[ISO7816.OFFSET_P3] = (byte) (mLe & 0x0FF); + } else if (mData != null && mLe == null) { + // APDU Case 3 + array = new byte[ISO7816.CMD_APDU_LENGTH_CASE3_WITHOUT_DATA + + mData.length]; + array[ISO7816.OFFSET_CLA] = mCla; + array[ISO7816.OFFSET_INS] = mIns; + array[ISO7816.OFFSET_P1] = mP1; + array[ISO7816.OFFSET_P2] = mP2; + array[ISO7816.OFFSET_P3] = (byte) (mData.length & 0x0FF); + System.arraycopy( + mData, 0, array, ISO7816.OFFSET_DATA, mData.length); + } else { + // APDU Case 4 + array = new byte[ISO7816.CMD_APDU_LENGTH_CASE4_WITHOUT_DATA + + mData.length]; + array[ISO7816.OFFSET_CLA] = mCla; + array[ISO7816.OFFSET_INS] = mIns; + array[ISO7816.OFFSET_P1] = mP1; + array[ISO7816.OFFSET_P2] = mP2; + array[ISO7816.OFFSET_P3] = (byte) (mData.length & 0x0FF); + System.arraycopy( + mData, 0, array, ISO7816.OFFSET_DATA, mData.length); + array[array.length - 1] = (byte) (mLe & 0x0FF); + } + + } else { + if (mData == null && mLe != null) { + // APDU Case 2 + array = new byte[ISO7816.CMD_APDU_LENGTH_CASE2_EXTENDED]; + array[ISO7816.OFFSET_CLA] = mCla; + array[ISO7816.OFFSET_INS] = mIns; + array[ISO7816.OFFSET_P1] = mP1; + array[ISO7816.OFFSET_P2] = mP2; + array[ISO7816.OFFSET_P3] = (byte) 0x00; + array[ISO7816.OFFSET_DATA] = (byte) ((mLe >> 8) & 0x0FF); + array[ISO7816.OFFSET_DATA + 1] = (byte) (mLe & 0x0FF); + } else if (mData != null && mLe == null) { + // APDU Case 3 + array = new byte[ISO7816. + CMD_APDU_LENGTH_CASE3_WITHOUT_DATA_EXTENDED + + mData.length]; + array[ISO7816.OFFSET_CLA] = mCla; + array[ISO7816.OFFSET_INS] = mIns; + array[ISO7816.OFFSET_P1] = mP1; + array[ISO7816.OFFSET_P2] = mP2; + array[ISO7816.OFFSET_P3] = (byte) 0x00; + array[ISO7816.OFFSET_DATA] = (byte) ((mData.length >> 8) + & 0x0FF); + array[ISO7816.OFFSET_DATA + 1] = (byte) (mData.length & 0x0FF); + System.arraycopy( + mData, + 0, + array, + ISO7816.OFFSET_DATA_EXTENDED, + mData.length); + } else { + // APDU Case 4 + array = new byte[ISO7816. + CMD_APDU_LENGTH_CASE4_WITHOUT_DATA_EXTENDED + + mData.length]; + array[ISO7816.OFFSET_CLA] = mCla; + array[ISO7816.OFFSET_INS] = mIns; + array[ISO7816.OFFSET_P1] = mP1; + array[ISO7816.OFFSET_P2] = mP2; + array[ISO7816.OFFSET_P3] = (byte) 0x00; + array[ISO7816.OFFSET_DATA] = (byte) ((mData.length >> 8) + & 0x0FF); + array[ISO7816.OFFSET_DATA + 1] = (byte) (mData.length & 0x0FF); + System.arraycopy( + mData, + 0, + array, + ISO7816.OFFSET_DATA_EXTENDED, + mData.length); + array[array.length - 2] = (byte) ((mLe >> 8) & 0x0FF); + array[array.length - 1] = (byte) (mLe & 0x0FF); + } + } + return array; + } + + public CommandApdu cloneWithLe(int le) { + if (mData == null) { + // Original APDU was Case 1 or Case 2 + return new CommandApdu(mCla, mIns, mP1, mP2, (byte) le); + } else { + // Original APDU was case 3 or 4 + return new CommandApdu(mCla, mIns, mP1, mP2, mData, (byte) le); + } + } + + /** + * Private method - Set CLA byte and check if it is a valid value or not. + * + * @param cla Value of CLA field. + * + * @throws IllegalArgumentException if CLA is invalid. + */ + private void setCla(byte cla) throws IllegalArgumentException { + if (cla == (byte) 0xFF) { + // cla has a wrong value! + throw new IllegalArgumentException( + "Invalid value of CLA (" + Integer.toHexString(cla) + ")"); + } + mCla = cla; + } + + /** + * Private method - Set INS byte and check if it is a valid value or not. + * + * @param ins Value of INS field. + * + * @throws IllegalArgumentException if INS is invalid. + */ + private void setIns(byte ins) throws IllegalArgumentException { + if ((ins & 0x0F0) == 0x60 || ((ins & 0x0F0) == 0x90)) { + // ins has a wrong value! + throw new IllegalArgumentException( + "Invalid value of INS (" + Integer.toHexString(ins) + "). " + + "0x6X and 0x9X are not valid values"); + } + mIns = ins; + } + + /** + * Private method - Set p1 byte. + * + * @param p1 Value of P1 field. + */ + private void setP1(byte p1) { + mP1 = p1; + } + + /** + * Private method - Set p2 byte. + * + * @param p2 Value of P2 field. + */ + private void setP2(byte p2) { + mP2 = p2; + } + + /** + * Private method Set Data. + * + * @param data Value of APDU data. + * @throws IllegalArgumentException if Data is null, 0 or is too long. + */ + private void setData(byte[] data) throws IllegalArgumentException { + if (data == null) { + throw new IllegalArgumentException( + "Data must not be null."); + } + + if (data.length > ISO7816.MAX_COMMAND_DATA_LENGTH) { + throw new IllegalArgumentException( + "Data too long."); + } + + if (data.length == 0) { + throw new IllegalArgumentException( + "Data must not be empty."); + } + + mData = new byte[data.length]; + System.arraycopy(data, 0, mData, 0, data.length); + } + + /** + * Private method - Set LE byte. + * + * @param le Value of LE field. + * + * @throws IllegalArgumentException if Le is invalid. + */ + private void setLe(int le) throws IllegalArgumentException { + + if (le < 0 || le > ISO7816.MAX_RESPONSE_DATA_LENGTH) { + throw new IllegalArgumentException( + "Invalid value for le parameter (" + le + ")."); + } + mLe = le; + } + + /** + * Check if the Apdu is extended. + * + * @return true if Apdu is extended or false otherwise. + */ + public boolean isExtendedLength() { + if ((mLe != null && mLe > ISO7816.MAX_RESPONSE_DATA_LENGTH_NO_EXTENDED) + || (mData != null + && mData.length + > ISO7816.MAX_COMMAND_DATA_LENGTH_NO_EXTENDED)) { + return true; + } + return false; + } +} diff --git a/app/src/main/java/nl/mansoft/openmobileapi/util/ISO7816.java b/app/src/main/java/nl/mansoft/openmobileapi/util/ISO7816.java new file mode 100644 index 0000000..6fe2f0e --- /dev/null +++ b/app/src/main/java/nl/mansoft/openmobileapi/util/ISO7816.java @@ -0,0 +1,585 @@ +/* + * Copyright (C) 2015, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* + * Contributed by: Giesecke & Devrient GmbH. + */ + +package nl.mansoft.openmobileapi.util; + +/** + * This object represents ISO/IEC 7816. + * + * @author Giesecke & Devrient + * + */ +public class ISO7816 { + /** + * Maximum command APDU data length. + */ + public static final int MAX_COMMAND_DATA_LENGTH = 65535; + + /** + * Maximum response APDU data length. + */ + public static final int MAX_RESPONSE_DATA_LENGTH = 65536; + + /** + * Maximum command APDU data length. + */ + public static final int MAX_COMMAND_DATA_LENGTH_NO_EXTENDED = 255; + + /** + * Maximum response APDU data length. + */ + public static final int MAX_RESPONSE_DATA_LENGTH_NO_EXTENDED = 256; + + /** + * Length of an APDU Case 1. + */ + public static final int CMD_APDU_LENGTH_CASE1 = 4; + + /** + * Length of an APDU Case 2. + */ + public static final int CMD_APDU_LENGTH_CASE2 = 5; + + /** + * Length of an APDU Case 2 extended case. + */ + public static final int CMD_APDU_LENGTH_CASE2_EXTENDED = 7; + + /** + * Length of an APDU Case 3 without taking data into account. + */ + public static final int CMD_APDU_LENGTH_CASE3_WITHOUT_DATA = 5; + + /** + * Length of an APDU Case 3 extended without taking data into account. + */ + public static final int CMD_APDU_LENGTH_CASE3_WITHOUT_DATA_EXTENDED = 7; + + /** + * Length of an APDU Case 4 without taking data into account. + */ + public static final int CMD_APDU_LENGTH_CASE4_WITHOUT_DATA = 6; + + /** + * Length of an APDU Case 4 extended without taking data into account. + */ + public static final int CMD_APDU_LENGTH_CASE4_WITHOUT_DATA_EXTENDED = 9; + + /** + * Length of an status word. + */ + public static final int RESP_APDU_LENGTH_SW = 2; + + // Offsets in Command APDU. + + /** + * CLA offset in Command APDU. + */ + public static final int OFFSET_CLA = 0; + /** + * INS offset in Command APDU. + */ + public static final int OFFSET_INS = 1; + /** + * P1 offset in Command APDU. + */ + public static final int OFFSET_P1 = 2; + /** + * P2 offset in Command APDU. + */ + public static final int OFFSET_P2 = 3; + /** + * P3 offset in Command APDU. + */ + public static final int OFFSET_P3 = 4; + /** + * Data offset in Command APDU. + */ + public static final int OFFSET_DATA = 5; + + /** + * Data offset in Command APDU. + */ + public static final int OFFSET_DATA_EXTENDED = 7; + + // CLA values. + + /** + * Interindustry class value. + */ + public static final byte CLA_INTERINDUSTRY = (byte) 0x00; + /** + * Proprietary class value. + */ + public static final byte CLA_PROPRIETARY = (byte) 0x80; + + // Ins values. + + /** + * ISO EXTERNAL AUTHENTICATE DATA instruction value. + */ + public static final byte INS_EXTERNAL_AUTHENTICATE = (byte) 0x82; + /** + * ISO APPEND RECORD instruction value. + */ + public static final byte INS_APPEND_RECORD = (byte) 0xE2; + /** + * ISO CHANGE REFERENCE DATA instruction value. + */ + public static final byte INS_CHANGE_REF_DATA = (byte) 0x24; + /** + * ISO ENABLE VERIFICAITION REQUIREMENT instruction value. + */ + public static final byte INS_ENABLE_VERIF_REQ = (byte) 0x28; + /** + * ISO ENVELOPE instruction value (0xC3). + */ + public static final byte INS_ENVELOPE_C3 = (byte) 0xC3; + /** + * ISO ENVELOPE instruction value (0xC2). + */ + public static final byte INS_ENVELOPE_C2 = (byte) 0xC2; + /** + * ISO ERASE BINARY instruction value (0x0E). + */ + public static final byte INS_ERASE_BINARY_0E = (byte) 0x0E; + /** + * ISO ERASE BINARY instruction value (0x0F). + */ + public static final byte INS_ERASE_BINARY_0F = (byte) 0x0F; + /** + * ISO ERASE RECORD instruction value. + */ + public static final byte INS_ERASE_RECORD = (byte) 0x0C; + /** + * ISO GENERAL AUTHENTICATE instruction value (0x86). + */ + public static final byte INS_GENERAL_AUTHENTICATE_86 = (byte) 0x86; + /** + * ISO GENERAL AUTHENTICATE instruction value (0x87). + */ + public static final byte INS_GENERAL_AUTHENTICATE_87 = (byte) 0x87; + /** + * ISO GENERATE ASYMMETRIC KEY PAIR instruction value. + */ + public static final byte INS_GENERATE_ASYMMETRIC_KEY_PAIR = (byte) 0x46; + /** + * ISO GET CHALLENGE instruction value. + */ + public static final byte INS_GET_CHALLENGE = (byte) 0x84; + /** + * ISO GET DATA instruction value (0xCA). + */ + public static final byte INS_GET_DATA_CA = (byte) 0xCA; + /** + * ISO GET DATA instruction value (0xCB). + */ + public static final byte INS_GET_DATA_CB = (byte) 0xCB; + /** + * ISO GET RESPONSE instruction value. + */ + public static final byte INS_GET_RESPONSE = (byte) 0xC0; + /** + * ISO INTERNAL AUTHENTICATE instruction value. + */ + public static final byte INS_INTERNAL_AUTHENTICATE = (byte) 0x88; + /** + * ISO MANAGE CHANNEL instruction value. + */ + public static final byte INS_MANAGE_CHANNEL = (byte) 0x70; + /** + * ISO MANAGE SECURITY ENVIRONMENT instruction value. + */ + public static final byte INS_MANAGE_SECURITY_ENVIRONMENT = (byte) 0x22; + /** + * ISO PUT DATA instruction value (0xDA). + */ + public static final byte INS_PUT_DATA_DA = (byte) 0xDA; + /** + * ISO PUT DATA instruction value (0xDB). + */ + public static final byte INS_PUT_DATA_DB = (byte) 0xDB; + /** + * ISO DISABLE VERIFICATION REQUIREMENT instruction value. + */ + public static final byte INS_DISABLE_VERIF_REQ = (byte) 0x26; + /** + * ISO READ BINARY instruction value (0xB0). + */ + public static final byte INS_READ_BINARY_B0 = (byte) 0xB0; + /** + * ISO READ BINARY instruction value (0xB1). + */ + public static final byte INS_READ_BINARY_B1 = (byte) 0xB1; + /** + * ISO READ RECORD instruction value (0xB2). + */ + public static final byte INS_READ_RECORD_B2 = (byte) 0xB2; + /** + * ISO READ RECORD instruction value (0xB3). + */ + public static final byte INS_READ_RECORD_B3 = (byte) 0xB3; + /** + * ISO RESET RETRY COUNTER instruction value. + */ + public static final byte INS_RESET_RETRY_CTR = (byte) 0x2C; + /** + * ISO SEARCH BINARY instruction value (0xA0). + */ + public static final byte INS_SEARCH_BINARY_A0 = (byte) 0xA0; + /** + * ISO SEARCH BINARY instruction value (0xA1). + */ + public static final byte INS_SEARCH_BINARY_A1 = (byte) 0xA1; + /** + * ISO SEARCH RECORD instruction value. + */ + public static final byte INS_SEARCH_RECORD = (byte) 0xA2; + /** + * ISO SELECT instruction value. + */ + public static final byte INS_SELECT = (byte) 0xA4; + /** + * ISO UPDATE BINARY instruction value (0xD6). + */ + public static final byte INS_UPDATE_BINARY_D6 = (byte) 0xD6; + /** + * ISO UPDATE BINARY instruction value (0xD7). + */ + public static final byte INS_UPDATE_BINARY_D7 = (byte) 0xD7; + /** + * ISO UPDATE RECORD instruction value (0xDC). + */ + public static final byte INS_UPDATE_RECORD_DC = (byte) 0xDC; + /** + * ISO UPDATE RECORD instruction value (0xDD). + */ + public static final byte INS_UPDATE_RECORD_DD = (byte) 0xDD; + /** + * ISO VERIFY instruction value (0x20). + */ + public static final byte INS_VERIFY_20 = (byte) 0x20; + /** + * ISO VERIFY instruction value (0x21). + */ + public static final byte INS_VERIFY_21 = (byte) 0x21; + /** + * ISO WRITE BINARY instruction value (0xD0). + */ + public static final byte INS_WRITE_BINARY_D0 = (byte) 0xD0; + /** + * ISO WRITE BINARY instruction value (0xD1). + */ + public static final byte INS_WRITE_BINARY_D1 = (byte) 0xD1; + /** + * ISO WRITE RECORD instruction value. + */ + public static final byte INS_WRITE_RECORD = (byte) 0xD2; + + // SW Values + + // 9000 - Normal processing - No further qualification. + /** + * No further qualification. + */ + public static final int SW_NO_FURTHER_QUALIFICATION = 0x9000; + + // 61XX - Normal processing - SW2 encodes the number of data bytes still + // available. + /** + * SW2 encodes the number of data bytes still available (minimum value). + */ + public static final int SW_NORMAL_PROCESSING_MIN = 0x6100; + /** + * SW2 encodes the number of data bytes still available (maximum value). + */ + public static final int SW_NORMAL_PROCESSING_MAX = 0x61FF; + + // 62XX - Warning processing - State of non-volatile memory is unchanged + // (further qualification in SW2). + /** + * Warning given. + */ + public static final byte SW1_62 = (byte) 0x62; + /** + * No information given. + */ + public static final int SW_62_NO_INFO = 0x6200; + /** + * Triggering by the card (minimum value). + */ + public static final int SW_62_TRIGGERING_CARD_MIN = 0x6202; + /** + * Triggering by the card (maximum value). + */ + public static final int SW_62_TRIGGERING_CARD_MAX = 0x6280; + /** + * Part of returned data may be corrupted. + */ + public static final int SW_DATA_CORRUPTED = 0x6281; + /** + * End of file or record reached before reading Ne bytes. + */ + public static final int SW_UNEXPECTED_EOF = 0x6282; + /** + * Selected file deactivated. + */ + public static final int SW_FILE_DEACTIVATED = 0x6283; + /** + * File control information not formatted according to 5.3.3. + */ + public static final int SW_WRONG_FILE_CONTROL_FORMAT = 0x6284; + /** + * Selected file in termination state. + */ + public static final int SW_FILE_STATE_TERMINATION = 0x6285; + /** + * No input data available from a sensor on the card. + */ + public static final int SW_NO_INPUT_DATA_AVAILABLE = 0x6286; + + // 63XX - Warning processing - State of non-volatile memory has + // changed (further qualification in SW2). + /** + * Warning given. + */ + public static final byte SW1_63 = (byte) 0x63; + /** + * No information given. + */ + public static final int SW_63_NO_INFO = 0x6300; + /** + * File filled up by the last write. + */ + public static final int SW_FILE_FILLED_UP = 0x6381; + /** + * Counter from 0 to 15 encoded by X (exact meaning depending on the + * command). Minimum value. + */ + public static final int SW_CTR_MIN = 0x63C0; + /** + * Counter from 0 to 15 encoded by X (exact meaning depending on the + * command). Maximum value. + */ + public static final int SW_CTR_MAX = 0x63CF; + + // 64XX - Execution error - State of non-volatile memory is + // unchanged (further qualification in SW2) + /** + * Execution error. + */ + public static final int SW_EXEC_ERROR = 0x6400; + /** + * Immediate response required by the card. + */ + public static final int SW_IMMEDIATE_RESPONSE_REQUIRED = 0x6401; + /** + * Triggering by the card (minimum value). + */ + public static final int SW_64_TRIGGERING_CARD_MIN = 0x6402; + /** + * Triggering by the card (maximum value). + */ + public static final int SW_64_TRIGGERING_CARD_MAX = 0x6480; + + // 65XX - Execution error - State of non-volatile memory has changed + // (further qualification in SW2) + /** + * No information given. + */ + public static final int SW_65_NO_INFO = 0x6500; + /** + * Memory failure. + */ + public static final int SW_MEMORY_FAILURE = 0x6581; + + // 66XX - Execution error - Security-related issues + /** + * Security issue (minimum value). + */ + public static final int SW_SECURITY_ISSUE_MIN = 0x6600; + /** + * Security issue (maximum value). + */ + public static final int SW_SECURITY_ISSUE_MAX = 0x66FF; + + // 6700 - Checking error - Wrong length, no further indication + /** + * Wrong length, no further indication. + */ + public static final int SW_WRONG_LENGTH = 0x6700; + + // 68XX - Checking error - Functions in CLA not supported + // (further qualification in SW2) + /** + * No information given. + */ + public static final int SW_68_NO_INFO = 0x6800; + /** + * Logical channel not supported. + */ + public static final int SW_LOGICAL_CHANNEL_NOT_SUPPORTED = 0x6881; + /** + * Secure messaging not supported. + */ + public static final int SW_SECURE_MESSAGING_NOT_SUPPORTED = 0x6882; + /** + * Last command of the chain expected. + */ + public static final int SW_LAST_COMMAND_EXPECTED = 0x6883; + /** + * Command chaining not supported. + */ + public static final int SW_COMMAND_CHAINING_NOT_SUPPORTED = 0x6884; + + // 69XX - Checking error - Command not allowed (further + // qualification in SW2). + /** + * No information given. + */ + public static final int SW_69_NO_INFO = 0x6900; + /** + * Command incompatible with file structure. + */ + public static final int SW_COMMAND_INCOMPATIBLE = 0x6981; + /** + * Security status not satisfied. + */ + public static final int SW_SECURITY_STATUS_NOT_SATISFIED = 0x6982; + /** + * Authentication method blocked. + */ + public static final int SW_AUTH_METHOD_BLOCKED = 0x6983; + /** + * Reference data not usable. + */ + public static final int SW_REF_DATA_NOT_USABLE = 0x6984; + /** + * Conditions of use not satisfied. + */ + public static final int SW_CONDITIONS_NOT_SATISFIED = 0x6985; + /** + * Command not allowed (no current EF). + */ + public static final int SW_COMMAND_NOT_ALLOWED = 0x6986; + /** + * Expected secure messaging data objects missing. + */ + public static final int SW_SM_OBJECT_MISSING = 0x6987; + /** + * Incorrect secure messaging data objects. + */ + public static final int SW_SM_INCORRECT_OBJECT = 0x6988; + + // 6AXX - Checking error - Wrong parameters P1-P2 (further + // qualification in SW2) + /** + * No information given. + */ + public static final int SW_6A_NO_INFO = 0x6A00; + /** + * Incorrect parameters in the command data field. + */ + public static final int SW_WRONG_DATA = 0x6A80; + /** + * Function not supported. + */ + public static final int SW_FUNC_NOT_SUPPORTED = 0x6A81; + /** + * File or application not found. + */ + public static final int SW_FILE_OR_APP_NOT_FOUND = 0x6A82; + /** + * Record not found. + */ + public static final int SW_RECORD_NOT_FOUND = 0x6A83; + /** + * Not enough memory space in the file. + */ + public static final int SW_NOT_ENOUGH_MEMORY = 0x6A84; + /** + * Nc inconsistent with TLV structure. + */ + public static final int SW_WRONG_NC_TLV = 0x6A85; + /** + * Incorrect parameters P1-P2. + */ + public static final int SW_INCORRECT_P1P2 = 0x6A86; + /** + * Nc inconsistent with parameters P1-P2. + */ + public static final int SW_WRONG_NC_P1P2 = 0x6A87; + /** + * Referenced data or reference data not found (exact meaning depending on + * the command). + */ + public static final int SW_REF_NOT_FOUND = 0x6A88; + /** + * File already exists. + */ + public static final int SW_FILE_ALREADY_EXISTS = 0x6A89; + /** + * DF name already exists. + */ + public static final int SW_DF_NAME_ALREADY_EXISTS = 0x6A8A; + + // 6B00 - Checking error - Wrong parameters P1-P2 + /** + * Wrong parameters P1-P2. + */ + public static final int SW_WRONG_PARAMETERS_P1P2 = 0x6B00; + + // 6CXX - Checking error - Wrong Le field; SW2 encodes the exact + // number of available data bytes. + /** + * Wrong Le field; SW2 encodes the exact number of available data bytes + * (minimum value). + */ + public static final int SW_WRONG_LE_MIN = 0x6C00; + /** + * Wrong Le field; SW2 encodes the exact number of available data bytes + * (maximum value). + */ + public static final int SW_WRONG_LE_MAX = 0x6CFF; + + // 6D00 - Checking error - Instruction code not supported or + // invalid. + /** + * Instruction code not supported or invalid. + */ + public static final int SW_INS_NOT_SUPPORTED = 0x6D00; + + // 6E00 - Checking error - Class not supported. + /** + * Class not supported. + */ + public static final int SW_CLA_NOT_SUPPORTED = 0x6E00; + + // 6F00 - Checking error - No precise diagnostic + /** + * No precise diagnostic. + */ + public static final int SW_NO_PRECISE_DIAGNOSTIC = 0x6F00; + + /** + * This class cannot be instantiated. + */ + private ISO7816() { + } +} diff --git a/app/src/main/java/nl/mansoft/openmobileapi/util/ResponseApdu.java b/app/src/main/java/nl/mansoft/openmobileapi/util/ResponseApdu.java new file mode 100644 index 0000000..e1bab86 --- /dev/null +++ b/app/src/main/java/nl/mansoft/openmobileapi/util/ResponseApdu.java @@ -0,0 +1,125 @@ +/* + * Copyright 2013 Giesecke & Devrient GmbH. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package nl.mansoft.openmobileapi.util; + +/** + * This object represents a response APDU as specified by ISO/IEC 7816. + * + * @author Giesecke & Devrient + * + */ +public class ResponseApdu { + + /** + * DATA field of response APDU. + */ + private byte[] mData; + + /** + * STATUS WORD field of response APDU. + */ + private byte[] mSw; + + /** + * Creates a response APDU. + * + * @param response The response APDU as a byte array. + */ + public ResponseApdu(byte[] response) { + if (response == null) { + throw new IllegalArgumentException("Response must not be null."); + } + if (response.length < ISO7816.RESP_APDU_LENGTH_SW + || response.length > ISO7816.MAX_RESPONSE_DATA_LENGTH + + ISO7816.RESP_APDU_LENGTH_SW) { + throw new IllegalArgumentException( + "Invalid response length (" + response.length + ")."); + } + if (response.length > ISO7816.RESP_APDU_LENGTH_SW) { + mData = new byte[response.length - ISO7816.RESP_APDU_LENGTH_SW]; + System.arraycopy(response, 0, mData, 0, mData.length); + } + mSw = new byte[ISO7816.RESP_APDU_LENGTH_SW]; + System.arraycopy(response, response.length + - ISO7816.RESP_APDU_LENGTH_SW, mSw, 0, + ISO7816.RESP_APDU_LENGTH_SW); + } + + /** + * Returns the DATA field of the response if present, null otherwise. + * + * @return The DATA field of the response if present, null otherwise. + */ + public byte[] getData() { + return mData; + } + + /** + * Returns the STATUS WORD field of the response. + * + * @return The STATUS WORD field of the response. + */ + public byte[] getSw() { + return mSw; + } + + /** + * Returns the STATUS WORD field as int value. + * + * @return The STATUS WORD field as int value. + */ + public int getSwValue() { + return ((mSw[0] & 0x0FF) << 8) + (mSw[1] & 0x0FF); + } + + /** + * Returns true if the SW = 90 00, false otherwise. + * + * @return true if the SW = 90 00, false otherwise.. + */ + public boolean isSuccess() { + return getSwValue() == ISO7816.SW_NO_FURTHER_QUALIFICATION; + } + + /** + * Returns true if the SW = 62 XX or SW = 63 XX, false otherwise. + * + * @return true if the SW = 62 XX or SW = 63 XX, false otherwise. + */ + public boolean isWarning() { + return mSw[0] == ISO7816.SW1_62 || mSw[0] == ISO7816.SW1_63; + } + + /** + * Returns the first byte of STATUS WORD field as int value. + * + * @return The first byte of STATUS WORD field as int value. + */ + public int getSw1Value() { + return (int) 0x0FF & mSw[0]; + } + + /** + * Returns the second byte of STATUS WORD field as int value. + * + * @return The second byte of STATUS WORD field as int value. + */ + public int getSw2Value() { + return (int) 0x0FF & mSw[1]; + } +} + diff --git a/build.gradle b/build.gradle index 2b3fa29..6c5cbc3 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.3' } }