Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
41eec3e3
Commit
41eec3e3
authored
Jan 31, 2017
by
Mygod
Committed by
Max Lv
Feb 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use stable branch of libsodium
parent
56709385
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
4 deletions
+2
-4
.gitmodules
.gitmodules
+1
-0
mobile/src/main/jni/Android.mk
mobile/src/main/jni/Android.mk
+0
-1
mobile/src/main/jni/libsodium
mobile/src/main/jni/libsodium
+1
-1
mobile/src/main/res/values/arrays.xml
mobile/src/main/res/values/arrays.xml
+0
-2
No files found.
.gitmodules
View file @
41eec3e3
...
@@ -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
...
...
mobile/src/main/jni/Android.mk
View file @
41eec3e3
...
@@ -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
\
...
...
libsodium
@
e160de24
Subproject commit
a81cea2366b9e814861a6f47e5bd460e06f19295
Subproject commit
e160de24fd146ab84b4eb397c7cffbf34775aa02
mobile/src/main/res/values/arrays.xml
View file @
41eec3e3
...
@@ -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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment