Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-11-03 16:45:53 +00:00
Code Releases Activity

Merge pull request #8 from linusyang/cipher

Browse Source 
[Encryption] Improve cipher detection
This commit is contained in:
Max Lv
2013-06-09 02:48:19 -07:00
parent 923be25509 48a602cc4e
commit f2e3239138
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/encrypt.c
+20 -16
View File
@@ -28,7 +28,7 @@ static dump(char *tag, char *text) {
} }
#endif #endif
static const char* supported_ciphers[14] = { static const char* supported_ciphers[CIPHER_NUM] = {
"table", "table",
"rc4", "rc4",
"aes-128-cfb", "aes-128-cfb",
@@ -227,6 +227,11 @@ char* ss_decrypt(char *ciphertext, ssize_t *len, struct enc_ctx *ctx) {
void enc_ctx_init(int method, struct enc_ctx *ctx, int enc) { void enc_ctx_init(int method, struct enc_ctx *ctx, int enc) {
const EVP_CIPHER *cipher = EVP_get_cipherbyname(supported_ciphers[method]); const EVP_CIPHER *cipher = EVP_get_cipherbyname(supported_ciphers[method]);
if (cipher == NULL) {
LOGE("Cipher %s not found in OpenSSL library", supported_ciphers[method]);
FATAL("Cannot initialize cipher");
return;
}
memset(ctx, 0, sizeof(struct enc_ctx)); memset(ctx, 0, sizeof(struct enc_ctx));
EVP_CIPHER_CTX *evp = &ctx->evp; EVP_CIPHER_CTX *evp = &ctx->evp;
@@ -246,6 +251,11 @@ void enc_key_init(int method, const char *pass) {
uint8_t iv[EVP_MAX_IV_LENGTH]; uint8_t iv[EVP_MAX_IV_LENGTH];
const EVP_CIPHER *cipher = EVP_get_cipherbyname(supported_ciphers[method]); const EVP_CIPHER *cipher = EVP_get_cipherbyname(supported_ciphers[method]);
if (cipher == NULL) {
LOGE("Cipher %s not found in OpenSSL library", supported_ciphers[method]);
FATAL("Cannot initialize cipher");
return;
}
enc_key_len = EVP_BytesToKey(cipher, EVP_md5(), NULL, (uint8_t *)pass, enc_key_len = EVP_BytesToKey(cipher, EVP_md5(), NULL, (uint8_t *)pass,
strlen(pass), 1, enc_key, iv); strlen(pass), 1, enc_key, iv);
@@ -254,21 +264,15 @@ void enc_key_init(int method, const char *pass) {
int enc_init(const char *pass, const char *method) { int enc_init(const char *pass, const char *method) {
int m = TABLE; int m = TABLE;
if (method != NULL && strcmp(method, "table") != 0) { if (method != NULL) {
if (strcmp(method, "aes-128-cfb") == 0) { for (m = TABLE; m < CIPHER_NUM; m++) {
m = AES_128_CFB; if (strcmp(method, supported_ciphers[m]) == 0) {
} else if (strcmp(method, "aes-192-cfb") == 0) { break;
m = AES_192_CFB; }
} else if (strcmp(method, "aes-256-cfb") == 0) { }
m = AES_256_CFB; if (m >= CIPHER_NUM) {
} else if (strcmp(method, "bf-cfb") == 0) { LOGE("Invalid cipher name: %s, use table instead", method);
m = BF_CFB; m = TABLE;
} else if (strcmp(method, "cast5-cfb") == 0) {
m = CAST5_CFB;
} else if (strcmp(method, "des-cfb") == 0) {
m = DES_CFB;
} else if (strcmp(method, "rc4") == 0) {
m = RC4;
} }
} }
if (m == TABLE) { if (m == TABLE) {
src/encrypt.h
+1
View File
@@ -19,6 +19,7 @@
#define BUF_SIZE 512 #define BUF_SIZE 512
#define BLOCK_SIZE 32 #define BLOCK_SIZE 32
#define CIPHER_NUM 14
#define NONE -1 #define NONE -1
#define TABLE 0 #define TABLE 0
#define RC4 1 #define RC4 1