From 543c8b28d0e6565b5b3bd2a50ecb59829cc7abc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sat, 25 Nov 2023 21:15:31 +0000 Subject: [PATCH] Rename org.bouncycastle package Fixes roboelectric in unit tests. --- app/build.gradle | 6 +++-- .../devices/xiaomi/XiaomiAuthService.java | 10 ++++----- .../{ => shaded}/crypto/BlockCipher.java | 2 +- .../{ => shaded}/crypto/CipherParameters.java | 2 +- .../{ => shaded}/crypto/CryptoException.java | 2 +- .../crypto/DataLengthException.java | 2 +- .../crypto/DefaultMultiBlockCipher.java | 2 +- .../crypto/InvalidCipherTextException.java | 2 +- .../bouncycastle/{ => shaded}/crypto/Mac.java | 2 +- .../{ => shaded}/crypto/MultiBlockCipher.java | 2 +- .../crypto/OutputLengthException.java | 2 +- .../crypto/RuntimeCryptoException.java | 2 +- .../{ => shaded}/crypto/SkippingCipher.java | 2 +- .../crypto/SkippingStreamCipher.java | 2 +- .../crypto/StreamBlockCipher.java | 2 +- .../{ => shaded}/crypto/StreamCipher.java | 2 +- .../crypto/engines/AESEngine.java | 18 +++++++-------- .../crypto/macs/CBCBlockCipherMac.java | 16 +++++++------- .../crypto/modes/AEADBlockCipher.java | 4 ++-- .../{ => shaded}/crypto/modes/AEADCipher.java | 13 ++++++----- .../crypto/modes/CBCBlockCipher.java | 14 ++++++------ .../crypto/modes/CBCModeCipher.java | 6 ++--- .../crypto/modes/CCMBlockCipher.java | 22 +++++++++---------- .../crypto/modes/CCMModeCipher.java | 2 +- .../crypto/modes/CTRModeCipher.java | 8 +++---- .../crypto/modes/SICBlockCipher.java | 18 +++++++-------- .../crypto/paddings/BlockCipherPadding.java | 4 ++-- .../crypto/params/AEADParameters.java | 6 ++--- .../crypto/params/KeyParameter.java | 6 ++--- .../crypto/params/ParametersWithIV.java | 4 ++-- .../{ => shaded}/util/Arrays.java | 2 +- .../{ => shaded}/util/Objects.java | 2 +- .../bouncycastle/{ => shaded}/util/Pack.java | 2 +- .../{ => shaded}/util/Strings.java | 2 +- 34 files changed, 98 insertions(+), 95 deletions(-) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/BlockCipher.java (97%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/CipherParameters.java (68%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/CryptoException.java (95%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/DataLengthException.java (94%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/DefaultMultiBlockCipher.java (95%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/InvalidCipherTextException.java (95%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/Mac.java (98%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/MultiBlockCipher.java (96%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/OutputLengthException.java (78%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/RuntimeCryptoException.java (92%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/SkippingCipher.java (95%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/SkippingStreamCipher.java (79%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/StreamBlockCipher.java (97%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/StreamCipher.java (97%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/engines/AESEngine.java (98%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/macs/CBCBlockCipherMac.java (93%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/AEADBlockCipher.java (76%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/AEADCipher.java (93%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CBCBlockCipher.java (95%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CBCModeCipher.java (62%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CCMBlockCipher.java (95%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CCMModeCipher.java (58%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CTRModeCipher.java (56%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/SICBlockCipher.java (95%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/paddings/BlockCipherPadding.java (92%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/params/AEADParameters.java (89%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/params/KeyParameter.java (86%) rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/params/ParametersWithIV.java (88%) rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Arrays.java (99%) rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Objects.java (87%) rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Pack.java (96%) rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Strings.java (96%) diff --git a/app/build.gradle b/app/build.gradle index e7cd7c641..6fb66a594 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -293,8 +293,10 @@ dependencies { implementation 'com.android.volley:volley:1.2.1' // Bouncy Castle is included directly in GB, to avoid pulling the entire dependency - //implementation 'org.bouncycastle:bcpkix-jdk15to18:1.76' - //implementation 'org.bouncycastle:bcprov-jdk15to18:1.76' + // it's included in the org.bouncycastle.shaded package, to prevent conflicts with + // roboelectric + //implementation 'org.bouncycastle:bcpkix-jdk18on:1.76' + //implementation 'org.bouncycastle:bcprov-jdk18on:1.76' // NON-FOSS dependencies // implementation('androidx.core:core-google-shortcuts:1.0.1') { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java index a814f9db8..707964857 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java @@ -25,11 +25,11 @@ import com.google.protobuf.ByteString; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.bouncycastle.crypto.CryptoException; -import org.bouncycastle.crypto.engines.AESEngine; -import org.bouncycastle.crypto.modes.CCMBlockCipher; -import org.bouncycastle.crypto.params.AEADParameters; -import org.bouncycastle.crypto.params.KeyParameter; +import org.bouncycastle.shaded.crypto.CryptoException; +import org.bouncycastle.shaded.crypto.engines.AESEngine; +import org.bouncycastle.shaded.crypto.modes.CCMBlockCipher; +import org.bouncycastle.shaded.crypto.params.AEADParameters; +import org.bouncycastle.shaded.crypto.params.KeyParameter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/BlockCipher.java similarity index 97% rename from app/src/main/java/org/bouncycastle/crypto/BlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/BlockCipher.java index 370225f65..e8ba9ea4b 100644 --- a/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/BlockCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** diff --git a/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java b/app/src/main/java/org/bouncycastle/shaded/crypto/CipherParameters.java similarity index 68% rename from app/src/main/java/org/bouncycastle/crypto/CipherParameters.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/CipherParameters.java index 5be873047..d1a1ff674 100644 --- a/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/CipherParameters.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * all parameter classes implement this. diff --git a/app/src/main/java/org/bouncycastle/crypto/CryptoException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/CryptoException.java similarity index 95% rename from app/src/main/java/org/bouncycastle/crypto/CryptoException.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/CryptoException.java index 352c5569b..9d8c3ae99 100644 --- a/app/src/main/java/org/bouncycastle/crypto/CryptoException.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/CryptoException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * the foundation class for the hard exceptions thrown by the crypto packages. diff --git a/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/DataLengthException.java similarity index 94% rename from app/src/main/java/org/bouncycastle/crypto/DataLengthException.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/DataLengthException.java index fbf047cf5..69994df35 100644 --- a/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/DataLengthException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * this exception is thrown if a buffer that is meant to have output diff --git a/app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/DefaultMultiBlockCipher.java similarity index 95% rename from app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/DefaultMultiBlockCipher.java index 3bc565cf0..af3a1e04c 100644 --- a/app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/DefaultMultiBlockCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; public abstract class DefaultMultiBlockCipher implements MultiBlockCipher diff --git a/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/InvalidCipherTextException.java similarity index 95% rename from app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/InvalidCipherTextException.java index 21c150d96..536f60e29 100644 --- a/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/InvalidCipherTextException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * this exception is thrown whenever we find something we don't expect in a diff --git a/app/src/main/java/org/bouncycastle/crypto/Mac.java b/app/src/main/java/org/bouncycastle/shaded/crypto/Mac.java similarity index 98% rename from app/src/main/java/org/bouncycastle/crypto/Mac.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/Mac.java index c00cd58cc..7923ff1bd 100644 --- a/app/src/main/java/org/bouncycastle/crypto/Mac.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/Mac.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** diff --git a/app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/MultiBlockCipher.java similarity index 96% rename from app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/MultiBlockCipher.java index dad402036..ef6b5a0ef 100644 --- a/app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/MultiBlockCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * Base interface for a cipher engine capable of processing multiple blocks at a time. diff --git a/app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/OutputLengthException.java similarity index 78% rename from app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/OutputLengthException.java index 62811a2b5..0eccf66cd 100644 --- a/app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/OutputLengthException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; public class OutputLengthException extends DataLengthException diff --git a/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/RuntimeCryptoException.java similarity index 92% rename from app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/RuntimeCryptoException.java index c1572020b..8470e3461 100644 --- a/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/RuntimeCryptoException.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * the foundation class for the exceptions thrown by the crypto packages. diff --git a/app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingCipher.java similarity index 95% rename from app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/SkippingCipher.java index f8cc648eb..a8b4ce53c 100644 --- a/app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * Ciphers producing a key stream which can be reset to particular points in the stream implement this. diff --git a/app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingStreamCipher.java similarity index 79% rename from app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/SkippingStreamCipher.java index a707a8108..9fa88b970 100644 --- a/app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingStreamCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * General interface for a stream cipher that supports skipping. diff --git a/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamBlockCipher.java similarity index 97% rename from app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/StreamBlockCipher.java index b1702fe7f..7871951a7 100644 --- a/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamBlockCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * A parent class for block cipher modes that do not require block aligned data to be processed, but can function in diff --git a/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamCipher.java similarity index 97% rename from app/src/main/java/org/bouncycastle/crypto/StreamCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/StreamCipher.java index c1255e941..06fdb6ea6 100644 --- a/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto; +package org.bouncycastle.shaded.crypto; /** * the interface stream ciphers conform to. diff --git a/app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java b/app/src/main/java/org/bouncycastle/shaded/crypto/engines/AESEngine.java similarity index 98% rename from app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/engines/AESEngine.java index 6b3690732..af24dd06f 100644 --- a/app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/engines/AESEngine.java @@ -1,13 +1,13 @@ -package org.bouncycastle.crypto.engines; +package org.bouncycastle.shaded.crypto.engines; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.crypto.DataLengthException; -import org.bouncycastle.crypto.DefaultMultiBlockCipher; -import org.bouncycastle.crypto.MultiBlockCipher; -import org.bouncycastle.crypto.OutputLengthException; -import org.bouncycastle.crypto.params.KeyParameter; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Pack; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.crypto.DataLengthException; +import org.bouncycastle.shaded.crypto.DefaultMultiBlockCipher; +import org.bouncycastle.shaded.crypto.MultiBlockCipher; +import org.bouncycastle.shaded.crypto.OutputLengthException; +import org.bouncycastle.shaded.crypto.params.KeyParameter; +import org.bouncycastle.shaded.util.Arrays; +import org.bouncycastle.shaded.util.Pack; /** * an implementation of the AES (Rijndael), from FIPS-197. diff --git a/app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java b/app/src/main/java/org/bouncycastle/shaded/crypto/macs/CBCBlockCipherMac.java similarity index 93% rename from app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/macs/CBCBlockCipherMac.java index 908780735..b86ec14be 100644 --- a/app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/macs/CBCBlockCipherMac.java @@ -1,10 +1,10 @@ -package org.bouncycastle.crypto.macs; +package org.bouncycastle.shaded.crypto.macs; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.crypto.Mac; -import org.bouncycastle.crypto.modes.CBCBlockCipher; -import org.bouncycastle.crypto.paddings.BlockCipherPadding; +import org.bouncycastle.shaded.crypto.BlockCipher; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.crypto.Mac; +import org.bouncycastle.shaded.crypto.modes.CBCBlockCipher; +import org.bouncycastle.shaded.crypto.paddings.BlockCipherPadding; /** * standard CBC Block Cipher MAC - if no padding is specified the default of @@ -43,7 +43,7 @@ public class CBCBlockCipherMac */ public CBCBlockCipherMac( BlockCipher cipher, - BlockCipherPadding padding) + org.bouncycastle.shaded.crypto.paddings.BlockCipherPadding padding) { this(cipher, (cipher.getBlockSize() * 8) / 2, padding); } @@ -85,7 +85,7 @@ public class CBCBlockCipherMac public CBCBlockCipherMac( BlockCipher cipher, int macSizeInBits, - BlockCipherPadding padding) + BlockCipherPadding padding) { if ((macSizeInBits % 8) != 0) { diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADBlockCipher.java similarity index 76% rename from app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADBlockCipher.java index b8c7ad512..27241d66b 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADBlockCipher.java @@ -1,6 +1,6 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; -import org.bouncycastle.crypto.BlockCipher; +import org.bouncycastle.shaded.crypto.BlockCipher; /** * An {@link AEADCipher} based on a {@link BlockCipher}. diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADCipher.java similarity index 93% rename from app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADCipher.java index 4e49a5a98..2b40f1079 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADCipher.java @@ -1,8 +1,9 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.crypto.DataLengthException; -import org.bouncycastle.crypto.InvalidCipherTextException; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.crypto.DataLengthException; +import org.bouncycastle.shaded.crypto.InvalidCipherTextException; +import org.bouncycastle.shaded.crypto.params.AEADParameters; /** * A cipher mode that includes authenticated encryption with a streaming mode and optional associated data. @@ -16,7 +17,7 @@ import org.bouncycastle.crypto.InvalidCipherTextException; * may be output prior to the call to {@link #doFinal(byte[], int)} that results in an authentication * failure. The higher level protocol utilising this cipher must ensure the plaintext data is handled * appropriately until the end of data is reached and the entire ciphertext is authenticated. - * @see org.bouncycastle.crypto.params.AEADParameters + * @see AEADParameters */ public interface AEADCipher { @@ -88,7 +89,7 @@ public interface AEADCipher * @param outOff offset into out to start copying the data at. * @return number of bytes written into out. * @throws IllegalStateException if the cipher is in an inappropriate state. - * @throws org.bouncycastle.crypto.InvalidCipherTextException if the MAC fails to match. + * @throws InvalidCipherTextException if the MAC fails to match. */ public int doFinal(byte[] out, int outOff) throws IllegalStateException, InvalidCipherTextException; diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCBlockCipher.java similarity index 95% rename from app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCBlockCipher.java index 42cf511bc..67dee8236 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCBlockCipher.java @@ -1,11 +1,11 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.crypto.DataLengthException; -import org.bouncycastle.crypto.DefaultMultiBlockCipher; -import org.bouncycastle.crypto.params.ParametersWithIV; -import org.bouncycastle.util.Arrays; +import org.bouncycastle.shaded.crypto.BlockCipher; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.crypto.DataLengthException; +import org.bouncycastle.shaded.crypto.DefaultMultiBlockCipher; +import org.bouncycastle.shaded.crypto.params.ParametersWithIV; +import org.bouncycastle.shaded.util.Arrays; /** * implements Cipher-Block-Chaining (CBC) mode on top of a simple cipher. diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCModeCipher.java similarity index 62% rename from app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCModeCipher.java index 682b5807c..09187d243 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCModeCipher.java @@ -1,7 +1,7 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.MultiBlockCipher; +import org.bouncycastle.shaded.crypto.BlockCipher; +import org.bouncycastle.shaded.crypto.MultiBlockCipher; public interface CBCModeCipher extends MultiBlockCipher diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMBlockCipher.java similarity index 95% rename from app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMBlockCipher.java index 1ac255bb8..7370c02ce 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMBlockCipher.java @@ -1,17 +1,17 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; import java.io.ByteArrayOutputStream; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.crypto.DataLengthException; -import org.bouncycastle.crypto.InvalidCipherTextException; -import org.bouncycastle.crypto.Mac; -import org.bouncycastle.crypto.OutputLengthException; -import org.bouncycastle.crypto.macs.CBCBlockCipherMac; -import org.bouncycastle.crypto.params.AEADParameters; -import org.bouncycastle.crypto.params.ParametersWithIV; -import org.bouncycastle.util.Arrays; +import org.bouncycastle.shaded.crypto.BlockCipher; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.crypto.DataLengthException; +import org.bouncycastle.shaded.crypto.InvalidCipherTextException; +import org.bouncycastle.shaded.crypto.Mac; +import org.bouncycastle.shaded.crypto.OutputLengthException; +import org.bouncycastle.shaded.crypto.macs.CBCBlockCipherMac; +import org.bouncycastle.shaded.crypto.params.AEADParameters; +import org.bouncycastle.shaded.crypto.params.ParametersWithIV; +import org.bouncycastle.shaded.util.Arrays; /** * Implements the Counter with Cipher Block Chaining mode (CCM) detailed in diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMModeCipher.java similarity index 58% rename from app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMModeCipher.java index d96ac05ae..869e5246d 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMModeCipher.java @@ -1,4 +1,4 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; public interface CCMModeCipher extends AEADBlockCipher diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CTRModeCipher.java similarity index 56% rename from app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CTRModeCipher.java index 13fd97e74..babecfa44 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CTRModeCipher.java @@ -1,8 +1,8 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.MultiBlockCipher; -import org.bouncycastle.crypto.SkippingStreamCipher; +import org.bouncycastle.shaded.crypto.BlockCipher; +import org.bouncycastle.shaded.crypto.MultiBlockCipher; +import org.bouncycastle.shaded.crypto.SkippingStreamCipher; public interface CTRModeCipher extends MultiBlockCipher, SkippingStreamCipher diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/SICBlockCipher.java similarity index 95% rename from app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/SICBlockCipher.java index 8b2013635..fee0e55a2 100644 --- a/app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/SICBlockCipher.java @@ -1,13 +1,13 @@ -package org.bouncycastle.crypto.modes; +package org.bouncycastle.shaded.crypto.modes; -import org.bouncycastle.crypto.BlockCipher; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.crypto.DataLengthException; -import org.bouncycastle.crypto.OutputLengthException; -import org.bouncycastle.crypto.StreamBlockCipher; -import org.bouncycastle.crypto.params.ParametersWithIV; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Pack; +import org.bouncycastle.shaded.crypto.BlockCipher; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.crypto.DataLengthException; +import org.bouncycastle.shaded.crypto.OutputLengthException; +import org.bouncycastle.shaded.crypto.StreamBlockCipher; +import org.bouncycastle.shaded.crypto.params.ParametersWithIV; +import org.bouncycastle.shaded.util.Arrays; +import org.bouncycastle.shaded.util.Pack; /** * Implements the Segmented Integer Counter (SIC) mode on top of a simple diff --git a/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java b/app/src/main/java/org/bouncycastle/shaded/crypto/paddings/BlockCipherPadding.java similarity index 92% rename from app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/paddings/BlockCipherPadding.java index 7c4f0aee3..402bf17a8 100644 --- a/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/paddings/BlockCipherPadding.java @@ -1,8 +1,8 @@ -package org.bouncycastle.crypto.paddings; +package org.bouncycastle.shaded.crypto.paddings; import java.security.SecureRandom; -import org.bouncycastle.crypto.InvalidCipherTextException; +import org.bouncycastle.shaded.crypto.InvalidCipherTextException; /** * Block cipher padders are expected to conform to this interface diff --git a/app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java b/app/src/main/java/org/bouncycastle/shaded/crypto/params/AEADParameters.java similarity index 89% rename from app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/params/AEADParameters.java index c06481591..c39ffd2bb 100644 --- a/app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/params/AEADParameters.java @@ -1,7 +1,7 @@ -package org.bouncycastle.crypto.params; +package org.bouncycastle.shaded.crypto.params; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.util.Arrays; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.util.Arrays; public class AEADParameters implements CipherParameters diff --git a/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java b/app/src/main/java/org/bouncycastle/shaded/crypto/params/KeyParameter.java similarity index 86% rename from app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/params/KeyParameter.java index e16399595..06224f526 100644 --- a/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/params/KeyParameter.java @@ -1,7 +1,7 @@ -package org.bouncycastle.crypto.params; +package org.bouncycastle.shaded.crypto.params; -import org.bouncycastle.crypto.CipherParameters; -import org.bouncycastle.util.Arrays; +import org.bouncycastle.shaded.crypto.CipherParameters; +import org.bouncycastle.shaded.util.Arrays; public class KeyParameter implements CipherParameters diff --git a/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java b/app/src/main/java/org/bouncycastle/shaded/crypto/params/ParametersWithIV.java similarity index 88% rename from app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java rename to app/src/main/java/org/bouncycastle/shaded/crypto/params/ParametersWithIV.java index 4a1e6e9a3..114324c5d 100644 --- a/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java +++ b/app/src/main/java/org/bouncycastle/shaded/crypto/params/ParametersWithIV.java @@ -1,6 +1,6 @@ -package org.bouncycastle.crypto.params; +package org.bouncycastle.shaded.crypto.params; -import org.bouncycastle.crypto.CipherParameters; +import org.bouncycastle.shaded.crypto.CipherParameters; public class ParametersWithIV implements CipherParameters diff --git a/app/src/main/java/org/bouncycastle/util/Arrays.java b/app/src/main/java/org/bouncycastle/shaded/util/Arrays.java similarity index 99% rename from app/src/main/java/org/bouncycastle/util/Arrays.java rename to app/src/main/java/org/bouncycastle/shaded/util/Arrays.java index 230520eaf..b44ec3723 100644 --- a/app/src/main/java/org/bouncycastle/util/Arrays.java +++ b/app/src/main/java/org/bouncycastle/shaded/util/Arrays.java @@ -1,4 +1,4 @@ -package org.bouncycastle.util; +package org.bouncycastle.shaded.util; import java.math.BigInteger; import java.util.NoSuchElementException; diff --git a/app/src/main/java/org/bouncycastle/util/Objects.java b/app/src/main/java/org/bouncycastle/shaded/util/Objects.java similarity index 87% rename from app/src/main/java/org/bouncycastle/util/Objects.java rename to app/src/main/java/org/bouncycastle/shaded/util/Objects.java index 9ea2ff36c..65a09e7d5 100644 --- a/app/src/main/java/org/bouncycastle/util/Objects.java +++ b/app/src/main/java/org/bouncycastle/shaded/util/Objects.java @@ -1,4 +1,4 @@ -package org.bouncycastle.util; +package org.bouncycastle.shaded.util; public class Objects { diff --git a/app/src/main/java/org/bouncycastle/util/Pack.java b/app/src/main/java/org/bouncycastle/shaded/util/Pack.java similarity index 96% rename from app/src/main/java/org/bouncycastle/util/Pack.java rename to app/src/main/java/org/bouncycastle/shaded/util/Pack.java index 525f1e940..328aca8ed 100644 --- a/app/src/main/java/org/bouncycastle/util/Pack.java +++ b/app/src/main/java/org/bouncycastle/shaded/util/Pack.java @@ -1,4 +1,4 @@ -package org.bouncycastle.util; +package org.bouncycastle.shaded.util; /** * Utility methods for converting byte arrays into ints and longs, and back again. diff --git a/app/src/main/java/org/bouncycastle/util/Strings.java b/app/src/main/java/org/bouncycastle/shaded/util/Strings.java similarity index 96% rename from app/src/main/java/org/bouncycastle/util/Strings.java rename to app/src/main/java/org/bouncycastle/shaded/util/Strings.java index 7f2d81b66..27a001fe2 100644 --- a/app/src/main/java/org/bouncycastle/util/Strings.java +++ b/app/src/main/java/org/bouncycastle/shaded/util/Strings.java @@ -1,4 +1,4 @@ -package org.bouncycastle.util; +package org.bouncycastle.shaded.util; import java.security.AccessController; import java.security.PrivilegedAction;