Set NIDs for Blowfish and CAST.
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>
diff --git a/decrepit/blowfish/blowfish.c b/decrepit/blowfish/blowfish.c
index 186f486..aa872bc 100644
--- a/decrepit/blowfish/blowfish.c
+++ b/decrepit/blowfish/blowfish.c
@@ -593,7 +593,7 @@
}
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 */,
sizeof(BF_KEY), EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, bf_init_key,
@@ -602,7 +602,7 @@
};
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 */,
sizeof(BF_KEY), EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, bf_init_key,
@@ -611,7 +611,7 @@
};
static const EVP_CIPHER bf_cfb = {
- NID_undef, 1 /* block_size */,
+ NID_bf_cfb64, 1 /* block_size */,
16 /* key_size */, BF_BLOCK /* iv_len */,
sizeof(BF_KEY), EVP_CIPH_CFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, bf_init_key,
diff --git a/decrepit/cast/cast.c b/decrepit/cast/cast.c
index bc37203..8fd4e3a 100644
--- a/decrepit/cast/cast.c
+++ b/decrepit/cast/cast.c
@@ -442,7 +442,7 @@
}
static const EVP_CIPHER cast5_ecb = {
- NID_undef, CAST_BLOCK,
+ NID_cast5_ecb, CAST_BLOCK,
CAST_KEY_LENGTH, CAST_BLOCK /* iv_len */,
sizeof(CAST_KEY), EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, cast_init_key,
@@ -451,7 +451,7 @@
};
static const EVP_CIPHER cast5_cbc = {
- NID_undef, CAST_BLOCK,
+ NID_cast5_cbc, CAST_BLOCK,
CAST_KEY_LENGTH, CAST_BLOCK /* iv_len */,
sizeof(CAST_KEY), EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH,
NULL /* app_data */, cast_init_key,