From 41f2473f64152caea3f4d91397c8d9aaede49103 Mon Sep 17 00:00:00 2001 From: Andrea Franz Date: Thu, 22 Nov 2018 12:57:19 +0100 Subject: [PATCH] rename smartcard pkg to globalplatform --- .../{smartcard => globalplatform}/APDUWrapper.java | 3 +-- .../{smartcard => globalplatform}/ApplicationID.java | 6 +----- .../{smartcard => globalplatform}/Crypto.java | 2 +- .../GlobalPlatformCommandSet.java | 6 +----- .../{smartcard => globalplatform}/Keys.java | 2 +- .../{smartcard => globalplatform}/SecureChannel.java | 4 ++-- .../{smartcard => globalplatform}/Session.java | 2 +- 7 files changed, 8 insertions(+), 17 deletions(-) rename lib/src/main/java/im/status/hardwallet_lite_android/{smartcard => globalplatform}/APDUWrapper.java (95%) rename lib/src/main/java/im/status/hardwallet_lite_android/{smartcard => globalplatform}/ApplicationID.java (82%) rename lib/src/main/java/im/status/hardwallet_lite_android/{smartcard => globalplatform}/Crypto.java (99%) rename lib/src/main/java/im/status/hardwallet_lite_android/{smartcard => globalplatform}/GlobalPlatformCommandSet.java (94%) rename lib/src/main/java/im/status/hardwallet_lite_android/{smartcard => globalplatform}/Keys.java (86%) rename lib/src/main/java/im/status/hardwallet_lite_android/{smartcard => globalplatform}/SecureChannel.java (95%) rename lib/src/main/java/im/status/hardwallet_lite_android/{smartcard => globalplatform}/Session.java (85%) diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/APDUWrapper.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/APDUWrapper.java similarity index 95% rename from lib/src/main/java/im/status/hardwallet_lite_android/smartcard/APDUWrapper.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/APDUWrapper.java index 1f54e86..7a0aa4d 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/APDUWrapper.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/APDUWrapper.java @@ -1,8 +1,7 @@ -package im.status.hardwallet_lite_android.smartcard; +package im.status.hardwallet_lite_android.globalplatform; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.lang.reflect.Array; import java.util.Arrays; import im.status.hardwallet_lite_android.io.APDUCommand; diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/ApplicationID.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/ApplicationID.java similarity index 82% rename from lib/src/main/java/im/status/hardwallet_lite_android/smartcard/ApplicationID.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/ApplicationID.java index c0a9cc3..58a4d70 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/ApplicationID.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/ApplicationID.java @@ -1,8 +1,4 @@ -package im.status.hardwallet_lite_android.smartcard; - -import android.util.Log; - -import org.spongycastle.util.encoders.Hex; +package im.status.hardwallet_lite_android.globalplatform; import im.status.hardwallet_lite_android.wallet.TinyBERTLV; diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Crypto.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Crypto.java similarity index 99% rename from lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Crypto.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Crypto.java index f4b95e2..88a852e 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Crypto.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Crypto.java @@ -1,4 +1,4 @@ -package im.status.hardwallet_lite_android.smartcard; +package im.status.hardwallet_lite_android.globalplatform; import android.util.Base64; diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/GlobalPlatformCommandSet.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/GlobalPlatformCommandSet.java similarity index 94% rename from lib/src/main/java/im/status/hardwallet_lite_android/smartcard/GlobalPlatformCommandSet.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/GlobalPlatformCommandSet.java index 2541c7e..03e12c1 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/GlobalPlatformCommandSet.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/GlobalPlatformCommandSet.java @@ -1,17 +1,13 @@ -package im.status.hardwallet_lite_android.smartcard; - -import android.util.Log; +package im.status.hardwallet_lite_android.globalplatform; import org.spongycastle.util.encoders.Hex; import java.io.IOException; -import java.util.logging.Logger; import im.status.hardwallet_lite_android.io.APDUCommand; import im.status.hardwallet_lite_android.io.APDUException; import im.status.hardwallet_lite_android.io.APDUResponse; import im.status.hardwallet_lite_android.io.CardChannel; -import im.status.hardwallet_lite_android.wallet.TinyBERTLV; public class GlobalPlatformCommandSet { static final byte INS_SELECT = (byte) 0xA4; diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Keys.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Keys.java similarity index 86% rename from lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Keys.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Keys.java index 561060b..b83063e 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Keys.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Keys.java @@ -1,4 +1,4 @@ -package im.status.hardwallet_lite_android.smartcard; +package im.status.hardwallet_lite_android.globalplatform; public class Keys { public byte[] encKeyData; diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/SecureChannel.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SecureChannel.java similarity index 95% rename from lib/src/main/java/im/status/hardwallet_lite_android/smartcard/SecureChannel.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SecureChannel.java index 68c87b3..b4efad3 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/SecureChannel.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SecureChannel.java @@ -1,4 +1,4 @@ -package im.status.hardwallet_lite_android.smartcard; +package im.status.hardwallet_lite_android.globalplatform; import java.io.IOException; @@ -27,7 +27,7 @@ public class SecureChannel { public static Session verifyChallenge(byte[] hostChallenge, Keys cardKeys, APDUResponse resp) throws APDUException { if (resp.getSw() == APDUResponse.SW_SECURITY_CONDITION_NOT_SATISFIED) { - throw new APDUException(resp.getSw(), "security confition not satisfied"); + throw new APDUException(resp.getSw(), "security condition not satisfied"); } if (resp.getSw() == APDUResponse.SW_AUTHENTICATION_METHOD_BLOCKED) { diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Session.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Session.java similarity index 85% rename from lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Session.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Session.java index 7e02209..45672ef 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/smartcard/Session.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/Session.java @@ -1,4 +1,4 @@ -package im.status.hardwallet_lite_android.smartcard; +package im.status.hardwallet_lite_android.globalplatform; public class Session { private Keys keys;