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

Switch deprecation method for Camellia

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

diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h
index 897dd864cb3..88c2279e90f 100644
--- a/include/openssl/camellia.h
+++ b/include/openssl/camellia.h
@@ -54,61 +54,60 @@ struct camellia_key_st {
 typedef struct camellia_key_st CAMELLIA_KEY;
 
 # endif /* OPENSSL_NO_DEPRECATED_3_0 */
-
-DEPRECATEDIN_3_0(int Camellia_set_key(const unsigned char *userKey,
-                                      const int bits,
-                                      CAMELLIA_KEY *key))
-
-DEPRECATEDIN_3_0(void Camellia_encrypt(const unsigned char *in,
-                                       unsigned char *out,
-                                       const CAMELLIA_KEY *key))
-DEPRECATEDIN_3_0(void Camellia_decrypt(const unsigned char *in,
-                                       unsigned char *out,
-                                       const CAMELLIA_KEY *key))
-
-DEPRECATEDIN_3_0(void Camellia_ecb_encrypt(const unsigned char *in,
-                                           unsigned char *out,
-                                           const CAMELLIA_KEY *key,
-                                           const int enc))
-DEPRECATEDIN_3_0(void Camellia_cbc_encrypt(const unsigned char *in,
-                                           unsigned char *out,
-                                           size_t length, const
-                                           CAMELLIA_KEY *key,
-                                           unsigned char *ivec, const int enc))
-DEPRECATEDIN_3_0(void Camellia_cfb128_encrypt(const unsigned char *in,
-                                              unsigned char *out,
-                                              size_t length,
-                                              const CAMELLIA_KEY *key,
-                                              unsigned char *ivec,
-                                              int *num,
-                                              const int enc))
-DEPRECATEDIN_3_0(void Camellia_cfb1_encrypt(const unsigned char *in,
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 int Camellia_set_key(const unsigned char *userKey,
+                                           const int bits,
+                                           CAMELLIA_KEY *key);
+OSSL_DEPRECATEDIN_3_0 void Camellia_encrypt(const unsigned char *in,
                                             unsigned char *out,
-                                            size_t length,
-                                            const CAMELLIA_KEY *key,
-                                            unsigned char *ivec,
-                                            int *num,
-                                            const int enc))
-DEPRECATEDIN_3_0(void Camellia_cfb8_encrypt(const unsigned char *in,
+                                            const CAMELLIA_KEY *key);
+OSSL_DEPRECATEDIN_3_0 void Camellia_decrypt(const unsigned char *in,
                                             unsigned char *out,
-                                            size_t length,
-                                            const CAMELLIA_KEY *key,
-                                            unsigned char *ivec,
-                                            int *num,
-                                            const int enc))
-DEPRECATEDIN_3_0(void Camellia_ofb128_encrypt(const unsigned char *in,
-                                              unsigned char *out,
-                                              size_t length,
-                                              const CAMELLIA_KEY *key,
-                                              unsigned char *ivec,
-                                              int *num))
-DEPRECATEDIN_3_0(void Camellia_ctr128_encrypt(const unsigned char *in,
-                                              unsigned char *out,
-                                              size_t length,
-                                              const CAMELLIA_KEY *key,
-                                              unsigned char ivec[CAMELLIA_BLOCK_SIZE],
-                                              unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
-                                              unsigned int *num))
+                                            const CAMELLIA_KEY *key);
+OSSL_DEPRECATEDIN_3_0 void Camellia_ecb_encrypt(const unsigned char *in,
+                                                unsigned char *out,
+                                                const CAMELLIA_KEY *key,
+                                                const int enc);
+OSSL_DEPRECATEDIN_3_0 void Camellia_cbc_encrypt(const unsigned char *in,
+                                                unsigned char *out,
+                                                size_t length,
+                                                const CAMELLIA_KEY *key,
+                                                unsigned char *ivec,
+                                                const int enc);
+OSSL_DEPRECATEDIN_3_0 void Camellia_cfb128_encrypt(const unsigned char *in,
+                                                   unsigned char *out,
+                                                   size_t length,
+                                                   const CAMELLIA_KEY *key,
+                                                   unsigned char *ivec,
+                                                   int *num,
+                                                   const int enc);
+OSSL_DEPRECATEDIN_3_0 void Camellia_cfb1_encrypt(const unsigned char *in,
+                                                 unsigned char *out,
+                                                 size_t length,
+                                                 const CAMELLIA_KEY *key,
+                                                 unsigned char *ivec,
+                                                 int *num,
+                                                 const int enc);
+OSSL_DEPRECATEDIN_3_0 void Camellia_cfb8_encrypt(const unsigned char *in,
+                                                 unsigned char *out,
+                                                 size_t length,
+                                                 const CAMELLIA_KEY *key,
+                                                 unsigned char *ivec,
+                                                 int *num,
+                                                 const int enc);
+OSSL_DEPRECATEDIN_3_0 void Camellia_ofb128_encrypt(const unsigned char *in,
+                                                   unsigned char *out,
+                                                   size_t length,
+                                                   const CAMELLIA_KEY *key,
+                                                   unsigned char *ivec,
+                                                   int *num);
+OSSL_DEPRECATEDIN_3_0
+void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
+                             size_t length, const CAMELLIA_KEY *key,
+                             unsigned char ivec[CAMELLIA_BLOCK_SIZE],
+                             unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
+                             unsigned int *num);
+# endif
 
 # ifdef  __cplusplus
 }