diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-20 10:08:33 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-04 20:44:24 +0100 |
| commit | 17fbbe7727f62d288c5ade9576228fce5390714a (patch) | |
| tree | e3fa8f6c34c83864d9c68ca4b86d033402c9c611 /include | |
| parent | 53a14afee9a2a595fd567f9fefdbeae43fe02c75 (diff) | |
Switch deprecation method for RC5
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/rc5.h | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h index bf2c8259d7..de83352310 100644 --- a/include/openssl/rc5.h +++ b/include/openssl/rc5.h @@ -46,27 +46,30 @@ typedef struct rc5_key_st { RC5_32_INT data[2 * (RC5_16_ROUNDS + 1)]; } RC5_32_KEY; # endif - -DEPRECATEDIN_3_0(int RC5_32_set_key(RC5_32_KEY *key, int len, - const unsigned char *data, int rounds)) -DEPRECATEDIN_3_0(void RC5_32_ecb_encrypt(const unsigned char *in, - unsigned char *out, RC5_32_KEY *key, - int enc)) -DEPRECATEDIN_3_0(void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key)) -DEPRECATEDIN_3_0(void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key)) -DEPRECATEDIN_3_0(void RC5_32_cbc_encrypt(const unsigned char *in, - unsigned char *out, long length, - RC5_32_KEY *ks, unsigned char *iv, - int enc)) -DEPRECATEDIN_3_0(void RC5_32_cfb64_encrypt(const unsigned char *in, - unsigned char *out, long length, - RC5_32_KEY *schedule, - unsigned char *ivec, int *num, - int enc)) -DEPRECATEDIN_3_0(void RC5_32_ofb64_encrypt(const unsigned char *in, - unsigned char *out, long length, - RC5_32_KEY *schedule, - unsigned char *ivec, int *num)) +# ifndef OPENSSL_NO_DEPRECATED_3_0 +OSSL_DEPRECATEDIN_3_0 int RC5_32_set_key(RC5_32_KEY *key, int len, + const unsigned char *data, + int rounds); +OSSL_DEPRECATEDIN_3_0 void RC5_32_ecb_encrypt(const unsigned char *in, + unsigned char *out, + RC5_32_KEY *key, + int enc); +OSSL_DEPRECATEDIN_3_0 void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key); +OSSL_DEPRECATEDIN_3_0 void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key); +OSSL_DEPRECATEDIN_3_0 void RC5_32_cbc_encrypt(const unsigned char *in, + unsigned char *out, long length, + RC5_32_KEY *ks, unsigned char *iv, + int enc); +OSSL_DEPRECATEDIN_3_0 void RC5_32_cfb64_encrypt(const unsigned char *in, + unsigned char *out, long length, + RC5_32_KEY *schedule, + unsigned char *ivec, int *num, + int enc); +OSSL_DEPRECATEDIN_3_0 void RC5_32_ofb64_encrypt(const unsigned char *in, + unsigned char *out, long length, + RC5_32_KEY *schedule, + unsigned char *ivec, int *num); +# endif # ifdef __cplusplus } |