kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pem_lib: make |cipher_by_name| recognize some more ciphers.

Browse Source 
Change-Id: I3130eec5d902ad22d1af185556955ff806b05097
Reviewed-on: https://boringssl-review.googlesource.com/5150
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Matt Braithwaite 2015-06-17 13:15:10 -07:00 committed by Adam Langley
parent 7244fa46f7
commit 979c87add8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/pem/pem_lib.c
View File

@ -437,11 +437,18 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
}
static const EVP_CIPHER* cipher_by_name(const char *name) {
if (strcmp(name, "DES-CBC") == 0) {
/* This is similar to the (deprecated) function |EVP_get_cipherbyname|. */
if (0 == strcmp(name, SN_rc4)) {
return EVP_rc4();
} else if (0 == strcmp(name, SN_des_cbc)) {
return EVP_des_cbc();
} else if (strcmp(name, "AES-128-CBC") == 0) {
} else if (0 == strcmp(name, SN_des_ede3_cbc)) {
return EVP_des_ede3_cbc();
} else if (0 == strcmp(name, SN_aes_128_cbc)) {
return EVP_aes_128_cbc();
} else if (strcmp(name, "AES-256-CBC") == 0) {
} else if (0 == strcmp(name, SN_aes_192_cbc)) {
return EVP_aes_192_cbc();
} else if (0 == strcmp(name, SN_aes_256_cbc)) {
return EVP_aes_256_cbc();
} else {
return NULL;