From 84d56c95cd1ba6eeab8464b84780d973e6aa5cc9 Mon Sep 17 00:00:00 2001 From: Michele Balistreri Date: Thu, 12 Oct 2017 13:39:04 +0300 Subject: [PATCH] javacard applet can only define 1 package. JCMathLib has been integrated in the main package --- .../{opencrypto/jcmathlib => im/status/wallet}/Bignat.java | 2 +- .../jcmathlib => im/status/wallet}/Bignat_Helper.java | 2 +- .../{opencrypto/jcmathlib => im/status/wallet}/ECConfig.java | 2 +- .../{opencrypto/jcmathlib => im/status/wallet}/ECCurve.java | 2 +- src/main/java/im/status/wallet/ECCurves.java | 3 --- .../{opencrypto/jcmathlib => im/status/wallet}/ECPoint.java | 2 +- .../jcmathlib => im/status/wallet}/ECPoint_Helper.java | 2 +- .../jcmathlib => im/status/wallet}/ObjectAllocator.java | 2 +- .../jcmathlib => im/status/wallet}/ReturnCodes.java | 2 +- 9 files changed, 8 insertions(+), 11 deletions(-) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/Bignat.java (99%) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/Bignat_Helper.java (99%) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/ECConfig.java (99%) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/ECCurve.java (99%) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/ECPoint.java (99%) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/ECPoint_Helper.java (99%) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/ObjectAllocator.java (99%) rename src/main/java/{opencrypto/jcmathlib => im/status/wallet}/ReturnCodes.java (96%) diff --git a/src/main/java/opencrypto/jcmathlib/Bignat.java b/src/main/java/im/status/wallet/Bignat.java similarity index 99% rename from src/main/java/opencrypto/jcmathlib/Bignat.java rename to src/main/java/im/status/wallet/Bignat.java index 614ee62..ca929e5 100644 --- a/src/main/java/opencrypto/jcmathlib/Bignat.java +++ b/src/main/java/im/status/wallet/Bignat.java @@ -1,7 +1,7 @@ /** * Credits: Based on Bignat library from OV-chip project https://ovchip.cs.ru.nl/OV-chip_2.0 by Radboud University Nijmegen */ -package opencrypto.jcmathlib; +package im.status.wallet; import javacard.framework.ISOException; import javacard.framework.JCSystem; diff --git a/src/main/java/opencrypto/jcmathlib/Bignat_Helper.java b/src/main/java/im/status/wallet/Bignat_Helper.java similarity index 99% rename from src/main/java/opencrypto/jcmathlib/Bignat_Helper.java rename to src/main/java/im/status/wallet/Bignat_Helper.java index 3042571..b015dc6 100644 --- a/src/main/java/opencrypto/jcmathlib/Bignat_Helper.java +++ b/src/main/java/im/status/wallet/Bignat_Helper.java @@ -1,4 +1,4 @@ -package opencrypto.jcmathlib; +package im.status.wallet; import javacard.framework.JCSystem; import javacard.framework.Util; diff --git a/src/main/java/opencrypto/jcmathlib/ECConfig.java b/src/main/java/im/status/wallet/ECConfig.java similarity index 99% rename from src/main/java/opencrypto/jcmathlib/ECConfig.java rename to src/main/java/im/status/wallet/ECConfig.java index da53c0c..85debd8 100644 --- a/src/main/java/opencrypto/jcmathlib/ECConfig.java +++ b/src/main/java/im/status/wallet/ECConfig.java @@ -1,4 +1,4 @@ -package opencrypto.jcmathlib; +package im.status.wallet; import javacard.framework.ISOException; diff --git a/src/main/java/opencrypto/jcmathlib/ECCurve.java b/src/main/java/im/status/wallet/ECCurve.java similarity index 99% rename from src/main/java/opencrypto/jcmathlib/ECCurve.java rename to src/main/java/im/status/wallet/ECCurve.java index 8a7e1ba..f5e5d27 100644 --- a/src/main/java/opencrypto/jcmathlib/ECCurve.java +++ b/src/main/java/im/status/wallet/ECCurve.java @@ -1,4 +1,4 @@ -package opencrypto.jcmathlib; +package im.status.wallet; import javacard.framework.Util; import javacard.security.ECPrivateKey; diff --git a/src/main/java/im/status/wallet/ECCurves.java b/src/main/java/im/status/wallet/ECCurves.java index 97ca2d3..917686b 100644 --- a/src/main/java/im/status/wallet/ECCurves.java +++ b/src/main/java/im/status/wallet/ECCurves.java @@ -4,9 +4,6 @@ import javacard.security.CryptoException; import javacard.security.ECKey; import javacard.security.ECPrivateKey; import javacard.security.KeyAgreement; -import opencrypto.jcmathlib.ECConfig; -import opencrypto.jcmathlib.ECCurve; -import opencrypto.jcmathlib.ECPoint; public class ECCurves { static final byte SECP256K1_FP[] = { diff --git a/src/main/java/opencrypto/jcmathlib/ECPoint.java b/src/main/java/im/status/wallet/ECPoint.java similarity index 99% rename from src/main/java/opencrypto/jcmathlib/ECPoint.java rename to src/main/java/im/status/wallet/ECPoint.java index bce2af9..6483b7a 100644 --- a/src/main/java/opencrypto/jcmathlib/ECPoint.java +++ b/src/main/java/im/status/wallet/ECPoint.java @@ -1,4 +1,4 @@ -package opencrypto.jcmathlib; +package im.status.wallet; import javacard.framework.ISOException; import javacard.framework.Util; diff --git a/src/main/java/opencrypto/jcmathlib/ECPoint_Helper.java b/src/main/java/im/status/wallet/ECPoint_Helper.java similarity index 99% rename from src/main/java/opencrypto/jcmathlib/ECPoint_Helper.java rename to src/main/java/im/status/wallet/ECPoint_Helper.java index e7e2c15..1c3645b 100644 --- a/src/main/java/opencrypto/jcmathlib/ECPoint_Helper.java +++ b/src/main/java/im/status/wallet/ECPoint_Helper.java @@ -1,4 +1,4 @@ -package opencrypto.jcmathlib; +package im.status.wallet; import javacard.framework.Util; import javacard.security.KeyAgreement; diff --git a/src/main/java/opencrypto/jcmathlib/ObjectAllocator.java b/src/main/java/im/status/wallet/ObjectAllocator.java similarity index 99% rename from src/main/java/opencrypto/jcmathlib/ObjectAllocator.java rename to src/main/java/im/status/wallet/ObjectAllocator.java index 978204d..818af1f 100644 --- a/src/main/java/opencrypto/jcmathlib/ObjectAllocator.java +++ b/src/main/java/im/status/wallet/ObjectAllocator.java @@ -1,4 +1,4 @@ -package opencrypto.jcmathlib; +package im.status.wallet; import javacard.framework.ISOException; import javacard.framework.JCSystem; diff --git a/src/main/java/opencrypto/jcmathlib/ReturnCodes.java b/src/main/java/im/status/wallet/ReturnCodes.java similarity index 96% rename from src/main/java/opencrypto/jcmathlib/ReturnCodes.java rename to src/main/java/im/status/wallet/ReturnCodes.java index bccba23..83337c1 100644 --- a/src/main/java/opencrypto/jcmathlib/ReturnCodes.java +++ b/src/main/java/im/status/wallet/ReturnCodes.java @@ -1,4 +1,4 @@ -package opencrypto.jcmathlib; +package im.status.wallet; /** *