diff options
author | Pauli <paul.dale@oracle.com> | 2020-01-14 10:33:03 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-01-16 07:07:27 +1000 |
commit | 62c3fed0cd52316259e4e2c0e5878bcfa69b38f9 (patch) | |
tree | 72dd00534999ea41ab76b23b3271a95c1222ac45 /include | |
parent | 26aae51347465764c755f0985bd1ac85d3f734e6 (diff) |
Deprecate the low level RC5 functions
Use of the low level RC5 functions has been informally discouraged for a long
time. We now formally deprecate them.
Applications should instead use the EVP APIs, e.g. EVP_EncryptInit_ex,
EVP_EncryptUpdate, EVP_EncryptFinal_ex and the equivalently named decrypt
functions.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10834)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/rc5.h | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h index 22bdeca237..a9c06d31d6 100644 --- a/include/openssl/rc5.h +++ b/include/openssl/rc5.h @@ -23,43 +23,50 @@ extern "C" { # endif -# define RC5_ENCRYPT 1 -# define RC5_DECRYPT 0 - -# define RC5_32_INT unsigned int - # define RC5_32_BLOCK 8 # define RC5_32_KEY_LENGTH 16/* This is a default, max is 255 */ +# ifndef OPENSSL_NO_DEPRECATED_3_0 +# define RC5_ENCRYPT 1 +# define RC5_DECRYPT 0 + +# define RC5_32_INT unsigned int + /* * This are the only values supported. Tweak the code if you want more The * most supported modes will be RC5-32/12/16 RC5-32/16/8 */ -# define RC5_8_ROUNDS 8 -# define RC5_12_ROUNDS 12 -# define RC5_16_ROUNDS 16 +# define RC5_8_ROUNDS 8 +# define RC5_12_ROUNDS 12 +# define RC5_16_ROUNDS 16 typedef struct rc5_key_st { /* Number of rounds */ int rounds; RC5_32_INT data[2 * (RC5_16_ROUNDS + 1)]; } RC5_32_KEY; +# endif -int RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, - int rounds); -void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out, - RC5_32_KEY *key, int enc); -void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key); -void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key); -void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out, - long length, RC5_32_KEY *ks, unsigned char *iv, - int enc); -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); -void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, - long length, RC5_32_KEY *schedule, - unsigned char *ivec, int *num); +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)) # ifdef __cplusplus } |