From: Matt Caswell <matt@openssl.org>
Date: Thu, 18 Dec 2025 16:57:27 +0000 (+0000)
Subject: Remove dead EVP_rc5() code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b217b180090bcc031347f3f5c95761ee4385c048;p=thirdparty%2Fopenssl.git

Remove dead EVP_rc5() code

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29446)
---

diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index 5133b28d366..48b011a6978 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -7,12 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-/*
- * RC5 low level APIs are deprecated for public use, but still ok for internal
- * use.
- */
-#include "internal/deprecated.h"
-
 #include <stdio.h>
 #include "internal/cryptlib.h"
 
@@ -24,61 +18,8 @@
 #include "evp_local.h"
 #include <openssl/rc5.h>
 
-static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc);
-static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
-
-typedef struct {
-    int rounds; /* number of rounds */
-    RC5_32_KEY ks; /* key schedule */
-} EVP_RC5_KEY;
-
-#define data(ctx) EVP_C_DATA(EVP_RC5_KEY, ctx)
-
 IMPLEMENT_BLOCK_CIPHER(rc5_32_12_16, ks, RC5_32, EVP_RC5_KEY, NID_rc5,
     8, RC5_32_KEY_LENGTH, 8, 64,
-    EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
-    r_32_12_16_init_key, NULL, NULL, NULL, rc5_ctrl)
-
-static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
-{
-    switch (type) {
-    case EVP_CTRL_INIT:
-        data(c)->rounds = RC5_12_ROUNDS;
-        return 1;
-
-    case EVP_CTRL_GET_RC5_ROUNDS:
-        *(int *)ptr = data(c)->rounds;
-        return 1;
-
-    case EVP_CTRL_SET_RC5_ROUNDS:
-        switch (arg) {
-        case RC5_8_ROUNDS:
-        case RC5_12_ROUNDS:
-        case RC5_16_ROUNDS:
-            data(c)->rounds = arg;
-            return 1;
-
-        default:
-            ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS);
-            return 0;
-        }
-
-    default:
-        return -1;
-    }
-}
-
-static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc)
-{
-    const int key_len = EVP_CIPHER_CTX_get_key_length(ctx);
-
-    if (key_len > 255 || key_len < 0) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_BAD_KEY_LENGTH);
-        return 0;
-    }
-    return RC5_32_set_key(&data(ctx)->ks, key_len, key, data(ctx)->rounds);
-}
+    EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT)
 
 #endif