From 346ab46187cc55d72becb5fcd007784e9fcd9aec Mon Sep 17 00:00:00 2001 From: Andrea Franz Date: Thu, 22 Nov 2018 13:01:09 +0100 Subject: [PATCH] rename APDUWrapper to SCP02Wrapper --- .../globalplatform/{APDUWrapper.java => SCP02Wrapper.java} | 4 ++-- .../hardwallet_lite_android/globalplatform/SecureChannel.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/{APDUWrapper.java => SCP02Wrapper.java} (95%) diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/APDUWrapper.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SCP02Wrapper.java similarity index 95% rename from lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/APDUWrapper.java rename to lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SCP02Wrapper.java index 7a0aa4d..f7bd300 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/APDUWrapper.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SCP02Wrapper.java @@ -6,11 +6,11 @@ import java.util.Arrays; import im.status.hardwallet_lite_android.io.APDUCommand; -public class APDUWrapper { +public class SCP02Wrapper { private byte[] macKeyData; private byte[] icv; - public APDUWrapper(byte[] macKeyData) { + public SCP02Wrapper(byte[] macKeyData) { this.macKeyData = macKeyData; this.icv = Crypto.NullBytes8.clone(); } diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SecureChannel.java b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SecureChannel.java index b4efad3..dca7c48 100644 --- a/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SecureChannel.java +++ b/lib/src/main/java/im/status/hardwallet_lite_android/globalplatform/SecureChannel.java @@ -9,7 +9,7 @@ import im.status.hardwallet_lite_android.io.CardChannel; public class SecureChannel { private CardChannel channel; - private APDUWrapper wrapper; + private SCP02Wrapper wrapper; public static byte[] DERIVATION_PURPOSE_ENC = new byte[]{(byte) 0x01, (byte) 0x82}; public static byte[] DERIVATION_PURPOSE_MAC = new byte[]{(byte) 0x01, (byte) 0x01}; @@ -17,7 +17,7 @@ public class SecureChannel { public SecureChannel(CardChannel channel, Keys keys) { this.channel = channel; - this.wrapper = new APDUWrapper(keys.getMacKeyData()); + this.wrapper = new SCP02Wrapper(keys.getMacKeyData()); } public APDUResponse send(APDUCommand cmd) throws IOException {