diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-20 10:04:19 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-04 20:44:23 +0100 |
| commit | 0294097253fcdafb97085de70a757b908e346bf2 (patch) | |
| tree | da4da5308baac1fa2d67b987e0130e56dbc7e24a /include | |
| parent | 4b66e5256f515c53e95c55a1598862ec529cb5f8 (diff) | |
Switch deprecation method for Camellia
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/camellia.h | 105 |
1 files changed, 52 insertions, 53 deletions
diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h index 897dd864cb..88c2279e90 100644 --- a/include/openssl/camellia.h +++ b/include/openssl/camellia.h @@ -54,61 +54,60 @@ struct camellia_key_st { typedef struct camellia_key_st CAMELLIA_KEY; # endif /* OPENSSL_NO_DEPRECATED_3_0 */ - -DEPRECATEDIN_3_0(int Camellia_set_key(const unsigned char *userKey, - const int bits, - CAMELLIA_KEY *key)) - -DEPRECATEDIN_3_0(void Camellia_encrypt(const unsigned char *in, - unsigned char *out, - const CAMELLIA_KEY *key)) -DEPRECATEDIN_3_0(void Camellia_decrypt(const unsigned char *in, - unsigned char *out, - const CAMELLIA_KEY *key)) - -DEPRECATEDIN_3_0(void Camellia_ecb_encrypt(const unsigned char *in, - unsigned char *out, - const CAMELLIA_KEY *key, - const int enc)) -DEPRECATEDIN_3_0(void Camellia_cbc_encrypt(const unsigned char *in, - unsigned char *out, - size_t length, const - CAMELLIA_KEY *key, - unsigned char *ivec, const int enc)) -DEPRECATEDIN_3_0(void Camellia_cfb128_encrypt(const unsigned char *in, - unsigned char *out, - size_t length, - const CAMELLIA_KEY *key, - unsigned char *ivec, - int *num, - const int enc)) -DEPRECATEDIN_3_0(void Camellia_cfb1_encrypt(const unsigned char *in, +# ifndef OPENSSL_NO_DEPRECATED_3_0 +OSSL_DEPRECATEDIN_3_0 int Camellia_set_key(const unsigned char *userKey, + const int bits, + CAMELLIA_KEY *key); +OSSL_DEPRECATEDIN_3_0 void Camellia_encrypt(const unsigned char *in, unsigned char *out, - size_t length, - const CAMELLIA_KEY *key, - unsigned char *ivec, - int *num, - const int enc)) -DEPRECATEDIN_3_0(void Camellia_cfb8_encrypt(const unsigned char *in, + const CAMELLIA_KEY *key); +OSSL_DEPRECATEDIN_3_0 void Camellia_decrypt(const unsigned char *in, unsigned char *out, - size_t length, - const CAMELLIA_KEY *key, - unsigned char *ivec, - int *num, - const int enc)) -DEPRECATEDIN_3_0(void Camellia_ofb128_encrypt(const unsigned char *in, - unsigned char *out, - size_t length, - const CAMELLIA_KEY *key, - unsigned char *ivec, - int *num)) -DEPRECATEDIN_3_0(void Camellia_ctr128_encrypt(const unsigned char *in, - unsigned char *out, - size_t length, - const CAMELLIA_KEY *key, - unsigned char ivec[CAMELLIA_BLOCK_SIZE], - unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE], - unsigned int *num)) + const CAMELLIA_KEY *key); +OSSL_DEPRECATEDIN_3_0 void Camellia_ecb_encrypt(const unsigned char *in, + unsigned char *out, + const CAMELLIA_KEY *key, + const int enc); +OSSL_DEPRECATEDIN_3_0 void Camellia_cbc_encrypt(const unsigned char *in, + unsigned char *out, + size_t length, + const CAMELLIA_KEY *key, + unsigned char *ivec, + const int enc); +OSSL_DEPRECATEDIN_3_0 void Camellia_cfb128_encrypt(const unsigned char *in, + unsigned char *out, + size_t length, + const CAMELLIA_KEY *key, + unsigned char *ivec, + int *num, + const int enc); +OSSL_DEPRECATEDIN_3_0 void Camellia_cfb1_encrypt(const unsigned char *in, + unsigned char *out, + size_t length, + const CAMELLIA_KEY *key, + unsigned char *ivec, + int *num, + const int enc); +OSSL_DEPRECATEDIN_3_0 void Camellia_cfb8_encrypt(const unsigned char *in, + unsigned char *out, + size_t length, + const CAMELLIA_KEY *key, + unsigned char *ivec, + int *num, + const int enc); +OSSL_DEPRECATEDIN_3_0 void Camellia_ofb128_encrypt(const unsigned char *in, + unsigned char *out, + size_t length, + const CAMELLIA_KEY *key, + unsigned char *ivec, + int *num); +OSSL_DEPRECATEDIN_3_0 +void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out, + size_t length, const CAMELLIA_KEY *key, + unsigned char ivec[CAMELLIA_BLOCK_SIZE], + unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE], + unsigned int *num); +# endif # ifdef __cplusplus } |