Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-28 19:53:46 +00:00
Code Releases Activity

Merge pull request #481 from wongsyrone/chacha20-ietf

Browse Source 
Add IETF-compatible Chacha20 cipher support
This commit is contained in:
Max Lv
2015-12-13 20:39:24 +08:00
parent 616df26344 5c3ed5c9c1
commit 96f750f52c
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/encrypt.c
+12 -6
View File
@@ -117,7 +117,8 @@ static const char *supported_ciphers[CIPHER_NUM] = {
"rc2-cfb",
"seed-cfb",
"salsa20",
"chacha20"
"chacha20",
"chacha20-ietf"
};
#ifdef USE_CRYPTO_POLARSSL
@@ -138,7 +139,8 @@ static const char *supported_ciphers_polarssl[CIPHER_NUM] = {
CIPHER_UNSUPPORTED,
CIPHER_UNSUPPORTED,
"salsa20",
"chacha20"
"chacha20",
"chacha20-ietf"
};
#endif
@@ -160,7 +162,8 @@ static const char *supported_ciphers_mbedtls[CIPHER_NUM] = {
CIPHER_UNSUPPORTED,
CIPHER_UNSUPPORTED,
"salsa20",
"chacha20"
"chacha20",
"chacha20-ietf"
};
#endif
@@ -182,17 +185,18 @@ static const CCAlgorithm supported_ciphers_applecc[CIPHER_NUM] = {
kCCAlgorithmRC2,
kCCAlgorithmInvalid,
kCCAlgorithmInvalid,
kCCAlgorithmInvalid,
kCCAlgorithmInvalid
};
#endif
static const int supported_ciphers_iv_size[CIPHER_NUM] = {
0, 0, 16, 16, 16, 16, 8, 16, 16, 16, 8, 8, 8, 8, 16, 8, 8
0, 0, 16, 16, 16, 16, 8, 16, 16, 16, 8, 8, 8, 8, 16, 8, 8, 12
};
static const int supported_ciphers_key_size[CIPHER_NUM] = {
0, 16, 16, 16, 24, 32, 16, 16, 24, 32, 16, 8, 16, 16, 16, 32, 32
0, 16, 16, 16, 24, 32, 16, 16, 24, 32, 16, 8, 16, 16, 16, 32, 32, 32
};
static int safe_memcmp(const void *s1, const void *s2, size_t n)
@@ -242,6 +246,8 @@ static int crypto_stream_xor_ic(uint8_t *c, const uint8_t *m, uint64_t mlen,
return crypto_stream_salsa20_xor_ic(c, m, mlen, n, ic, k);
case CHACHA20:
return crypto_stream_chacha20_xor_ic(c, m, mlen, n, ic, k);
case CHACHA20IETF:
return crypto_stream_chacha20_ietf_xor_ic(c, m, mlen, n, (uint32_t)ic, k);
}
// always return 0
return 0;
@@ -1424,7 +1430,7 @@ void enc_key_init(int method, const char *pass)
cipher_kt_t *cipher;
cipher_kt_t cipher_info;
if (method == SALSA20 || method == CHACHA20) {
if (method == SALSA20 || method == CHACHA20 || method == CHACHA20IETF) {
if (sodium_init() == -1) {
FATAL("Failed to initialize sodium");
}
src/encrypt.h
+2 -1
View File
@@ -119,7 +119,7 @@ typedef struct {
#endif
#define SODIUM_BLOCK_SIZE 64
#define CIPHER_NUM 17
#define CIPHER_NUM 18
#define NONE -1
#define TABLE 0
@@ -139,6 +139,7 @@ typedef struct {
#define SEED_CFB 14
#define SALSA20 15
#define CHACHA20 16
#define CHACHA20IETF 17
#define ONETIMEAUTH_FLAG 0x10
#define ADDRTYPE_MASK 0xF