From: Richard Levitte <levitte@openssl.org>
Date: Fri, 20 Nov 2020 09:04:30 +0000 (+0100)
Subject: Switch deprecation method for CAST
X-Git-Tag: openssl-3.0.0-alpha10~161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebafdfac737e1f49ac1ed5307edff99c061c82a1;p=thirdparty%2Fopenssl.git

Switch deprecation method for CAST

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

diff --git a/include/openssl/cast.h b/include/openssl/cast.h
index 89c5e90bbbc..0bf217beab2 100644
--- a/include/openssl/cast.h
+++ b/include/openssl/cast.h
@@ -39,36 +39,29 @@ typedef struct cast_key_st {
 } CAST_KEY;
 
 # endif /* OPENSSL_NO_DEPRECATED_3_0 */
-
-DEPRECATEDIN_3_0(void CAST_set_key(CAST_KEY *key, int len,
-                                   const unsigned char *data))
-DEPRECATEDIN_3_0(void CAST_ecb_encrypt(const unsigned char *in,
-                                       unsigned char *out,
-                                       const CAST_KEY *key,
-                                       int enc))
-DEPRECATEDIN_3_0(void CAST_encrypt(CAST_LONG *data,
-                                   const CAST_KEY *key))
-DEPRECATEDIN_3_0(void CAST_decrypt(CAST_LONG *data,
-                                   const CAST_KEY *key))
-DEPRECATEDIN_3_0(void CAST_cbc_encrypt(const unsigned char *in,
-                                       unsigned char *out,
-                                       long length,
-                                       const CAST_KEY *ks,
-                                       unsigned char *iv,
-                                       int enc))
-DEPRECATEDIN_3_0(void CAST_cfb64_encrypt(const unsigned char *in,
-                                         unsigned char *out,
-                                         long length,
-                                         const CAST_KEY *schedule,
-                                         unsigned char *ivec,
-                                         int *num,
-                                         int enc))
-DEPRECATEDIN_3_0(void CAST_ofb64_encrypt(const unsigned char *in,
-                                         unsigned char *out,
-                                         long length,
-                                         const CAST_KEY *schedule,
-                                         unsigned char *ivec,
-                                         int *num))
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0
+void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
+OSSL_DEPRECATEDIN_3_0
+void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
+                      const CAST_KEY *key, int enc);
+OSSL_DEPRECATEDIN_3_0
+void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
+OSSL_DEPRECATEDIN_3_0
+void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
+OSSL_DEPRECATEDIN_3_0
+void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                      long length, const CAST_KEY *ks, unsigned char *iv,
+                      int enc);
+OSSL_DEPRECATEDIN_3_0
+void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+                        long length, const CAST_KEY *schedule,
+                        unsigned char *ivec, int *num, int enc);
+OSSL_DEPRECATEDIN_3_0
+void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
+                        long length, const CAST_KEY *schedule,
+                        unsigned char *ivec, int *num);
+# endif
 
 # ifdef  __cplusplus
 }