Make EVP_PKEY_[get1|set1]_tls_encodedpoint work with provided keys

[openssl.git] / include / openssl / idea.h

diff --git a/include/openssl/idea.h b/include/openssl/idea.h
index 3e46f2822d3c119bc28b1a0279e81a9d727d5214..ce46743a4a85b88155ede358d98d7330209a6495 100644 (file)
--- a/include/openssl/idea.h
+++ b/include/openssl/idea.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -19,52 +19,61 @@
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_IDEA
-# ifdef  __cplusplus
+#  ifdef  __cplusplus
 extern "C" {
-# endif
+#  endif
 
-typedef unsigned int IDEA_INT;
+#  define IDEA_BLOCK      8
+#  define IDEA_KEY_LENGTH 16
 
-# define IDEA_ENCRYPT    1
-# define IDEA_DECRYPT    0
+#  ifndef OPENSSL_NO_DEPRECATED_3_0
+
+typedef unsigned int IDEA_INT;
 
-# define IDEA_BLOCK      8
-# define IDEA_KEY_LENGTH 16
+#   define IDEA_ENCRYPT    1
+#   define IDEA_DECRYPT    0
 
 typedef struct idea_key_st {
     IDEA_INT data[9][6];
 } IDEA_KEY_SCHEDULE;
+#endif
 
-const char *IDEA_options(void);
-void IDEA_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      IDEA_KEY_SCHEDULE *ks);
-void IDEA_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
-void IDEA_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
-void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                      int enc);
-void IDEA_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                        int *num, int enc);
-void IDEA_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                        int *num);
-void IDEA_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
+DEPRECATEDIN_3_0(const char *IDEA_options(void))
+DEPRECATEDIN_3_0(void IDEA_ecb_encrypt(const unsigned char *in,
+                                       unsigned char *out,
+                                       IDEA_KEY_SCHEDULE *ks))
+DEPRECATEDIN_3_0(void IDEA_set_encrypt_key(const unsigned char *key,
+                                           IDEA_KEY_SCHEDULE *ks))
+DEPRECATEDIN_3_0(void IDEA_set_decrypt_key(IDEA_KEY_SCHEDULE *ek,
+                                           IDEA_KEY_SCHEDULE *dk))
+DEPRECATEDIN_3_0(void IDEA_cbc_encrypt(const unsigned char *in,
+                                       unsigned char *out, long length,
+                                       IDEA_KEY_SCHEDULE *ks,
+                                       unsigned char *iv, int enc))
+DEPRECATEDIN_3_0(void IDEA_cfb64_encrypt(const unsigned char *in,
+                                         unsigned char *out, long length,
+                                         IDEA_KEY_SCHEDULE *ks,
+                                         unsigned char *iv, int *num, int enc))
+DEPRECATEDIN_3_0(void IDEA_ofb64_encrypt(const unsigned char *in,
+                                         unsigned char *out, long length,
+                                         IDEA_KEY_SCHEDULE *ks,
+                                         unsigned char *iv, int *num))
+DEPRECATEDIN_3_0(void IDEA_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks))
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define idea_options          IDEA_options
-#  define idea_ecb_encrypt      IDEA_ecb_encrypt
-#  define idea_set_encrypt_key  IDEA_set_encrypt_key
-#  define idea_set_decrypt_key  IDEA_set_decrypt_key
-#  define idea_cbc_encrypt      IDEA_cbc_encrypt
-#  define idea_cfb64_encrypt    IDEA_cfb64_encrypt
-#  define idea_ofb64_encrypt    IDEA_ofb64_encrypt
-#  define idea_encrypt          IDEA_encrypt
-# endif
+#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#   define idea_options          IDEA_options
+#   define idea_ecb_encrypt      IDEA_ecb_encrypt
+#   define idea_set_encrypt_key  IDEA_set_encrypt_key
+#   define idea_set_decrypt_key  IDEA_set_decrypt_key
+#   define idea_cbc_encrypt      IDEA_cbc_encrypt
+#   define idea_cfb64_encrypt    IDEA_cfb64_encrypt
+#   define idea_ofb64_encrypt    IDEA_ofb64_encrypt
+#   define idea_encrypt          IDEA_encrypt
+#  endif
 
-# ifdef  __cplusplus
+#  ifdef  __cplusplus
 }
-# endif
+#  endif
 # endif
 
 #endif