From 41eec3e351efa502279ca6846e0dc1a95c161180 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 31 Jan 2017 22:38:54 +0800 Subject: [PATCH] Use stable branch of libsodium --- .gitmodules | 1 + mobile/src/main/jni/Android.mk | 1 - mobile/src/main/jni/libsodium | 2 +- mobile/src/main/res/values/arrays.xml | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 69ee8b25..c14024db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,6 +30,7 @@ [submodule "mobile/src/main/jni/libsodium"] path = mobile/src/main/jni/libsodium url = https://github.com/jedisct1/libsodium.git + branch = stable [submodule "mobile/src/main/jni/libev"] path = mobile/src/main/jni/libev url = https://github.com/shadowsocks/libev.git diff --git a/mobile/src/main/jni/Android.mk b/mobile/src/main/jni/Android.mk index ed6698e3..97d3a622 100755 --- a/mobile/src/main/jni/Android.mk +++ b/mobile/src/main/jni/Android.mk @@ -26,7 +26,6 @@ include $(CLEAR_VARS) SODIUM_SOURCE := \ crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ - crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \ crypto_auth/crypto_auth.c \ crypto_auth/hmacsha256/auth_hmacsha256_api.c \ crypto_auth/hmacsha256/cp/hmac_hmacsha256.c \ diff --git a/mobile/src/main/jni/libsodium b/mobile/src/main/jni/libsodium index a81cea23..e160de24 160000 --- a/mobile/src/main/jni/libsodium +++ b/mobile/src/main/jni/libsodium @@ -1 +1 @@ -Subproject commit a81cea2366b9e814861a6f47e5bd460e06f19295 +Subproject commit e160de24fd146ab84b4eb397c7cffbf34775aa02 diff --git a/mobile/src/main/res/values/arrays.xml b/mobile/src/main/res/values/arrays.xml index c7c50a7d..b1bcba81 100644 --- a/mobile/src/main/res/values/arrays.xml +++ b/mobile/src/main/res/values/arrays.xml @@ -20,7 +20,6 @@ AES-256-GCM CHACHA20-POLY1305 CHACHA20-IETF-POLY1305 - XCHACHA20-IETF-POLY1305 @@ -43,7 +42,6 @@ aes-256-gcm chacha20-poly1305 chacha20-ietf-poly1305 - xchacha20-ietf-poly1305