Open core module more to add DataStore

Not sure this is the best approach, it will do for now until a better way comes around.
patrickfav · Oct 14, 2020 · 6a390ed · 6a390ed
1 parent af6d6d1
commit 6a390ed
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/armadillo/build.gradle b/armadillo/build.gradle
@@ -60,8 +60,8 @@ dependencies {
 
     androidTestImplementation 'org.bouncycastle:bcprov-jdk15on:1.60'
     androidTestImplementation 'org.mindrot:jbcrypt:0.4'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation(group: 'androidx.test.espresso', name: 'espresso-core', version: rootProject.ext.dependencies.espresso, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })

diff --git a/armadillo/src/main/java/at/favre/lib/armadillo/AesCbcEncryption.java b/armadillo/src/main/java/at/favre/lib/armadillo/AesCbcEncryption.java
@@ -39,7 +39,7 @@
  */
 @SuppressWarnings({"WeakerAccess", "DeprecatedIsStillUsed"})
 @Deprecated
-final class AesCbcEncryption implements AuthenticatedEncryption {
+public final class AesCbcEncryption implements AuthenticatedEncryption {
     private static final String ALGORITHM = "AES/CBC/PKCS5Padding";
     private static final String HMAC_ALGORITHM = "HmacSHA256";
     private static final int IV_LENGTH_BYTE = 16;

diff --git a/armadillo/src/main/java/at/favre/lib/armadillo/AesGcmEncryption.java b/armadillo/src/main/java/at/favre/lib/armadillo/AesGcmEncryption.java
@@ -32,7 +32,7 @@
  * @since 18.12.2017
  */
 @SuppressWarnings("WeakerAccess")
-final class AesGcmEncryption implements AuthenticatedEncryption {
+public final class AesGcmEncryption implements AuthenticatedEncryption {
     private static final String ALGORITHM = "AES/GCM/NoPadding";
     private static final int TAG_LENGTH_BIT = 128;
     private static final int IV_LENGTH_BYTE = 12;

diff --git a/armadillo/src/main/java/at/favre/lib/armadillo/DefaultEncryptionProtocol.java b/armadillo/src/main/java/at/favre/lib/armadillo/DefaultEncryptionProtocol.java
@@ -32,7 +32,7 @@
  * @since 18.12.2017
  */
 
-final class DefaultEncryptionProtocol implements EncryptionProtocol {
+public final class DefaultEncryptionProtocol implements EncryptionProtocol {
 
     private static final int CONTENT_SALT_LENGTH_BYTES = 16;
     private static final int STRETCHED_PASSWORD_LENGTH_BYTES = 32;
@@ -236,7 +236,7 @@ public static final class Factory implements EncryptionProtocol.Factory {
         private EncryptionProtocolConfig defaultConfig;
         private final List<EncryptionProtocolConfig> additionalDecryptionConfigs;
 
-        Factory(EncryptionProtocolConfig defaultConfig, EncryptionFingerprint fingerprint,
+        public Factory(EncryptionProtocolConfig defaultConfig, EncryptionFingerprint fingerprint,
                 StringMessageDigest stringMessageDigest, SecureRandom secureRandom,
                 boolean enableDerivedPasswordCaching,
                 List<EncryptionProtocolConfig> additionalDecryptionConfigs) {

diff --git a/armadillo/src/main/java/at/favre/lib/armadillo/EncryptionProtocol.java b/armadillo/src/main/java/at/favre/lib/armadillo/EncryptionProtocol.java
@@ -15,7 +15,7 @@
  * @since 18.12.2017
  */
 
-interface EncryptionProtocol {
+public interface EncryptionProtocol {
 
     /**
      * Given a original content key provided by the user creates a message digest of this key

diff --git a/armadillo/src/main/java/at/favre/lib/armadillo/HkdfMessageDigest.java b/armadillo/src/main/java/at/favre/lib/armadillo/HkdfMessageDigest.java
@@ -12,7 +12,7 @@
  * @author Patrick Favre-Bulle
  */
 
-final class HkdfMessageDigest implements StringMessageDigest {
+public final class HkdfMessageDigest implements StringMessageDigest {
     private final byte[] salt;
     private final int outLength;
 
@@ -22,7 +22,7 @@ final class HkdfMessageDigest implements StringMessageDigest {
      * @param salt          used in all derivations
      * @param outByteLength the byte length created by the derive function
      */
-    HkdfMessageDigest(byte[] salt, int outByteLength) {
+    public HkdfMessageDigest(byte[] salt, int outByteLength) {
         this.salt = Objects.requireNonNull(salt);
         this.outLength = outByteLength;
     }