diff options
| author | Matt Caswell <matt@openssl.org> | 2019-11-29 12:02:54 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-12-04 17:46:38 +0000 |
| commit | 7573fe1af54c190ccd8d07d753b334637a30f3a2 (patch) | |
| tree | 0b59cee6251765cd28f9fd600818a3ab3512e695 | |
| parent | 67b8f5bdbf95ad4def2dd27c220545b15d847aae (diff) | |
Deprecate the AES_ige_*() functions
These functions were already partially deprecated. Now we do it fully.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10558)
| -rw-r--r-- | apps/speed.c | 3 | ||||
| -rw-r--r-- | include/openssl/aes.h | 19 | ||||
| -rw-r--r-- | test/igetest.c | 3 |
3 files changed, 16 insertions, 9 deletions
diff --git a/apps/speed.c b/apps/speed.c index 53ae4c4e58..e4b104e9c3 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -17,6 +17,9 @@ #define EdDSA_SECONDS 10 #define SM2_SECONDS 10 +/* We need to use some deprecated APIs */ +#define OPENSSL_SUPPRESS_DEPRECATED + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/include/openssl/aes.h b/include/openssl/aes.h index a21e72d473..510edce18d 100644 --- a/include/openssl/aes.h +++ b/include/openssl/aes.h @@ -73,17 +73,18 @@ void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out, void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out, size_t length, const AES_KEY *key, unsigned char *ivec, int *num); -# ifndef OPENSSL_NO_DEPRECATED_3_0 + /* NB: the IV is _two_ blocks long */ -void AES_ige_encrypt(const unsigned char *in, unsigned char *out, - size_t length, const AES_KEY *key, - unsigned char *ivec, const int enc); +DEPRECATEDIN_3_0(void + AES_ige_encrypt(const unsigned char *in, unsigned char *out, + size_t length, const AES_KEY *key, + unsigned char *ivec, const int enc)) /* NB: the IV is _four_ blocks long */ -void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out, - size_t length, const AES_KEY *key, - const AES_KEY *key2, const unsigned char *ivec, - const int enc); -# endif +DEPRECATEDIN_3_0(void + AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out, + size_t length, const AES_KEY *key, + const AES_KEY *key2, + const unsigned char *ivec, const int enc)) int AES_wrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out, diff --git a/test/igetest.c b/test/igetest.c index 5a9ebb5b56..7a8ff68802 100644 --- a/test/igetest.c +++ b/test/igetest.c @@ -7,6 +7,9 @@ * https://www.openssl.org/source/license.html */ +/* The AES_ige_* functions are deprecated, so we suppress warnings about them */ +#define OPENSSL_SUPPRESS_DEPRECATED + #include <openssl/crypto.h> #include <openssl/aes.h> #include <openssl/rand.h> |