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

Switch deprecation method for SEED

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

diff --git a/include/openssl/seed.h b/include/openssl/seed.h
index 40238214430..edb218ae6e2 100644
--- a/include/openssl/seed.h
+++ b/include/openssl/seed.h
@@ -72,35 +72,38 @@ typedef struct seed_key_st {
 #   endif
 } SEED_KEY_SCHEDULE;
 #  endif /* OPENSSL_NO_DEPRECATED_3_0 */
-
-DEPRECATEDIN_3_0(void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
-                                   SEED_KEY_SCHEDULE *ks))
-
-DEPRECATEDIN_3_0(void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                                   unsigned char d[SEED_BLOCK_SIZE],
-                                   const SEED_KEY_SCHEDULE *ks))
-DEPRECATEDIN_3_0(void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                                   unsigned char d[SEED_BLOCK_SIZE],
-                                   const SEED_KEY_SCHEDULE *ks))
-
-DEPRECATEDIN_3_0(void SEED_ecb_encrypt(const unsigned char *in,
-                                       unsigned char *out,
-                                       const SEED_KEY_SCHEDULE *ks, int enc))
-DEPRECATEDIN_3_0(void SEED_cbc_encrypt(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const SEED_KEY_SCHEDULE *ks,
-                                       unsigned char ivec[SEED_BLOCK_SIZE],
-                                       int enc))
-DEPRECATEDIN_3_0(void SEED_cfb128_encrypt(const unsigned char *in,
-                                          unsigned char *out, size_t len,
-                                          const SEED_KEY_SCHEDULE *ks,
-                                          unsigned char ivec[SEED_BLOCK_SIZE],
-                                          int *num, int enc))
-DEPRECATEDIN_3_0(void SEED_ofb128_encrypt(const unsigned char *in,
-                                          unsigned char *out, size_t len,
-                                          const SEED_KEY_SCHEDULE *ks,
-                                          unsigned char ivec[SEED_BLOCK_SIZE],
-                                          int *num))
+#  ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0
+void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
+                  SEED_KEY_SCHEDULE *ks);
+OSSL_DEPRECATEDIN_3_0
+void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
+                  unsigned char d[SEED_BLOCK_SIZE],
+                  const SEED_KEY_SCHEDULE *ks);
+OSSL_DEPRECATEDIN_3_0
+void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
+                  unsigned char d[SEED_BLOCK_SIZE],
+                  const SEED_KEY_SCHEDULE *ks);
+OSSL_DEPRECATEDIN_3_0
+void SEED_ecb_encrypt(const unsigned char *in,
+                      unsigned char *out,
+                      const SEED_KEY_SCHEDULE *ks, int enc);
+OSSL_DEPRECATEDIN_3_0
+void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out, size_t len,
+                      const SEED_KEY_SCHEDULE *ks,
+                      unsigned char ivec[SEED_BLOCK_SIZE],
+                      int enc);
+OSSL_DEPRECATEDIN_3_0
+void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+                         size_t len, const SEED_KEY_SCHEDULE *ks,
+                         unsigned char ivec[SEED_BLOCK_SIZE],
+                         int *num, int enc);
+OSSL_DEPRECATEDIN_3_0
+void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+                         size_t len, const SEED_KEY_SCHEDULE *ks,
+                         unsigned char ivec[SEED_BLOCK_SIZE],
+                         int *num);
+#  endif
 
 #  ifdef  __cplusplus
 }