Deprecate Low Level Camellia APIs

[oweals/openssl.git] / include / openssl / camellia.h

diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h
index cac999eceec543d150c4c45dffd1b60be9b69770..dc95dee71a2a8e70dce26e7577be55c5632a8367 100644 (file)
--- a/include/openssl/camellia.h
+++ b/include/openssl/camellia.h
@@ -24,8 +24,12 @@
 extern "C" {
 #endif
 
-# define CAMELLIA_ENCRYPT        1
-# define CAMELLIA_DECRYPT        0
+# define CAMELLIA_BLOCK_SIZE 16
+
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+
+#  define CAMELLIA_ENCRYPT        1
+#  define CAMELLIA_DECRYPT        0
 
 /*
  * Because array size can't be a const in C, the following two are macros.
@@ -34,9 +38,8 @@ extern "C" {
 
 /* This should be a hidden type, but EVP requires that the size be known */
 
-# define CAMELLIA_BLOCK_SIZE 16
-# define CAMELLIA_TABLE_BYTE_LEN 272
-# define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
+#  define CAMELLIA_TABLE_BYTE_LEN 272
+#  define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
 
 typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match
                                                                * with WORD */
@@ -50,36 +53,62 @@ struct camellia_key_st {
 };
 typedef struct camellia_key_st CAMELLIA_KEY;
 
-int Camellia_set_key(const unsigned char *userKey, const int bits,
-                     CAMELLIA_KEY *key);
-
-void Camellia_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-void Camellia_decrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-
-void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                          const CAMELLIA_KEY *key, const int enc);
-void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t length, const CAMELLIA_KEY *key,
-                          unsigned char *ivec, const int enc);
-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);
-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);
-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);
-void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num);
-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 /* 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,
+                                            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,
+                                            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))
 
 # ifdef  __cplusplus
 }