diff --git a/mobile/src/main/jni/Android.mk b/mobile/src/main/jni/Android.mk index 518dc0d2..90dcdf52 100755 --- a/mobile/src/main/jni/Android.mk +++ b/mobile/src/main/jni/Android.mk @@ -26,10 +26,12 @@ include $(CLEAR_VARS) SODIUM_SOURCE := \ crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ - crypto_core/salsa20/ref/core_salsa20.c \ - crypto_generichash/blake2/ref/blake2b-compress-ref.c \ - crypto_generichash/blake2/ref/blake2b-ref.c \ - crypto_generichash/blake2/ref/generichash_blake2b.c \ + crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \ + crypto_core/hchacha20/core_hchacha20.c \ + crypto_core/salsa/ref/core_salsa_ref.c \ + crypto_generichash/blake2b/ref/blake2b-compress-ref.c \ + crypto_generichash/blake2b/ref/blake2b-ref.c \ + crypto_generichash/blake2b/ref/generichash_blake2b.c \ crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \ crypto_onetimeauth/poly1305/donna/poly1305_donna.c \ crypto_pwhash/crypto_pwhash.c \ @@ -41,10 +43,10 @@ SODIUM_SOURCE := \ crypto_pwhash/argon2/pwhash_argon2i.c \ crypto_scalarmult/curve25519/scalarmult_curve25519.c \ crypto_stream/chacha20/stream_chacha20.c \ - crypto_stream/chacha20/ref/stream_chacha20_ref.c \ - crypto_stream/salsa20/ref/stream_salsa20_ref.c \ - crypto_stream/salsa20/ref/xor_salsa20_ref.c \ - crypto_verify/16/ref/verify_16.c \ + crypto_stream/chacha20/ref/chacha20_ref.c \ + crypto_stream/salsa20/stream_salsa20.c \ + crypto_stream/salsa20/ref/salsa20_ref.c \ + crypto_verify/sodium/verify.c \ randombytes/randombytes.c \ randombytes/sysrandom/randombytes_sysrandom.c \ sodium/core.c \ diff --git a/mobile/src/main/jni/libsodium b/mobile/src/main/jni/libsodium index e160de24..70170c28 160000 --- a/mobile/src/main/jni/libsodium +++ b/mobile/src/main/jni/libsodium @@ -1 +1 @@ -Subproject commit e160de24fd146ab84b4eb397c7cffbf34775aa02 +Subproject commit 70170c28c844a4786e75efc626e1aeebc93caebc diff --git a/mobile/src/main/res/values/arrays.xml b/mobile/src/main/res/values/arrays.xml index 8e7b2944..518a0c6d 100644 --- a/mobile/src/main/res/values/arrays.xml +++ b/mobile/src/main/res/values/arrays.xml @@ -19,6 +19,7 @@ AES-192-GCM AES-256-GCM CHACHA20-IETF-POLY1305 + XCHACHA20-IETF-POLY1305 @@ -40,6 +41,7 @@ aes-192-gcm aes-256-gcm chacha20-ietf-poly1305 + xchacha20-ietf-poly1305