summaryrefslogtreecommitdiffstats
path: root/src/crypto/cipher/e_rc2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/crypto/cipher/e_rc2.c')
-rw-r--r--src/crypto/cipher/e_rc2.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/src/crypto/cipher/e_rc2.c b/src/crypto/cipher/e_rc2.c
index 8ca7bba..c90ab93 100644
--- a/src/crypto/cipher/e_rc2.c
+++ b/src/crypto/cipher/e_rc2.c
@@ -395,18 +395,13 @@ static int rc2_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) {
case EVP_CTRL_INIT:
key->key_bits = EVP_CIPHER_CTX_key_length(ctx) * 8;
return 1;
- case EVP_CTRL_SET_RC2_KEY_BITS:
- /* Should be overridden by later call to |EVP_CTRL_INIT|, but
- * people call it, so it may as well work. */
- key->key_bits = arg;
- return 1;
default:
return -1;
}
}
-static const EVP_CIPHER rc2_40_cbc = {
+static const EVP_CIPHER rc2_40_cbc_cipher = {
NID_rc2_40_cbc,
8 /* block size */,
5 /* 40 bit */,
@@ -421,23 +416,5 @@ static const EVP_CIPHER rc2_40_cbc = {
};
const EVP_CIPHER *EVP_rc2_40_cbc(void) {
- return &rc2_40_cbc;
-}
-
-static const EVP_CIPHER rc2_cbc = {
- NID_rc2_cbc,
- 8 /* block size */,
- 16 /* 128 bit */,
- 8 /* iv len */,
- sizeof(EVP_RC2_KEY),
- EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
- NULL /* app_data */,
- rc2_init_key,
- rc2_cbc_cipher,
- NULL,
- rc2_ctrl,
-};
-
-const EVP_CIPHER *EVP_rc2_cbc(void) {
- return &rc2_cbc;
+ return &rc2_40_cbc_cipher;
}