From: Richard Levitte <levitte@openssl.org>
Date: Fri, 20 Nov 2020 09:08:18 +0000 (+0100)
Subject: Switch deprecation method for RC2
X-Git-Tag: openssl-3.0.0-alpha10~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b6d1f51b40d95bc6bd6fae67f906ca856b1aa7a;p=thirdparty%2Fopenssl.git

Switch deprecation method for RC2

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
---

diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h
index f6f5fc91adf..ff633fd80f1 100644
--- a/include/openssl/rc2.h
+++ b/include/openssl/rc2.h
@@ -36,25 +36,29 @@ typedef struct rc2_key_st {
     RC2_INT data[64];
 } RC2_KEY;
 #  endif
-
-DEPRECATEDIN_3_0(void RC2_set_key(RC2_KEY *key, int len,
-                                  const unsigned char *data, int bits))
-DEPRECATEDIN_3_0(void RC2_ecb_encrypt(const unsigned char *in,
-                                      unsigned char *out, RC2_KEY *key,
-                                      int enc))
-DEPRECATEDIN_3_0(void RC2_encrypt(unsigned long *data, RC2_KEY *key))
-DEPRECATEDIN_3_0(void RC2_decrypt(unsigned long *data, RC2_KEY *key))
-DEPRECATEDIN_3_0(void RC2_cbc_encrypt(const unsigned char *in,
-                                      unsigned char *out, long length,
-                                      RC2_KEY *ks, unsigned char *iv, int enc))
-DEPRECATEDIN_3_0(void RC2_cfb64_encrypt(const unsigned char *in,
-                                        unsigned char *out, long length,
-                                        RC2_KEY *schedule, unsigned char *ivec,
-                                        int *num, int enc))
-DEPRECATEDIN_3_0(void RC2_ofb64_encrypt(const unsigned char *in,
-                                        unsigned char *out, long length,
-                                        RC2_KEY *schedule, unsigned char *ivec,
-                                        int *num))
+#  ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 void RC2_set_key(RC2_KEY *key, int len,
+                                       const unsigned char *data, int bits);
+OSSL_DEPRECATEDIN_3_0 void RC2_ecb_encrypt(const unsigned char *in,
+                                           unsigned char *out, RC2_KEY *key,
+                                           int enc);
+OSSL_DEPRECATEDIN_3_0 void RC2_encrypt(unsigned long *data, RC2_KEY *key);
+OSSL_DEPRECATEDIN_3_0 void RC2_decrypt(unsigned long *data, RC2_KEY *key);
+OSSL_DEPRECATEDIN_3_0 void RC2_cbc_encrypt(const unsigned char *in,
+                                           unsigned char *out, long length,
+                                           RC2_KEY *ks, unsigned char *iv,
+                                           int enc);
+OSSL_DEPRECATEDIN_3_0 void RC2_cfb64_encrypt(const unsigned char *in,
+                                             unsigned char *out, long length,
+                                             RC2_KEY *schedule,
+                                             unsigned char *ivec,
+                                             int *num, int enc);
+OSSL_DEPRECATEDIN_3_0 void RC2_ofb64_encrypt(const unsigned char *in,
+                                             unsigned char *out, long length,
+                                             RC2_KEY *schedule,
+                                             unsigned char *ivec,
+                                             int *num);
+#  endif
 
 #  ifdef  __cplusplus
 }