Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-21 22:43:48 +00:00
Code Releases Activity

Merge pull request #111 from clowwindy/master

Browse Source 
Implement a correct RC4 encryption
This commit is contained in:
Max Lv
2014-09-09 19:39:30 +08:00
parent 457fc589e7 0d926cbb99
commit afeed97e91
2 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/encrypt.c
+36 -7
View File
@@ -59,6 +59,7 @@ static uint8_t *dec_table;
static uint8_t enc_key[MAX_KEY_LENGTH];
static int enc_key_len;
static int enc_iv_len;
static int enc_method;
#ifdef DEBUG
static void dump(char *tag, char *text, int len)
@@ -77,6 +78,7 @@ static const char* supported_ciphers[CIPHER_NUM] =
{
"table",
"rc4",
"rc4-md5",
"aes-128-cfb",
"aes-192-cfb",
"aes-256-cfb",
@@ -96,6 +98,7 @@ static const char* supported_ciphers_polarssl[CIPHER_NUM] =
{
"table",
"ARC4-128",
"ARC4-128",
"AES-128-CFB128",
"AES-192-CFB128",
"AES-256-CFB128",
@@ -116,6 +119,7 @@ static const CCAlgorithm supported_ciphers_applecc[CIPHER_NUM] =
{
kCCAlgorithmInvalid,
kCCAlgorithmRC4,
kCCAlgorithmRC4,
kCCAlgorithmAES,
kCCAlgorithmAES,
kCCAlgorithmAES,
@@ -133,12 +137,12 @@ static const CCAlgorithm supported_ciphers_applecc[CIPHER_NUM] =
#ifdef USE_CRYPTO_POLARSSL
static const int supported_ciphers_iv_size[CIPHER_NUM] =
{
0, 0, 16, 16, 16, 8, 16, 16, 16, 8, 8, 8, 8, 16
0, 0, 16, 16, 16, 16, 8, 16, 16, 16, 8, 8, 8, 8, 16
};
static const int supported_ciphers_key_size[CIPHER_NUM] =
{
0, 16, 16, 24, 32, 16, 16, 24, 32, 16, 8, 16, 16, 16
0, 16, 16, 16, 24, 32, 16, 16, 24, 32, 16, 8, 16, 16, 16
};
#endif
#endif
@@ -487,6 +491,10 @@ const cipher_kt_t *get_cipher_type(int method)
LOGE("get_cipher_type(): Illegal method");
return NULL;
}
if (method == RC4_MD5)
{
method = RC4;
}
const char *ciphername = supported_ciphers[method];
#if defined(USE_CRYPTO_OPENSSL)
@@ -571,7 +579,7 @@ void cipher_context_init(cipher_ctx_t *ctx, int method, int enc)
LOGE("Invalid key length: %d", enc_key_len);
exit(EXIT_FAILURE);
}
if (method > RC4)
if (method > RC4_MD5)
{
EVP_CIPHER_CTX_set_padding(evp, 1);
}
@@ -590,6 +598,7 @@ void cipher_context_init(cipher_ctx_t *ctx, int method, int enc)
void cipher_context_set_iv(cipher_ctx_t *ctx, uint8_t *iv, size_t iv_len, int enc)
{
const unsigned char *true_key;
if (iv == NULL)
{
LOGE("cipher_context_set_iv(): IV is null");
@@ -599,13 +608,25 @@ void cipher_context_set_iv(cipher_ctx_t *ctx, uint8_t *iv, size_t iv_len, int en
{
rand_bytes(iv, iv_len);
}
if (enc_method == RC4_MD5)
{
unsigned char key_iv[32];
memcpy(key_iv, enc_key, 16);
memcpy(key_iv + 16, iv, 16);
true_key = enc_md5(key_iv, 32, NULL);
iv_len = 0;
}
else
{
true_key = enc_key;
}
#ifdef USE_CRYPTO_APPLECC
cipher_cc_t *cc = &ctx->cc;
if (cc->valid == kCCContextValid)
{
memcpy(cc->iv, iv, iv_len);
memcpy(cc->key, enc_key, enc_key_len);
memcpy(cc->key, true_key, enc_key_len);
cc->iv_len = iv_len;
cc->key_len = enc_key_len;
cc->encrypt = enc ? kCCEncrypt : kCCDecrypt;
@@ -644,13 +665,13 @@ void cipher_context_set_iv(cipher_ctx_t *ctx, uint8_t *iv, size_t iv_len, int en
return;
}
#if defined(USE_CRYPTO_OPENSSL)
if (!EVP_CipherInit_ex(evp, NULL, NULL, enc_key, iv, enc))
if (!EVP_CipherInit_ex(evp, NULL, NULL, true_key, iv, enc))
{
EVP_CIPHER_CTX_cleanup(evp);
FATAL("Cannot set key and IV");
}
#elif defined(USE_CRYPTO_POLARSSL)
if (cipher_setkey(evp, enc_key, enc_key_len * 8, enc) != 0)
if (cipher_setkey(evp, true_key, enc_key_len * 8, enc) != 0)
{
cipher_free_ctx(evp);
FATAL("Cannot set PolarSSL cipher key");
@@ -975,7 +996,15 @@ void enc_key_init(int method, const char *pass)
{
FATAL("Cannot generate key and IV");
}
enc_iv_len = cipher_iv_size(cipher);
if (method == RC4_MD5)
{
enc_iv_len = 16;
}
else
{
enc_iv_len = cipher_iv_size(cipher);
}
enc_method = method;
}
int enc_init(const char *pass, const char *method)
src/encrypt.h
+14 -13
View File
@@ -106,22 +106,23 @@ typedef struct
#define BLOCK_SIZE 32
#define CIPHER_NUM 14
#define CIPHER_NUM 15
#define NONE -1
#define TABLE 0
#define RC4 1
#define AES_128_CFB 2
#define AES_192_CFB 3
#define AES_256_CFB 4
#define BF_CFB 5
#define CAMELLIA_128_CFB 6
#define CAMELLIA_192_CFB 7
#define CAMELLIA_256_CFB 8
#define CAST5_CFB 9
#define DES_CFB 10
#define IDEA_CFB 11
#define RC2_CFB 12
#define SEED_CFB 13
#define RC4_MD5 2
#define AES_128_CFB 3
#define AES_192_CFB 4
#define AES_256_CFB 5
#define BF_CFB 6
#define CAMELLIA_128_CFB 7
#define CAMELLIA_192_CFB 8
#define CAMELLIA_256_CFB 9
#define CAST5_CFB 10
#define DES_CFB 11
#define IDEA_CFB 12
#define RC2_CFB 13
#define SEED_CFB 14
#define min(a,b) (((a)<(b))?(a):(b))
#define max(a,b) (((a)>(b))?(a):(b))