diff options
author | Matt Caswell <matt@openssl.org> | 2020-01-02 14:25:27 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-01-08 11:25:25 +0000 |
commit | 03047e7b7f64b054fa85d101e7097af5daf7a865 (patch) | |
tree | 38c18f72c1a38605c1dcf885d8b25df45e161ef8 /include | |
parent | 339638b586e77c189e8294f931b99b03d1f08dbd (diff) |
Deprecate Low Level Blowfish APIs
Applications should instead use the higher level EVP APIs, e.g.
EVP_Encrypt*() and EVP_Decrypt*().
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10740)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/blowfish.h | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/include/openssl/blowfish.h b/include/openssl/blowfish.h index 986367e51a..c83a2084c0 100644 --- a/include/openssl/blowfish.h +++ b/include/openssl/blowfish.h @@ -24,40 +24,51 @@ extern "C" { # endif -# define BF_ENCRYPT 1 -# define BF_DECRYPT 0 +# define BF_BLOCK 8 + +# ifndef OPENSSL_NO_DEPRECATED_3_0 + +# define BF_ENCRYPT 1 +# define BF_DECRYPT 0 /*- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * ! BF_LONG has to be at least 32 bits wide. ! * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -# define BF_LONG unsigned int +# define BF_LONG unsigned int -# define BF_ROUNDS 16 -# define BF_BLOCK 8 +# define BF_ROUNDS 16 typedef struct bf_key_st { BF_LONG P[BF_ROUNDS + 2]; BF_LONG S[4 * 256]; } BF_KEY; -void BF_set_key(BF_KEY *key, int len, const unsigned char *data); - -void BF_encrypt(BF_LONG *data, const BF_KEY *key); -void BF_decrypt(BF_LONG *data, const BF_KEY *key); - -void BF_ecb_encrypt(const unsigned char *in, unsigned char *out, - const BF_KEY *key, int enc); -void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, - const BF_KEY *schedule, unsigned char *ivec, int enc); -void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, - long length, const BF_KEY *schedule, - unsigned char *ivec, int *num, int enc); -void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, - long length, const BF_KEY *schedule, - unsigned char *ivec, int *num); -const char *BF_options(void); +# endif /* OPENSSL_NO_DEPRECATED_3_0 */ + +DEPRECATEDIN_3_0(void BF_set_key(BF_KEY *key, int len, + const unsigned char *data)) + +DEPRECATEDIN_3_0(void BF_encrypt(BF_LONG *data, const BF_KEY *key)) +DEPRECATEDIN_3_0(void BF_decrypt(BF_LONG *data, const BF_KEY *key)) + +DEPRECATEDIN_3_0(void BF_ecb_encrypt(const unsigned char *in, + unsigned char *out, const BF_KEY *key, + int enc)) +DEPRECATEDIN_3_0(void BF_cbc_encrypt(const unsigned char *in, + unsigned char *out, long length, + const BF_KEY *schedule, + unsigned char *ivec, int enc)) +DEPRECATEDIN_3_0(void BF_cfb64_encrypt(const unsigned char *in, + unsigned char *out, + long length, const BF_KEY *schedule, + unsigned char *ivec, int *num, int enc)) +DEPRECATEDIN_3_0(void BF_ofb64_encrypt(const unsigned char *in, + unsigned char *out, + long length, const BF_KEY *schedule, + unsigned char *ivec, int *num)) +DEPRECATEDIN_3_0(const char *BF_options(void)) # ifdef __cplusplus } |