diff options
author | Richard Levitte <levitte@openssl.org> | 2020-11-20 10:08:18 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-12-04 20:44:24 +0100 |
commit | 1b6d1f51b40d95bc6bd6fae67f906ca856b1aa7a (patch) | |
tree | be00e028fc40e0035c4d4dc5478a8748fa64bead | |
parent | 00639486b0ab66d9cd89ab47fc56a3ac6cb40084 (diff) | |
download | openssl-1b6d1f51b40d95bc6bd6fae67f906ca856b1aa7a.tar.gz |
Switch deprecation method for RC2
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
-rw-r--r-- | include/openssl/rc2.h | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h index f6f5fc91ad..ff633fd80f 100644 --- a/include/openssl/rc2.h +++ b/include/openssl/rc2.h @@ -36,25 +36,29 @@ typedef struct rc2_key_st { RC2_INT data[64]; } RC2_KEY; # endif - -DEPRECATEDIN_3_0(void RC2_set_key(RC2_KEY *key, int len, - const unsigned char *data, int bits)) -DEPRECATEDIN_3_0(void RC2_ecb_encrypt(const unsigned char *in, - unsigned char *out, RC2_KEY *key, - int enc)) -DEPRECATEDIN_3_0(void RC2_encrypt(unsigned long *data, RC2_KEY *key)) -DEPRECATEDIN_3_0(void RC2_decrypt(unsigned long *data, RC2_KEY *key)) -DEPRECATEDIN_3_0(void RC2_cbc_encrypt(const unsigned char *in, - unsigned char *out, long length, - RC2_KEY *ks, unsigned char *iv, int enc)) -DEPRECATEDIN_3_0(void RC2_cfb64_encrypt(const unsigned char *in, - unsigned char *out, long length, - RC2_KEY *schedule, unsigned char *ivec, - int *num, int enc)) -DEPRECATEDIN_3_0(void RC2_ofb64_encrypt(const unsigned char *in, - unsigned char *out, long length, - RC2_KEY *schedule, unsigned char *ivec, - int *num)) +# ifndef OPENSSL_NO_DEPRECATED_3_0 +OSSL_DEPRECATEDIN_3_0 void RC2_set_key(RC2_KEY *key, int len, + const unsigned char *data, int bits); +OSSL_DEPRECATEDIN_3_0 void RC2_ecb_encrypt(const unsigned char *in, + unsigned char *out, RC2_KEY *key, + int enc); +OSSL_DEPRECATEDIN_3_0 void RC2_encrypt(unsigned long *data, RC2_KEY *key); +OSSL_DEPRECATEDIN_3_0 void RC2_decrypt(unsigned long *data, RC2_KEY *key); +OSSL_DEPRECATEDIN_3_0 void RC2_cbc_encrypt(const unsigned char *in, + unsigned char *out, long length, + RC2_KEY *ks, unsigned char *iv, + int enc); +OSSL_DEPRECATEDIN_3_0 void RC2_cfb64_encrypt(const unsigned char *in, + unsigned char *out, long length, + RC2_KEY *schedule, + unsigned char *ivec, + int *num, int enc); +OSSL_DEPRECATEDIN_3_0 void RC2_ofb64_encrypt(const unsigned char *in, + unsigned char *out, long length, + RC2_KEY *schedule, + unsigned char *ivec, + int *num); +# endif # ifdef __cplusplus } |