Commit 41eec3e3 authored by Mygod's avatar Mygod Committed by Max Lv

Use stable branch of libsodium

parent 56709385
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
[submodule "mobile/src/main/jni/libsodium"] [submodule "mobile/src/main/jni/libsodium"]
path = mobile/src/main/jni/libsodium path = mobile/src/main/jni/libsodium
url = https://github.com/jedisct1/libsodium.git url = https://github.com/jedisct1/libsodium.git
branch = stable
[submodule "mobile/src/main/jni/libev"] [submodule "mobile/src/main/jni/libev"]
path = mobile/src/main/jni/libev path = mobile/src/main/jni/libev
url = https://github.com/shadowsocks/libev.git url = https://github.com/shadowsocks/libev.git
......
...@@ -26,7 +26,6 @@ include $(CLEAR_VARS) ...@@ -26,7 +26,6 @@ include $(CLEAR_VARS)
SODIUM_SOURCE := \ SODIUM_SOURCE := \
crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \
crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \
crypto_auth/crypto_auth.c \ crypto_auth/crypto_auth.c \
crypto_auth/hmacsha256/auth_hmacsha256_api.c \ crypto_auth/hmacsha256/auth_hmacsha256_api.c \
crypto_auth/hmacsha256/cp/hmac_hmacsha256.c \ crypto_auth/hmacsha256/cp/hmac_hmacsha256.c \
......
Subproject commit a81cea2366b9e814861a6f47e5bd460e06f19295 Subproject commit e160de24fd146ab84b4eb397c7cffbf34775aa02
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
<item>AES-256-GCM</item> <item>AES-256-GCM</item>
<item>CHACHA20-POLY1305</item> <item>CHACHA20-POLY1305</item>
<item>CHACHA20-IETF-POLY1305</item> <item>CHACHA20-IETF-POLY1305</item>
<item>XCHACHA20-IETF-POLY1305</item>
</string-array> </string-array>
<string-array name="enc_method_value"> <string-array name="enc_method_value">
...@@ -43,7 +42,6 @@ ...@@ -43,7 +42,6 @@
<item>aes-256-gcm</item> <item>aes-256-gcm</item>
<item>chacha20-poly1305</item> <item>chacha20-poly1305</item>
<item>chacha20-ietf-poly1305</item> <item>chacha20-ietf-poly1305</item>
<item>xchacha20-ietf-poly1305</item>
</string-array> </string-array>
<string-array name="route_entry"> <string-array name="route_entry">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment