richard
/
shadowsocks-libev
mirror of https://github.com/shadowsocks/shadowsocks-libev.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

remove HAVE_SODIUM_H

pull/196/merge
Max Lv 10 years ago
parent
ddf826493d
commit
1336881e9f
2 changed files with 8 additions and 70 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      src/encrypt.c
  2. 10
      src/encrypt.h

68
src/encrypt.c
View File

@ -26,10 +26,6 @@
#include "config.h" #include "config.h"
#endif #endif
#ifndef HAVE_SODIUM_H
#define HAVE_SODIUM_H
#endif
#if defined(USE_CRYPTO_OPENSSL) #if defined(USE_CRYPTO_OPENSSL)
#include <openssl/md5.h> #include <openssl/md5.h>
@ -53,9 +49,7 @@
#endif #endif
#ifdef HAVE_SODIUM_H
#include <sodium.h> #include <sodium.h>
#endif
#include "encrypt.h" #include "encrypt.h"
#include "utils.h" #include "utils.h"
@ -97,11 +91,9 @@ static const char * supported_ciphers[CIPHER_NUM] =
"des-cfb", "des-cfb",
"idea-cfb", "idea-cfb",
"rc2-cfb", "rc2-cfb",
"seed-cfb"
#ifdef HAVE_SODIUM_H
,"salsa20"
,"chacha20"
#endif
"seed-cfb",
"salsa20",
"chacha20"
}; };
#ifdef USE_CRYPTO_POLARSSL #ifdef USE_CRYPTO_POLARSSL
@ -121,11 +113,9 @@ static const char * supported_ciphers_polarssl[CIPHER_NUM] =
CIPHER_UNSUPPORTED, CIPHER_UNSUPPORTED,
CIPHER_UNSUPPORTED, CIPHER_UNSUPPORTED,
CIPHER_UNSUPPORTED, CIPHER_UNSUPPORTED,
CIPHER_UNSUPPORTED
#ifdef HAVE_SODIUM_H
,"salsa20"
,"chacha20"
#endif
CIPHER_UNSUPPORTED,
"salsa20",
"chacha20"
}; };
#endif #endif
@ -153,25 +143,16 @@ static const CCAlgorithm supported_ciphers_applecc[CIPHER_NUM] =
#endif #endif
#if defined(HAVE_SODIUM_H) || (defined(USE_CRYPTO_POLARSSL) && defined(USE_CRYPTO_APPLECC))
static const int supported_ciphers_iv_size[CIPHER_NUM] = static const int supported_ciphers_iv_size[CIPHER_NUM] =
{ {
0, 0, 16, 16, 16, 16, 8, 16, 16, 16, 8, 8, 8, 8, 16
#ifdef HAVE_SODIUM_H
, 8, 8
#endif
0, 0, 16, 16, 16, 16, 8, 16, 16, 16, 8, 8, 8, 8, 16 , 8, 8
}; };
static const int supported_ciphers_key_size[CIPHER_NUM] = static const int supported_ciphers_key_size[CIPHER_NUM] =
{ {
0, 16, 16, 16, 24, 32, 16, 16, 24, 32, 16, 8, 16, 16, 16
#ifdef HAVE_SODIUM_H
, 32, 32
#endif
0, 16, 16, 16, 24, 32, 16, 16, 24, 32, 16, 8, 16, 16, 16 , 32, 32
}; };
#endif
#ifdef HAVE_SODIUM_H
static int crypto_stream_xor_ic(uint8_t *c, const uint8_t *m, uint64_t mlen, static int crypto_stream_xor_ic(uint8_t *c, const uint8_t *m, uint64_t mlen,
const uint8_t *n, uint64_t ic, const uint8_t *k, int method) const uint8_t *n, uint64_t ic, const uint8_t *k, int method)
{ {
@ -184,7 +165,6 @@ static int crypto_stream_xor_ic(uint8_t *c, const uint8_t *m, uint64_t mlen,
// always return 0 // always return 0
return 0; return 0;
} }
#endif
static int random_compare(const void *_x, const void *_y, uint32_t i, static int random_compare(const void *_x, const void *_y, uint32_t i,
uint64_t a) uint64_t a)
@ -511,11 +491,9 @@ const cipher_kt_t *get_cipher_type(int method)
method = RC4; method = RC4;
} }
#ifdef HAVE_SODIUM_H
if (method >= SALSA20) { if (method >= SALSA20) {
return NULL; return NULL;
} }
#endif
const char *ciphername = supported_ciphers[method]; const char *ciphername = supported_ciphers[method];
#if defined(USE_CRYPTO_OPENSSL) #if defined(USE_CRYPTO_OPENSSL)
@ -552,12 +530,10 @@ void cipher_context_init(cipher_ctx_t *ctx, int method, int enc)
return; return;
} }
#ifdef HAVE_SODIUM_H
if (method >= SALSA20) { if (method >= SALSA20) {
enc_iv_len = supported_ciphers_iv_size[method]; enc_iv_len = supported_ciphers_iv_size[method];
return; return;
} }
#endif
const char *ciphername = supported_ciphers[method]; const char *ciphername = supported_ciphers[method];
#if defined(USE_CRYPTO_APPLECC) #if defined(USE_CRYPTO_APPLECC)
@ -624,12 +600,10 @@ void cipher_context_set_iv(cipher_ctx_t *ctx, uint8_t *iv, size_t iv_len,
rand_bytes(iv, iv_len); rand_bytes(iv, iv_len);
} }
#ifdef HAVE_SODIUM_H
if (enc_method >= SALSA20) { if (enc_method >= SALSA20) {
memcpy(ctx->iv, iv, iv_len); memcpy(ctx->iv, iv, iv_len);
return; return;
} }
#endif
if (enc_method == RC4_MD5) { if (enc_method == RC4_MD5) {
unsigned char key_iv[32]; unsigned char key_iv[32];
@ -713,10 +687,8 @@ void cipher_context_set_iv(cipher_ctx_t *ctx, uint8_t *iv, size_t iv_len,
void cipher_context_release(cipher_ctx_t *ctx) void cipher_context_release(cipher_ctx_t *ctx)
{ {
#ifdef HAVE_SODIUM_H
if (enc_method >= SALSA20) if (enc_method >= SALSA20)
return; return;
#endif
#ifdef USE_CRYPTO_APPLECC #ifdef USE_CRYPTO_APPLECC
cipher_cc_t *cc = &ctx->cc; cipher_cc_t *cc = &ctx->cc;
@ -774,18 +746,14 @@ char * ss_encrypt_all(int buf_size, char *plaintext, ssize_t *len, int method)
cipher_context_set_iv(&evp, iv, iv_len, 1); cipher_context_set_iv(&evp, iv, iv_len, 1);
memcpy(ciphertext, iv, iv_len); memcpy(ciphertext, iv, iv_len);
#ifdef HAVE_SODIUM_H
if (method >= SALSA20) { if (method >= SALSA20) {
crypto_stream_xor_ic((uint8_t *)(ciphertext + iv_len), crypto_stream_xor_ic((uint8_t *)(ciphertext + iv_len),
(const uint8_t *)plaintext, (uint64_t)(p_len), (const uint8_t *)iv, (const uint8_t *)plaintext, (uint64_t)(p_len), (const uint8_t *)iv,
0, enc_key, method); 0, enc_key, method);
} else { } else {
#endif
err = cipher_context_update(&evp, (uint8_t *)(ciphertext + iv_len), err = cipher_context_update(&evp, (uint8_t *)(ciphertext + iv_len),
&c_len, (const uint8_t *)plaintext, p_len); &c_len, (const uint8_t *)plaintext, p_len);
#ifdef HAVE_SODIUM_H
} }
#endif
if (!err) { if (!err) {
free(ciphertext); free(ciphertext);
@ -834,13 +802,10 @@ char * ss_encrypt(int buf_size, char *plaintext, ssize_t *len,
uint8_t iv[MAX_IV_LENGTH]; uint8_t iv[MAX_IV_LENGTH];
cipher_context_set_iv(&ctx->evp, iv, iv_len, 1); cipher_context_set_iv(&ctx->evp, iv, iv_len, 1);
memcpy(ciphertext, iv, iv_len); memcpy(ciphertext, iv, iv_len);
#ifdef HAVE_SODIUM_H
ctx->counter = 0; ctx->counter = 0;
#endif
ctx->init = 1; ctx->init = 1;
} }
#ifdef HAVE_SODIUM_H
if (enc_method >= SALSA20) { if (enc_method >= SALSA20) {
int padding = ctx->counter % SODIUM_BLOCK_SIZE; int padding = ctx->counter % SODIUM_BLOCK_SIZE;
if (buf_len < iv_len + padding + c_len) { if (buf_len < iv_len + padding + c_len) {
@ -860,7 +825,6 @@ char * ss_encrypt(int buf_size, char *plaintext, ssize_t *len,
memmove(ciphertext + iv_len, ciphertext + iv_len + padding, c_len); memmove(ciphertext + iv_len, ciphertext + iv_len + padding, c_len);
} }
} else { } else {
#endif
err = cipher_context_update(&ctx->evp, (uint8_t *)(ciphertext + iv_len), err = cipher_context_update(&ctx->evp, (uint8_t *)(ciphertext + iv_len),
&c_len, (const uint8_t *)plaintext, p_len); &c_len, (const uint8_t *)plaintext, p_len);
if (!err) { if (!err) {
@ -868,9 +832,7 @@ char * ss_encrypt(int buf_size, char *plaintext, ssize_t *len,
free(plaintext); free(plaintext);
return NULL; return NULL;
} }
#ifdef HAVE_SODIUM_H
} }
#endif
#ifdef DEBUG #ifdef DEBUG
dump("PLAIN", plaintext, p_len); dump("PLAIN", plaintext, p_len);
@ -905,19 +867,15 @@ char * ss_decrypt_all(int buf_size, char *ciphertext, ssize_t *len, int method)
memcpy(iv, ciphertext, iv_len); memcpy(iv, ciphertext, iv_len);
cipher_context_set_iv(&evp, iv, iv_len, 0); cipher_context_set_iv(&evp, iv, iv_len, 0);
#ifdef HAVE_SODIUM_H
if (method >= SALSA20) { if (method >= SALSA20) {
crypto_stream_xor_ic((uint8_t *)plaintext, crypto_stream_xor_ic((uint8_t *)plaintext,
(const uint8_t *)(ciphertext + iv_len), (uint64_t)(c_len - iv_len), (const uint8_t *)(ciphertext + iv_len), (uint64_t)(c_len - iv_len),
(const uint8_t *)iv, 0, enc_key, method); (const uint8_t *)iv, 0, enc_key, method);
} else { } else {
#endif
err = cipher_context_update(&evp, (uint8_t *)plaintext, &p_len, err = cipher_context_update(&evp, (uint8_t *)plaintext, &p_len,
(const uint8_t *)(ciphertext + iv_len), (const uint8_t *)(ciphertext + iv_len),
c_len - iv_len); c_len - iv_len);
#ifdef HAVE_SODIUM_H
} }
#endif
if (!err) { if (!err) {
free(ciphertext); free(ciphertext);
@ -963,13 +921,10 @@ char * ss_decrypt(int buf_size, char *ciphertext, ssize_t *len,
p_len -= iv_len; p_len -= iv_len;
memcpy(iv, ciphertext, iv_len); memcpy(iv, ciphertext, iv_len);
cipher_context_set_iv(&ctx->evp, iv, iv_len, 0); cipher_context_set_iv(&ctx->evp, iv, iv_len, 0);
#ifdef HAVE_SODIUM_H
ctx->counter = 0; ctx->counter = 0;
#endif
ctx->init = 1; ctx->init = 1;
} }
#ifdef HAVE_SODIUM_H
if (enc_method >= SALSA20) { if (enc_method >= SALSA20) {
int padding = ctx->counter % SODIUM_BLOCK_SIZE; int padding = ctx->counter % SODIUM_BLOCK_SIZE;
if (buf_len < p_len + padding) { if (buf_len < p_len + padding) {
@ -989,13 +944,10 @@ char * ss_decrypt(int buf_size, char *ciphertext, ssize_t *len,
memmove(plaintext, plaintext + padding, p_len); memmove(plaintext, plaintext + padding, p_len);
} }
} else { } else {
#endif
err = cipher_context_update(&ctx->evp, (uint8_t *)plaintext, &p_len, err = cipher_context_update(&ctx->evp, (uint8_t *)plaintext, &p_len,
(const uint8_t *)(ciphertext + iv_len), (const uint8_t *)(ciphertext + iv_len),
c_len - iv_len); c_len - iv_len);
#ifdef HAVE_SODIUM_H
} }
#endif
if (!err) { if (!err) {
free(ciphertext); free(ciphertext);
@ -1046,7 +998,6 @@ void enc_key_init(int method, const char *pass)
cipher_kt_t *cipher; cipher_kt_t *cipher;
#ifdef HAVE_SODIUM_H
if (method == SALSA20 || method == CHACHA20) { if (method == SALSA20 || method == CHACHA20) {
if (sodium_init() == -1) { if (sodium_init() == -1) {
FATAL("Failed to initialize sodium"); FATAL("Failed to initialize sodium");
@ -1063,11 +1014,8 @@ void enc_key_init(int method, const char *pass)
cipher->iv_size = supported_ciphers_iv_size[method]; cipher->iv_size = supported_ciphers_iv_size[method];
#endif #endif
} else { } else {
#endif
cipher = (cipher_kt_t *) get_cipher_type(method); cipher = (cipher_kt_t *) get_cipher_type(method);
#ifdef HAVE_SODIUM_H
} }
#endif
if (cipher == NULL) { if (cipher == NULL) {
do { do {

10
src/encrypt.h
View File

@ -92,9 +92,7 @@ typedef struct {
#ifdef USE_CRYPTO_APPLECC #ifdef USE_CRYPTO_APPLECC
cipher_cc_t cc; cipher_cc_t cc;
#endif #endif
#ifdef HAVE_SODIUM_H
uint8_t iv[MAX_IV_LENGTH]; uint8_t iv[MAX_IV_LENGTH];
#endif
} cipher_ctx_t; } cipher_ctx_t;
#ifdef HAVE_STDINT_H #ifdef HAVE_STDINT_H
@ -103,12 +101,8 @@ typedef struct {
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#ifdef HAVE_SODIUM_H
#define SODIUM_BLOCK_SIZE 64 #define SODIUM_BLOCK_SIZE 64
#define CIPHER_NUM 17 #define CIPHER_NUM 17
#else
#define CIPHER_NUM 15
#endif
#define NONE -1 #define NONE -1
#define TABLE 0 #define TABLE 0
@ -126,19 +120,15 @@ typedef struct {
#define IDEA_CFB 12 #define IDEA_CFB 12
#define RC2_CFB 13 #define RC2_CFB 13
#define SEED_CFB 14 #define SEED_CFB 14
#ifdef HAVE_SODIUM_H
#define SALSA20 15 #define SALSA20 15
#define CHACHA20 16 #define CHACHA20 16
#endif
#define min(a, b) (((a) < (b)) ? (a) : (b)) #define min(a, b) (((a) < (b)) ? (a) : (b))
#define max(a, b) (((a) > (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b))
struct enc_ctx { struct enc_ctx {
uint8_t init; uint8_t init;
#ifdef HAVE_SODIUM_H
uint64_t counter; uint64_t counter;
#endif
cipher_ctx_t evp; cipher_ctx_t evp;
}; };

Write Preview
Loading…
Cancel
Save