Skip to content

Make methods thread safe #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hieronymus777 merged 1 commit into from
Sep 6, 2019
Merged

Make methods thread safe #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions android/crypto/src/main/java/com/coinbase/wallet/crypto/ciphers/AES256GCM.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AES256GCM {
*
* @return A pair of encrypted data and authTag
*/
fun encrypt(data: ByteArray, key: ByteArray, iv: ByteArray): Pair<ByteArray, ByteArray> {
@Synchronized fun encrypt(data: ByteArray, key: ByteArray, iv: ByteArray): Pair<ByteArray, ByteArray> {
val cipher = Cipher.getInstance(TRANSFORMATION)
val paramSpec = GCMParameterSpec(AUTH_TAG_SIZE, iv)
val keySpec = SecretKeySpec(key, "AES")
Expand All @@ -45,7 +45,7 @@ class AES256GCM {
* @return A triple of iv, authTag, and encrypted data
* @throws `EncryptionException.invalidAES256GCMData` if unable to encrypt data
*/
fun encrypt(data: ByteArray, secretKey: SecretKey): Triple<ByteArray, ByteArray, ByteArray> {
@Synchronized fun encrypt(data: ByteArray, secretKey: SecretKey): Triple<ByteArray, ByteArray, ByteArray> {
val cipher = Cipher.getInstance(TRANSFORMATION)

cipher.init(Cipher.ENCRYPT_MODE, secretKey)
Expand All @@ -68,7 +68,7 @@ class AES256GCM {
* @return The decrypted data
* @throws`EncryptionError.invalidAES256GCMData` if unable to decrypt data
*/
fun decrypt(data: ByteArray, key: ByteArray, iv: ByteArray, authTag: ByteArray): ByteArray {
@Synchronized fun decrypt(data: ByteArray, key: ByteArray, iv: ByteArray, authTag: ByteArray): ByteArray {
val cipher = Cipher.getInstance(TRANSFORMATION)
val paramSpec = GCMParameterSpec(AUTH_TAG_SIZE, iv)
val keySpec = SecretKeySpec(key, "AES")
Expand All @@ -89,7 +89,7 @@ class AES256GCM {
*
* @return A triple of iv, authTag, and encrypted data
*/
fun decrypt(data: ByteArray, secretKey: SecretKey, iv: ByteArray, authTag: ByteArray): ByteArray {
@Synchronized fun decrypt(data: ByteArray, secretKey: SecretKey, iv: ByteArray, authTag: ByteArray): ByteArray {
val cipher = Cipher.getInstance(TRANSFORMATION)
val paramSpec = GCMParameterSpec(AUTH_TAG_SIZE, iv)
val encryptedData = data + authTag
Expand Down