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

Set NIDs for Blowfish and CAST.

Browse Source 
I hadn't thought that we still had the NIDs for these, but it appears
that we do. In which case, might as well set them.

Change-Id: I0d459ecacda95298c7ef345b73639cc02c74914f
Reviewed-on: https://boringssl-review.googlesource.com/c/34045
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Adam Langley 2019-01-03 14:28:31 -08:00 committed by CQ bot account: commit-bot@chromium.org
parent 17d553d299
commit 3c79ba8156
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
decrepit/blowfish/blowfish.c
View File

@ -593,7 +593,7 @@ static int bf_cfb_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
} }
static const EVP_CIPHER bf_ecb = { static const EVP_CIPHER bf_ecb = {
NID_undef, BF_BLOCK /* block_size */, NID_bf_ecb, BF_BLOCK /* block_size */,
16 /* key_size */, BF_BLOCK /* iv_len */, 16 /* key_size */, BF_BLOCK /* iv_len */,
sizeof(BF_KEY), EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH, sizeof(BF_KEY), EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, bf_init_key, NULL /* app_data */, bf_init_key,
@ -602,7 +602,7 @@ static const EVP_CIPHER bf_ecb = {
}; };
static const EVP_CIPHER bf_cbc = { static const EVP_CIPHER bf_cbc = {
NID_undef, BF_BLOCK /* block_size */, NID_bf_cbc, BF_BLOCK /* block_size */,
16 /* key_size */, BF_BLOCK /* iv_len */, 16 /* key_size */, BF_BLOCK /* iv_len */,
sizeof(BF_KEY), EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH, sizeof(BF_KEY), EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, bf_init_key, NULL /* app_data */, bf_init_key,
@ -611,7 +611,7 @@ static const EVP_CIPHER bf_cbc = {
}; };
static const EVP_CIPHER bf_cfb = { static const EVP_CIPHER bf_cfb = {
NID_undef, 1 /* block_size */, NID_bf_cfb64, 1 /* block_size */,
16 /* key_size */, BF_BLOCK /* iv_len */, 16 /* key_size */, BF_BLOCK /* iv_len */,
sizeof(BF_KEY), EVP_CIPH_CFB_MODE | EVP_CIPH_VARIABLE_LENGTH, sizeof(BF_KEY), EVP_CIPH_CFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, bf_init_key, NULL /* app_data */, bf_init_key,

4
decrepit/cast/cast.c
View File

@ -442,7 +442,7 @@ static int cast_cbc_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
} }
static const EVP_CIPHER cast5_ecb = { static const EVP_CIPHER cast5_ecb = {
NID_undef, CAST_BLOCK, NID_cast5_ecb, CAST_BLOCK,
CAST_KEY_LENGTH, CAST_BLOCK /* iv_len */, CAST_KEY_LENGTH, CAST_BLOCK /* iv_len */,
sizeof(CAST_KEY), EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH, sizeof(CAST_KEY), EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, cast_init_key, NULL /* app_data */, cast_init_key,
@ -451,7 +451,7 @@ static const EVP_CIPHER cast5_ecb = {
}; };
static const EVP_CIPHER cast5_cbc = { static const EVP_CIPHER cast5_cbc = {
NID_undef, CAST_BLOCK, NID_cast5_cbc, CAST_BLOCK,
CAST_KEY_LENGTH, CAST_BLOCK /* iv_len */, CAST_KEY_LENGTH, CAST_BLOCK /* iv_len */,
sizeof(CAST_KEY), EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH, sizeof(CAST_KEY), EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, cast_init_key, NULL /* app_data */, cast_init_key,