From 2591d5dcb3c6d80316b52b82323b4c4a2095e608 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sun, 22 May 2016 23:25:58 +0600 Subject: [PATCH] Move smartcardio stuff to original javax package --- .../securitytoken => javax}/smartcardio/CommandAPDU.java | 2 +- OpenKeychain/src/main/java/javax/smartcardio/README | 2 ++ .../securitytoken => javax}/smartcardio/ResponseAPDU.java | 2 +- .../keychain/securitytoken/NfcTransport.java | 4 ++-- .../keychain/securitytoken/SecurityTokenHelper.java | 4 ++-- .../sufficientlysecure/keychain/securitytoken/Transport.java | 4 ++-- .../keychain/securitytoken/usb/UsbTransport.java | 4 ++-- 7 files changed, 12 insertions(+), 10 deletions(-) rename OpenKeychain/src/main/java/{org/sufficientlysecure/keychain/securitytoken => javax}/smartcardio/CommandAPDU.java (99%) create mode 100644 OpenKeychain/src/main/java/javax/smartcardio/README rename OpenKeychain/src/main/java/{org/sufficientlysecure/keychain/securitytoken => javax}/smartcardio/ResponseAPDU.java (98%) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/smartcardio/CommandAPDU.java b/OpenKeychain/src/main/java/javax/smartcardio/CommandAPDU.java similarity index 99% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/smartcardio/CommandAPDU.java rename to OpenKeychain/src/main/java/javax/smartcardio/CommandAPDU.java index 1dabbba2c..936d450d0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/smartcardio/CommandAPDU.java +++ b/OpenKeychain/src/main/java/javax/smartcardio/CommandAPDU.java @@ -23,7 +23,7 @@ * questions. */ -package org.sufficientlysecure.keychain.securitytoken.smartcardio; +package javax.smartcardio; import java.util.Arrays; diff --git a/OpenKeychain/src/main/java/javax/smartcardio/README b/OpenKeychain/src/main/java/javax/smartcardio/README new file mode 100644 index 000000000..64cf4a096 --- /dev/null +++ b/OpenKeychain/src/main/java/javax/smartcardio/README @@ -0,0 +1,2 @@ +Copied 'as is' from OpenJDK: +http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/f51368baecd9/src/share/classes/javax/smartcardio \ No newline at end of file diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/smartcardio/ResponseAPDU.java b/OpenKeychain/src/main/java/javax/smartcardio/ResponseAPDU.java similarity index 98% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/smartcardio/ResponseAPDU.java rename to OpenKeychain/src/main/java/javax/smartcardio/ResponseAPDU.java index 728d8eb67..b135a2e82 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/smartcardio/ResponseAPDU.java +++ b/OpenKeychain/src/main/java/javax/smartcardio/ResponseAPDU.java @@ -23,7 +23,7 @@ * questions. */ -package org.sufficientlysecure.keychain.securitytoken.smartcardio; +package javax.smartcardio; import java.util.Arrays; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java index 61cfd1d24..1485754ef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java @@ -19,8 +19,8 @@ package org.sufficientlysecure.keychain.securitytoken; import android.nfc.Tag; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.CommandAPDU; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.ResponseAPDU; +import javax.smartcardio.CommandAPDU; +import javax.smartcardio.ResponseAPDU; import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity; import java.io.IOException; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java index 71777143d..7ab81d908 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java @@ -29,8 +29,8 @@ import org.bouncycastle.util.encoders.Hex; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.CommandAPDU; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.ResponseAPDU; +import javax.smartcardio.CommandAPDU; +import javax.smartcardio.ResponseAPDU; import org.sufficientlysecure.keychain.securitytoken.usb.UsbTransportException; import org.sufficientlysecure.keychain.util.Iso7816TLV; import org.sufficientlysecure.keychain.util.Log; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/Transport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/Transport.java index 7c48b0c3a..00fb4db07 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/Transport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/Transport.java @@ -17,8 +17,8 @@ package org.sufficientlysecure.keychain.securitytoken; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.CommandAPDU; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.ResponseAPDU; +import javax.smartcardio.CommandAPDU; +import javax.smartcardio.ResponseAPDU; import java.io.IOException; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java index d65bbedd3..ed42b9987 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/UsbTransport.java @@ -29,8 +29,8 @@ import android.util.Pair; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.securitytoken.Transport; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.CommandAPDU; -import org.sufficientlysecure.keychain.securitytoken.smartcardio.ResponseAPDU; +import javax.smartcardio.CommandAPDU; +import javax.smartcardio.ResponseAPDU; import org.sufficientlysecure.keychain.securitytoken.usb.tpdu.T1TpduProtocol; import org.sufficientlysecure.keychain.util.Log;