fix: crypto module at the upper level

2025-12-04 15:49:33 +01:00 · 2023-05-14 21:33:37 +02:00
parent 3b3908dd7c
commit 5b052b02a2
77 changed files with 5 additions and 7 deletions
--- a/database/crypto/.gitignore
+++ b/database/crypto/.gitignore
--- a/database/crypto/build.gradle
+++ b/database/crypto/build.gradle
--- a/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
+++ b/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/AESTest.kt
--- a/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
+++ b/database/crypto/src/androidTest/java/com/kunzisoft/encrypt/CipherTest.kt
--- a/crypto/src/main/AndroidManifest.xml
+++ b/crypto/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.kunzisoft.encrypt" />
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/CipherFactory.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/HashManager.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/StreamCipher.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESProvider.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/AESTransformer.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESCipherSpi.java
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/aes/NativeAESKeyTransformer.java
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Transformer.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/Argon2Type.kt
--- a/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
+++ b/database/crypto/src/main/java/com/kunzisoft/encrypt/argon2/NativeArgon2KeyTransformer.java
--- a/database/crypto/src/main/jni/.gitignore
+++ b/database/crypto/src/main/jni/.gitignore
--- a/database/crypto/src/main/jni/CMakeLists.txt
+++ b/database/crypto/src/main/jni/CMakeLists.txt
--- a/database/crypto/src/main/jni/aes/CMakeLists.txt
+++ b/database/crypto/src/main/jni/aes/CMakeLists.txt
--- a/database/crypto/src/main/jni/aes/aes/aes.h
+++ b/database/crypto/src/main/jni/aes/aes/aes.h
--- a/database/crypto/src/main/jni/aes/aes/aes.txt
+++ b/database/crypto/src/main/jni/aes/aes/aes.txt
--- a/database/crypto/src/main/jni/aes/aes/aes_amd64.asm
+++ b/database/crypto/src/main/jni/aes/aes/aes_amd64.asm
--- a/database/crypto/src/main/jni/aes/aes/aes_modes.c
+++ b/database/crypto/src/main/jni/aes/aes/aes_modes.c
--- a/database/crypto/src/main/jni/aes/aes/aes_via_ace.h
+++ b/database/crypto/src/main/jni/aes/aes/aes_via_ace.h
--- a/database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
+++ b/database/crypto/src/main/jni/aes/aes/aes_x86_v1.asm
--- a/database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
+++ b/database/crypto/src/main/jni/aes/aes/aes_x86_v2.asm
--- a/database/crypto/src/main/jni/aes/aes/aescpp.h
+++ b/database/crypto/src/main/jni/aes/aes/aescpp.h
--- a/database/crypto/src/main/jni/aes/aes/aescrypt.c
+++ b/database/crypto/src/main/jni/aes/aes/aescrypt.c
--- a/database/crypto/src/main/jni/aes/aes/aeskey.c
+++ b/database/crypto/src/main/jni/aes/aes/aeskey.c
--- a/database/crypto/src/main/jni/aes/aes/aesopt.h
+++ b/database/crypto/src/main/jni/aes/aes/aesopt.h
--- a/database/crypto/src/main/jni/aes/aes/aestab.c
+++ b/database/crypto/src/main/jni/aes/aes/aestab.c
--- a/database/crypto/src/main/jni/aes/aes/aestab.h
+++ b/database/crypto/src/main/jni/aes/aes/aestab.h
--- a/database/crypto/src/main/jni/aes/aes/aesxam.c
+++ b/database/crypto/src/main/jni/aes/aes/aesxam.c
--- a/database/crypto/src/main/jni/aes/aes/brg_endian.h
+++ b/database/crypto/src/main/jni/aes/aes/brg_endian.h
--- a/database/crypto/src/main/jni/aes/aes/brg_types.h
+++ b/database/crypto/src/main/jni/aes/aes/brg_types.h
--- a/database/crypto/src/main/jni/aes/aes/rfc3686.c
+++ b/database/crypto/src/main/jni/aes/aes/rfc3686.c
--- a/database/crypto/src/main/jni/aes/aes/tablegen.c
+++ b/database/crypto/src/main/jni/aes/aes/tablegen.c
--- a/database/crypto/src/main/jni/aes/aes/vb.txt
+++ b/database/crypto/src/main/jni/aes/aes/vb.txt
--- a/database/crypto/src/main/jni/aes/aes/vbaxam.doc
+++ b/database/crypto/src/main/jni/aes/aes/vbaxam.doc
--- a/database/crypto/src/main/jni/aes/aes/via_ace.txt
+++ b/database/crypto/src/main/jni/aes/aes/via_ace.txt
--- a/database/crypto/src/main/jni/aes/aes_jni.c
+++ b/database/crypto/src/main/jni/aes/aes_jni.c
--- a/database/crypto/src/main/jni/aes/sha/Android.mk
+++ b/database/crypto/src/main/jni/aes/sha/Android.mk
--- a/database/crypto/src/main/jni/aes/sha/brg_endian.h
+++ b/database/crypto/src/main/jni/aes/sha/brg_endian.h
--- a/database/crypto/src/main/jni/aes/sha/brg_types.h
+++ b/database/crypto/src/main/jni/aes/sha/brg_types.h
--- a/database/crypto/src/main/jni/aes/sha/hmac.c
+++ b/database/crypto/src/main/jni/aes/sha/hmac.c
--- a/database/crypto/src/main/jni/aes/sha/hmac.h
+++ b/database/crypto/src/main/jni/aes/sha/hmac.h
--- a/database/crypto/src/main/jni/aes/sha/pwd2key.c
+++ b/database/crypto/src/main/jni/aes/sha/pwd2key.c
--- a/database/crypto/src/main/jni/aes/sha/pwd2key.h
+++ b/database/crypto/src/main/jni/aes/sha/pwd2key.h
--- a/database/crypto/src/main/jni/aes/sha/sha1.c
+++ b/database/crypto/src/main/jni/aes/sha/sha1.c
--- a/database/crypto/src/main/jni/aes/sha/sha1.h
+++ b/database/crypto/src/main/jni/aes/sha/sha1.h
--- a/database/crypto/src/main/jni/aes/sha/sha1b.c
+++ b/database/crypto/src/main/jni/aes/sha/sha1b.c
--- a/database/crypto/src/main/jni/aes/sha/sha2.c
+++ b/database/crypto/src/main/jni/aes/sha/sha2.c
--- a/database/crypto/src/main/jni/aes/sha/sha2.h
+++ b/database/crypto/src/main/jni/aes/sha/sha2.h
--- a/database/crypto/src/main/jni/aes/sha/sha2b.c
+++ b/database/crypto/src/main/jni/aes/sha/sha2b.c
--- a/database/crypto/src/main/jni/aes/sha/shasum.c
+++ b/database/crypto/src/main/jni/aes/sha/shasum.c
--- a/database/crypto/src/main/jni/argon2/CMakeLists.txt
+++ b/database/crypto/src/main/jni/argon2/CMakeLists.txt
--- a/database/crypto/src/main/jni/argon2/argon2_jni.c
+++ b/database/crypto/src/main/jni/argon2/argon2_jni.c
--- a/database/crypto/src/main/jni/argon2/include/argon2.h
+++ b/database/crypto/src/main/jni/argon2/include/argon2.h
--- a/database/crypto/src/main/jni/argon2/src/CMakeLists.txt
+++ b/database/crypto/src/main/jni/argon2/src/CMakeLists.txt
--- a/database/crypto/src/main/jni/argon2/src/argon2.c
+++ b/database/crypto/src/main/jni/argon2/src/argon2.c
--- a/database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blake2-impl.h
--- a/database/crypto/src/main/jni/argon2/src/blake2/blake2.h
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blake2.h
--- a/database/crypto/src/main/jni/argon2/src/blake2/blake2b.c
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blake2b.c
--- a/database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
+++ b/database/crypto/src/main/jni/argon2/src/blake2/blamka-round-ref.h
--- a/database/crypto/src/main/jni/argon2/src/core.c
+++ b/database/crypto/src/main/jni/argon2/src/core.c
--- a/database/crypto/src/main/jni/argon2/src/core.h
+++ b/database/crypto/src/main/jni/argon2/src/core.h
--- a/database/crypto/src/main/jni/argon2/src/encoding.c
+++ b/database/crypto/src/main/jni/argon2/src/encoding.c
--- a/database/crypto/src/main/jni/argon2/src/encoding.h
+++ b/database/crypto/src/main/jni/argon2/src/encoding.h
--- a/database/crypto/src/main/jni/argon2/src/opt.c
+++ b/database/crypto/src/main/jni/argon2/src/opt.c
--- a/database/crypto/src/main/jni/argon2/src/opt.h
+++ b/database/crypto/src/main/jni/argon2/src/opt.h
--- a/database/crypto/src/main/jni/argon2/src/ref.c
+++ b/database/crypto/src/main/jni/argon2/src/ref.c
--- a/database/crypto/src/main/jni/argon2/src/ref.h
+++ b/database/crypto/src/main/jni/argon2/src/ref.h
--- a/database/crypto/src/main/jni/argon2/src/thread.c
+++ b/database/crypto/src/main/jni/argon2/src/thread.c
--- a/database/crypto/src/main/jni/argon2/src/thread.h
+++ b/database/crypto/src/main/jni/argon2/src/thread.h
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -43,7 +43,7 @@ dependencies {
    implementation 'commons-io:commons-io:2.8.0'
    implementation 'commons-codec:commons-codec:1.15'

-    implementation project(path: ':database:crypto')
+    implementation project(path: ':crypto')

    // Tests
    androidTestImplementation "androidx.test:runner:$android_test_version"
--- a/database/crypto/src/main/AndroidManifest.xml
+++ b/database/crypto/src/main/AndroidManifest.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kunzisoft.encrypt">
-
-</manifest>
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
 include ':app'
-include ':database', ':database:crypto'
+include ':database'
+include ':crypto'
 include ':icon-pack', ':icon-pack:classic', ':icon-pack:material'