File tree Expand file tree Collapse file tree 2 files changed +13
-5
lines changed
safebox-crypto/src/main/java/com/harrytmthy/safebox Expand file tree Collapse file tree 2 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -41,6 +41,8 @@ internal class ChaCha20CipherProvider(
41
41
private val deterministic : Boolean ,
42
42
) : CipherProvider {
43
43
44
+ private val cipherLock = Any ()
45
+
44
46
private val cipher by lazy {
45
47
try {
46
48
Cipher .getInstance(TRANSFORMATION , BouncyCastleProvider .PROVIDER_NAME )
@@ -84,6 +86,5 @@ internal class ChaCha20CipherProvider(
84
86
internal const val TRANSFORMATION = " ChaCha20-Poly1305"
85
87
private const val IV_SIZE = 12
86
88
private const val MAC_SIZE_BITS = 128
87
- private val cipherLock = Any ()
88
89
}
89
90
}
Original file line number Diff line number Diff line change @@ -50,15 +50,22 @@ object SafeBoxCryptoFactory {
50
50
fileName : String ,
51
51
): Pair <CipherProvider , CipherProvider > {
52
52
val aesGcmCipherProvider = AesGcmCipherProvider .create(aad = fileName.toByteArray())
53
- val keyProvider = SecureRandomKeyProvider .create(
53
+ val keyCipherKeyProvider = SecureRandomKeyProvider .create(
54
54
context = context,
55
55
fileName = fileName,
56
56
keySize = ChaCha20CipherProvider .KEY_SIZE ,
57
57
algorithm = ChaCha20CipherProvider .ALGORITHM ,
58
58
cipherProvider = aesGcmCipherProvider,
59
59
)
60
- val keyCipherProvider = ChaCha20CipherProvider (keyProvider, deterministic = true )
61
- val valueCipherProvider = ChaCha20CipherProvider (keyProvider, deterministic = false )
62
- return keyCipherProvider to valueCipherProvider
60
+ val valueCipherKeyProvider = SecureRandomKeyProvider .create(
61
+ context = context,
62
+ fileName = fileName,
63
+ keySize = ChaCha20CipherProvider .KEY_SIZE ,
64
+ algorithm = ChaCha20CipherProvider .ALGORITHM ,
65
+ cipherProvider = aesGcmCipherProvider,
66
+ )
67
+ val keyCipher = ChaCha20CipherProvider (keyCipherKeyProvider, deterministic = true )
68
+ val valueCipher = ChaCha20CipherProvider (valueCipherKeyProvider, deterministic = false )
69
+ return keyCipher to valueCipher
63
70
}
64
71
}
You can’t perform that action at this time.
0 commit comments