diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-05 19:28:50 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-07 13:37:25 +0300 |
| commit | 936c2b9e933eacae80d3489e5f7316589f3e9a07 (patch) | |
| tree | bcc8e013817b791df5b290c5ec1892e93969b5fc | |
| parent | a6a4d0acd23b3fc85041d9096b67bcf18ccb635c (diff) | |
Update source files for deprecation at 3.0
Previous macros suggested that from 3.0, we're only allowed to
deprecate things at a major version. However, there's no policy
stating this, but there is for removal, saying that to remove
something, it must have been deprecated for 5 years, and that removal
can only happen at a major version.
Meanwhile, the semantic versioning rule is that deprecation should
trigger a MINOR version update, which is reflected in the macro names
as of this change.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10364)
128 files changed, 249 insertions, 249 deletions
diff --git a/apps/enc.c b/apps/enc.c index 611d0536bc..243cc1280c 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -51,7 +51,7 @@ typedef enum OPTION_choice { const OPTIONS enc_options[] = { {"help", OPT_HELP, '-', "Display this summary"}, {"list", OPT_LIST, '-', "List ciphers"}, -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 {"ciphers", OPT_LIST, '-', "Alias for -list"}, #endif {"in", OPT_IN, '<', "Input file"}, diff --git a/apps/speed.c b/apps/speed.c index 7117c6f068..75d3149ae0 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -169,7 +169,7 @@ static int DES_ede3_cbc_encrypt_loop(void *args); static int AES_cbc_128_encrypt_loop(void *args); static int AES_cbc_192_encrypt_loop(void *args); static int AES_cbc_256_encrypt_loop(void *args); -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static int AES_ige_128_encrypt_loop(void *args); static int AES_ige_192_encrypt_loop(void *args); static int AES_ige_256_encrypt_loop(void *args); @@ -436,7 +436,7 @@ static const OPT_PAIR doit_choices[] = { {"aes-128-cbc", D_CBC_128_AES}, {"aes-192-cbc", D_CBC_192_AES}, {"aes-256-cbc", D_CBC_256_AES}, -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 {"aes-128-ige", D_IGE_128_AES}, {"aes-192-ige", D_IGE_192_AES}, {"aes-256-ige", D_IGE_256_AES}, @@ -896,7 +896,7 @@ static int AES_cbc_256_encrypt_loop(void *args) return count; } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static int AES_ige_128_encrypt_loop(void *args) { loopargs_t *tempargs = *(loopargs_t **) args; @@ -2565,7 +2565,7 @@ int speed_main(int argc, char **argv) } } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 if (doit[D_IGE_128_AES]) { for (testnum = 0; testnum < size_num; testnum++) { print_message(names[D_IGE_128_AES], c[D_IGE_128_AES][testnum], diff --git a/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c index b95d3d4ba6..3300e518d2 100644 --- a/crypto/aes/aes_ige.c +++ b/crypto/aes/aes_ige.c @@ -9,7 +9,7 @@ #include "internal/cryptlib.h" -#if OPENSSL_API_3 +#ifdef OPENSSL_NO_DEPRECATED_3_0 NON_EMPTY_TRANSLATION_UNIT #else diff --git a/crypto/asn1/asn1_item_list.h b/crypto/asn1/asn1_item_list.h index b0b607a0db..c8727e5790 100644 --- a/crypto/asn1/asn1_item_list.h +++ b/crypto/asn1/asn1_item_list.h @@ -78,7 +78,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { ASN1_ITEM_ref(IPAddressRange), #endif ASN1_ITEM_ref(ISSUING_DIST_POINT), -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ASN1_ITEM_ref(LONG), #endif ASN1_ITEM_ref(NAME_CONSTRAINTS), @@ -164,7 +164,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { ASN1_ITEM_ref(X509_SIG), ASN1_ITEM_ref(X509_VAL), ASN1_ITEM_ref(X509), -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ASN1_ITEM_ref(ZLONG), #endif ASN1_ITEM_ref(INT32), diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c index 89d5e838a3..76d6674b50 100644 --- a/crypto/asn1/x_long.c +++ b/crypto/asn1/x_long.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include <openssl/asn1t.h> -#if OPENSSL_API_3 +#ifdef OPENSSL_NO_DEPRECATED_3_0 NON_EMPTY_TRANSLATION_UNIT #else diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index fd1c3c3088..ce5789ea3e 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -224,7 +224,7 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, } #endif -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int BN_is_prime_ex(const BIGNUM *a, int checks, BN_CTX *ctx_passed, BN_GENCB *cb) { diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index a43225ecf7..a8581d7320 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -54,7 +54,7 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx); static CONF *def_create(CONF_METHOD *meth); static int def_init_default(CONF *conf); -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static int def_init_WIN32(CONF *conf); #endif static int def_destroy(CONF *conf); @@ -83,7 +83,7 @@ CONF_METHOD *NCONF_default(void) return &default_method; } -#if ! OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static CONF_METHOD WIN32_method = { "WIN32", def_create, @@ -128,7 +128,7 @@ static int def_init_default(CONF *conf) return 1; } -#if ! OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static int def_init_WIN32(CONF *conf) { if (conf == NULL) diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h index 725c430c63..160611788f 100644 --- a/crypto/conf/conf_def.h +++ b/crypto/conf/conf_def.h @@ -56,7 +56,7 @@ static const unsigned short CONF_type_default[128] = { 0x0004, 0x0004, 0x0004, 0x0000, 0x0200, 0x0000, 0x0200, 0x0000, }; -#if ! OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static const unsigned short CONF_type_win32[128] = { 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, diff --git a/crypto/conf/keysets.pl b/crypto/conf/keysets.pl index 05b086f7fa..3c6eecd9ca 100644 --- a/crypto/conf/keysets.pl +++ b/crypto/conf/keysets.pl @@ -108,7 +108,7 @@ for ($i = 0; $i < 128; $i++) { } print "\n};\n\n"; -print "#if ! OPENSSL_API_3\n"; +print "#ifndef OPENSSL_NO_DEPRECATED_3_0\n"; print "static const unsigned short CONF_type_win32[128] = {"; for ($i = 0; $i < 128; $i++) { print "\n " if ($i % 8) == 0; diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c index 68501efab5..99ef0043eb 100644 --- a/crypto/dsa/dsa_sign.c +++ b/crypto/dsa/dsa_sign.c @@ -16,7 +16,7 @@ DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) return dsa->meth->dsa_do_sign(dgst, dlen, dsa); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp) { return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp); diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index 08d018c4e6..168cf72973 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -116,7 +116,7 @@ void EC_GROUP_free(EC_GROUP *group) OPENSSL_free(group); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 void EC_GROUP_clear_free(EC_GROUP *group) { if (!group) @@ -540,7 +540,7 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, return group->meth->group_get_curve(group, p, a, b, ctx); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) { @@ -849,7 +849,7 @@ int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point, return 1; } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *point, const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx) @@ -887,7 +887,7 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, return group->meth->point_get_affine_coordinates(group, point, x, y, ctx); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point, BIGNUM *x, BIGNUM *y, BN_CTX *ctx) diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c index e9b1b87a5f..041c442b62 100644 --- a/crypto/ec/ec_oct.c +++ b/crypto/ec/ec_oct.c @@ -49,7 +49,7 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point, y_bit, ctx); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point, const BIGNUM *x, int y_bit, BN_CTX *ctx) diff --git a/crypto/ec/ecdh_kdf.c b/crypto/ec/ecdh_kdf.c index 8c4d530b11..000b12a515 100644 --- a/crypto/ec/ecdh_kdf.c +++ b/crypto/ec/ecdh_kdf.c @@ -48,7 +48,7 @@ int ecdh_KDF_X9_63(unsigned char *out, size_t outlen, * The old name for ecdh_KDF_X9_63 * Retained for ABI compatibility */ -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int ECDH_KDF_X9_62(unsigned char *out, size_t outlen, const unsigned char *Z, size_t Zlen, const unsigned char *sinfo, size_t sinfolen, diff --git a/crypto/err/err.c b/crypto/err/err.c index b636473ba6..b56eec8414 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -407,7 +407,7 @@ unsigned long ERR_get_error_all(const char **file, int *line, return get_error_values(EV_POP, file, line, func, data, flags); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 unsigned long ERR_get_error_line_data(const char **file, int *line, const char **data, int *flags) { @@ -442,7 +442,7 @@ unsigned long ERR_peek_error_all(const char **file, int *line, return get_error_values(EV_PEEK, file, line, func, data, flags); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 unsigned long ERR_peek_error_line_data(const char **file, int *line, const char **data, int *flags) { @@ -477,7 +477,7 @@ unsigned long ERR_peek_last_error_all(const char **file, int *line, return get_error_values(EV_PEEK_LAST, file, line, func, data, flags); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 unsigned long ERR_peek_last_error_line_data(const char **file, int *line, const char **data, int *flags) { @@ -621,7 +621,7 @@ const char *ERR_lib_error_string(unsigned long e) return ((p == NULL) ? NULL : p->string); } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 const char *ERR_func_error_string(unsigned long e) { return NULL; @@ -716,7 +716,7 @@ ERR_STATE *err_get_state_int(void) return state; } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ERR_STATE *ERR_get_state(void) { return err_get_state_int(); diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 1a08b2bb9e..779ad3cec9 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -209,7 +209,7 @@ static unsigned long mem_hash(const MEM *a) return ret; } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 int CRYPTO_mem_debug_push(const char *info, const char *file, int line) { return 0; diff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h index 371723535b..557df5d401 100644 --- a/engines/e_afalg_err.h +++ b/engines/e_afalg_err.h @@ -21,7 +21,7 @@ /* * AFALG function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define AFALG_F_AFALG_CHK_PLATFORM 0 # define AFALG_F_AFALG_CREATE_SK 0 # define AFALG_F_AFALG_INIT_AIO 0 diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h index 048b6d171a..c8bd24869a 100644 --- a/engines/e_capi_err.h +++ b/engines/e_capi_err.h @@ -21,7 +21,7 @@ /* * CAPI function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define CAPI_F_CAPI_CERT_GET_FNAME 0 # define CAPI_F_CAPI_CTRL 0 # define CAPI_F_CAPI_CTX_NEW 0 diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h index a9db187f1d..7d2ea7936f 100644 --- a/engines/e_dasync_err.h +++ b/engines/e_dasync_err.h @@ -21,7 +21,7 @@ /* * DASYNC function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DASYNC_F_BIND_DASYNC 0 # define DASYNC_F_CIPHER_AES_128_CBC_CODE 0 # define DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY 0 diff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h index 70a0bc667f..0c23b0c453 100644 --- a/engines/e_ossltest_err.h +++ b/engines/e_ossltest_err.h @@ -21,7 +21,7 @@ /* * OSSLTEST function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define OSSLTEST_F_BIND_OSSLTEST 0 # define OSSLTEST_F_OSSLTEST_AES128_INIT_KEY 0 # endif diff --git a/fuzz/asn1.c b/fuzz/asn1.c index 4a5458af3e..17eaf6ca35 100644 --- a/fuzz/asn1.c +++ b/fuzz/asn1.c @@ -108,7 +108,7 @@ static ASN1_ITEM_EXP *item_type[] = { ASN1_ITEM_ref(IPAddressRange), #endif ASN1_ITEM_ref(ISSUING_DIST_POINT), -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ASN1_ITEM_ref(LONG), #endif ASN1_ITEM_ref(NAME_CONSTRAINTS), @@ -189,7 +189,7 @@ static ASN1_ITEM_EXP *item_type[] = { ASN1_ITEM_ref(X509_REVOKED), ASN1_ITEM_ref(X509_SIG), ASN1_ITEM_ref(X509_VAL), -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ASN1_ITEM_ref(ZLONG), #endif ASN1_ITEM_ref(INT32), diff --git a/include/crypto/sm2err.h b/include/crypto/sm2err.h index 3b86c38c3c..d0b04baf71 100644 --- a/include/crypto/sm2err.h +++ b/include/crypto/sm2err.h @@ -27,7 +27,7 @@ int ERR_load_SM2_strings(void); /* * SM2 function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define SM2_F_PKEY_SM2_COPY 0 # define SM2_F_PKEY_SM2_CTRL 0 # define SM2_F_PKEY_SM2_CTRL_STR 0 diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h index 9ddb9cff4d..ce9c8f0cf3 100644 --- a/include/internal/dsoerr.h +++ b/include/internal/dsoerr.h @@ -23,7 +23,7 @@ int ERR_load_DSO_strings(void); /* * DSO function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DSO_F_DLFCN_BIND_FUNC 0 # define DSO_F_DLFCN_LOAD 0 # define DSO_F_DLFCN_MERGER 0 diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h index ebbd8619b2..b3d63ab4a0 100644 --- a/include/internal/propertyerr.h +++ b/include/internal/propertyerr.h @@ -23,7 +23,7 @@ int ERR_load_PROP_strings(void); /* * PROP function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define PROP_F_OSSL_PARSE_PROPERTY 0 # define PROP_F_OSSL_PARSE_QUERY 0 # define PROP_F_PARSE_HEX 0 diff --git a/include/openssl/aes.h b/include/openssl/aes.h index 4e93d3dc93..a21e72d473 100644 --- a/include/openssl/aes.h +++ b/include/openssl/aes.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_AES_H # endif @@ -73,7 +73,7 @@ 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); -# if !OPENSSL_API_3 +# 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, diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 32d39c14a6..507731a4fc 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ASN1_H # endif diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h index 9166f17142..15f993915a 100644 --- a/include/openssl/asn1err.h +++ b/include/openssl/asn1err.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ASN1ERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_ASN1_strings(void); /* * ASN1 function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define ASN1_F_A2D_ASN1_OBJECT 0 # define ASN1_F_A2I_ASN1_INTEGER 0 # define ASN1_F_A2I_ASN1_STRING 0 diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h index 00ccdf5156..754cab5f3d 100644 --- a/include/openssl/asn1t.h +++ b/include/openssl/asn1t.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ASN1T_H # endif @@ -870,7 +870,7 @@ DECLARE_ASN1_ITEM(ZINT64) DECLARE_ASN1_ITEM(UINT64) DECLARE_ASN1_ITEM(ZUINT64) -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 /* * LONG and ZLONG are strongly discouraged for use as stored data, as the * underlying C type (long) differs in size depending on the architecture. diff --git a/include/openssl/async.h b/include/openssl/async.h index e372e43c47..bc27d5db06 100644 --- a/include/openssl/async.h +++ b/include/openssl/async.h @@ -14,7 +14,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ASYNC_H # endif diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h index 8e8c66fc52..17defd0494 100644 --- a/include/openssl/asyncerr.h +++ b/include/openssl/asyncerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ASYNCERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_ASYNC_strings(void); /* * ASYNC function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define ASYNC_F_ASYNC_CTX_NEW 0 # define ASYNC_F_ASYNC_INIT_THREAD 0 # define ASYNC_F_ASYNC_JOB_NEW 0 diff --git a/include/openssl/bio.h b/include/openssl/bio.h index bb289e6fa2..f374b83324 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_BIO_H # endif @@ -181,7 +181,7 @@ extern "C" { # define BIO_FLAGS_IO_SPECIAL 0x04 # define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL) # define BIO_FLAGS_SHOULD_RETRY 0x08 -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 /* This #define was replaced by an internal constant and should not be used. */ # define BIO_FLAGS_UPLINK 0 # endif diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h index 2f4dd3394b..46e1840700 100644 --- a/include/openssl/bioerr.h +++ b/include/openssl/bioerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_BIOERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_BIO_strings(void); /* * BIO function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define BIO_F_ACPT_STATE 0 # define BIO_F_ADDRINFO_WRAP 0 # define BIO_F_ADDR_STRINGS 0 diff --git a/include/openssl/blowfish.h b/include/openssl/blowfish.h index 6532915200..986367e51a 100644 --- a/include/openssl/blowfish.h +++ b/include/openssl/blowfish.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_BLOWFISH_H # endif diff --git a/include/openssl/bn.h b/include/openssl/bn.h index 2eabadab27..beeca9e25f 100644 --- a/include/openssl/bn.h +++ b/include/openssl/bn.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_BN_H # endif @@ -109,7 +109,7 @@ void BN_GENCB_set(BN_GENCB *gencb, int (*callback) (int, int, BN_GENCB *), void *BN_GENCB_get_arg(BN_GENCB *cb); -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define BN_prime_checks 0 /* default: select number of iterations based * on the size of the number */ @@ -355,8 +355,8 @@ DEPRECATEDIN_0_9_8(int BN_CTX *ctx, void *cb_arg, int do_trial_division)) -DEPRECATEDIN_3(int BN_is_prime_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, BN_GENCB *cb)) -DEPRECATEDIN_3(int BN_is_prime_fasttest_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, +DEPRECATEDIN_3_0(int BN_is_prime_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, BN_GENCB *cb)) +DEPRECATEDIN_3_0(int BN_is_prime_fasttest_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, int do_trial_division, BN_GENCB *cb)) /* Newer versions */ int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe, diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h index a4b666f9cc..cce4cbbf97 100644 --- a/include/openssl/bnerr.h +++ b/include/openssl/bnerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_BNERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_BN_strings(void); /* * BN function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define BN_F_BNRAND 0 # define BN_F_BNRAND_RANGE 0 # define BN_F_BN_BLINDING_CONVERT_EX 0 diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h index 49581b826a..5773b986bd 100644 --- a/include/openssl/buffer.h +++ b/include/openssl/buffer.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_BUFFER_H # endif @@ -30,7 +30,7 @@ extern "C" { # include <stddef.h> # include <sys/types.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define BUF_strdup(s) OPENSSL_strdup(s) # define BUF_strndup(s, size) OPENSSL_strndup(s, size) # define BUF_memdup(data, size) OPENSSL_memdup(data, size) diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h index fbe0d99843..1a5de3a65d 100644 --- a/include/openssl/buffererr.h +++ b/include/openssl/buffererr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_BUFERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_BUF_strings(void); /* * BUF function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define BUF_F_BUF_MEM_GROW 0 # define BUF_F_BUF_MEM_GROW_CLEAN 0 # define BUF_F_BUF_MEM_NEW 0 diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h index 23605cf393..cac999ecee 100644 --- a/include/openssl/camellia.h +++ b/include/openssl/camellia.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CAMELLIA_H # endif diff --git a/include/openssl/cast.h b/include/openssl/cast.h index a1aad6bda3..5f81217d14 100644 --- a/include/openssl/cast.h +++ b/include/openssl/cast.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CAST_H # endif diff --git a/include/openssl/cmac.h b/include/openssl/cmac.h index 426536fa35..e2b49a0574 100644 --- a/include/openssl/cmac.h +++ b/include/openssl/cmac.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CMAC_H # endif diff --git a/include/openssl/cmperr.h b/include/openssl/cmperr.h index 02d0a36f94..7da9a17829 100644 --- a/include/openssl/cmperr.h +++ b/include/openssl/cmperr.h @@ -27,7 +27,7 @@ int ERR_load_CMP_strings(void); /* * CMP function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # endif /* diff --git a/include/openssl/cms.h b/include/openssl/cms.h index cf4ad37f3a..3c2bad271c 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CMS_H # endif diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h index 407bdfd5fd..10e0fd6ae8 100644 --- a/include/openssl/cmserr.h +++ b/include/openssl/cmserr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CMSERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_CMS_strings(void); /* * CMS function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define CMS_F_CHECK_CONTENT 0 # define CMS_F_CMS_ADD0_CERT 0 # define CMS_F_CMS_ADD0_RECIPIENT_KEY 0 diff --git a/include/openssl/comp.h b/include/openssl/comp.h index 47f782b57a..4b2085749e 100644 --- a/include/openssl/comp.h +++ b/include/openssl/comp.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_COMP_H # endif diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h index 89faccb115..47945628ee 100644 --- a/include/openssl/comperr.h +++ b/include/openssl/comperr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_COMPERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_COMP_strings(void); /* * COMP function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define COMP_F_BIO_ZLIB_FLUSH 0 # define COMP_F_BIO_ZLIB_NEW 0 # define COMP_F_BIO_ZLIB_READ 0 diff --git a/include/openssl/conf.h b/include/openssl/conf.h index c2bd31176f..5e03991a3d 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CONF_H # endif @@ -114,7 +114,7 @@ struct conf_st { CONF *NCONF_new(CONF_METHOD *meth); CONF_METHOD *NCONF_default(void); -DEPRECATEDIN_3(CONF_METHOD *NCONF_WIN32(void)) +DEPRECATEDIN_3_0(CONF_METHOD *NCONF_WIN32(void)) void NCONF_free(CONF *conf); void NCONF_free_data(CONF *conf); diff --git a/include/openssl/conf_api.h b/include/openssl/conf_api.h index 43076932e1..ed67d5778f 100644 --- a/include/openssl/conf_api.h +++ b/include/openssl/conf_api.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CONF_API_H # endif diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h index 4bf5b9e28f..eb41737fd7 100644 --- a/include/openssl/conferr.h +++ b/include/openssl/conferr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CONFERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_CONF_strings(void); /* * CONF function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define CONF_F_CONF_DUMP_FP 0 # define CONF_F_CONF_LOAD 0 # define CONF_F_CONF_LOAD_FP 0 diff --git a/include/openssl/crmferr.h b/include/openssl/crmferr.h index 715b78c2e6..97f5159b51 100644 --- a/include/openssl/crmferr.h +++ b/include/openssl/crmferr.h @@ -27,7 +27,7 @@ int ERR_load_CRMF_strings(void); /* * CRMF function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define CRMF_F_CRMF_POPOSIGNINGKEY_INIT 0 # define CRMF_F_OSSL_CRMF_CERTID_GEN 0 # define CRMF_F_OSSL_CRMF_CERTTEMPLATE_FILL 0 diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 28c8939e96..956fab5142 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CRYPTO_H # endif @@ -335,15 +335,15 @@ size_t CRYPTO_secure_used(void); void OPENSSL_cleanse(void *ptr, size_t len); # ifndef OPENSSL_NO_CRYPTO_MDEBUG -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define OPENSSL_mem_debug_push(info) \ CRYPTO_mem_debug_push(info, OPENSSL_FILE, OPENSSL_LINE) # define OPENSSL_mem_debug_pop() \ CRYPTO_mem_debug_pop() # endif -DEPRECATEDIN_3(int CRYPTO_mem_debug_push(const char *info, - const char *file, int line)) -DEPRECATEDIN_3(int CRYPTO_mem_debug_pop(void)) +DEPRECATEDIN_3_0(int CRYPTO_mem_debug_push(const char *info, + const char *file, int line)) +DEPRECATEDIN_3_0(int CRYPTO_mem_debug_pop(void)) void CRYPTO_get_alloc_counts(int *mcount, int *rcount, int *fcount); diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h index 99872af161..43b7aa5a22 100644 --- a/include/openssl/cryptoerr.h +++ b/include/openssl/cryptoerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CRYPTOERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_CRYPTO_strings(void); /* * CRYPTO function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define CRYPTO_F_CMAC_CTX_NEW 0 # define CRYPTO_F_CRYPTO_DUP_EX_DATA 0 # define CRYPTO_F_CRYPTO_FREE_EX_DATA 0 diff --git a/include/openssl/ct.h b/include/openssl/ct.h index 17271d6777..b7c211d920 100644 --- a/include/openssl/ct.h +++ b/include/openssl/ct.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CT_H # endif diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h index c5c646cc9b..b0d904eb1f 100644 --- a/include/openssl/cterr.h +++ b/include/openssl/cterr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_CTERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_CT_strings(void); /* * CT function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define CT_F_CTLOG_NEW 0 # define CT_F_CTLOG_NEW_FROM_BASE64 0 # define CT_F_CTLOG_NEW_FROM_CONF 0 diff --git a/include/openssl/des.h b/include/openssl/des.h index 0a874f4bcc..6bbf5828d0 100644 --- a/include/openssl/des.h +++ b/include/openssl/des.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_DES_H # endif diff --git a/include/openssl/dh.h b/include/openssl/dh.h index 84f4f07d2c..0dcb9fc157 100644 --- a/include/openssl/dh.h +++ b/include/openssl/dh.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_DH_H # endif diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h index a926dab999..463019d0e1 100644 --- a/include/openssl/dherr.h +++ b/include/openssl/dherr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_DHERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_DH_strings(void); /* * DH function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DH_F_COMPUTE_KEY 0 # define DH_F_DHPARAMS_PRINT_FP 0 # define DH_F_DH_BUF2KEY 0 diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h index 858c316b66..c8d0c3334a 100644 --- a/include/openssl/dsa.h +++ b/include/openssl/dsa.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_DSA_H # endif @@ -105,7 +105,7 @@ int DSA_size(const DSA *); int DSA_bits(const DSA *d); int DSA_security_bits(const DSA *d); /* next 4 return -1 on error */ -DEPRECATEDIN_3(int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)) +DEPRECATEDIN_3_0(int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)) int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig, unsigned int *siglen, DSA *dsa); int DSA_verify(int type, const unsigned char *dgst, int dgst_len, @@ -144,7 +144,7 @@ int DSAparams_print_fp(FILE *fp, const DSA *x); int DSA_print_fp(FILE *bp, const DSA *x, int off); # endif -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DSS_prime_checks 64 /* * Primality test according to FIPS PUB 186-4, Appendix C.3. Since we only diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h index 9e0d5cfe2a..48dd7d03b7 100644 --- a/include/openssl/dsaerr.h +++ b/include/openssl/dsaerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_DSAERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_DSA_strings(void); /* * DSA function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DSA_F_DSAPARAMS_PRINT 0 # define DSA_F_DSAPARAMS_PRINT_FP 0 # define DSA_F_DSA_BUILTIN_PARAMGEN 0 diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h index d535c05c49..bfc2d6e38f 100644 --- a/include/openssl/dtls1.h +++ b/include/openssl/dtls1.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_DTLS1_H # endif @@ -24,7 +24,7 @@ extern "C" { # define DTLS1_VERSION 0xFEFF # define DTLS1_2_VERSION 0xFEFD -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define DTLS_MIN_VERSION DTLS1_VERSION # define DTLS_MAX_VERSION DTLS1_2_VERSION # endif diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index 69a50911dd..982dd2b8a7 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_E_OS2_H # endif diff --git a/include/openssl/ebcdic.h b/include/openssl/ebcdic.h index a75a71d4d9..e0ae1aa84e 100644 --- a/include/openssl/ebcdic.h +++ b/include/openssl/ebcdic.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_EBCDIC_H # endif diff --git a/include/openssl/ec.h b/include/openssl/ec.h index b4c50ecfc7..c4b701a07d 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_EC_H # endif @@ -131,7 +131,7 @@ void EC_GROUP_free(EC_GROUP *group); /** Clears and frees a EC_GROUP object * \param group EC_GROUP object to be cleared and freed. */ -DEPRECATEDIN_3(void EC_GROUP_clear_free(EC_GROUP *group)) +DEPRECATEDIN_3_0(void EC_GROUP_clear_free(EC_GROUP *group)) /** Copies EC_GROUP objects. Note: both EC_GROUPs must use the same EC_METHOD. * \param dst destination EC_GROUP object @@ -281,7 +281,7 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, +DEPRECATEDIN_3_0(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)) @@ -294,7 +294,7 @@ DEPRECATEDIN_3(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, +DEPRECATEDIN_3_0(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)) @@ -308,7 +308,7 @@ DEPRECATEDIN_3(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, +DEPRECATEDIN_3_0(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)) @@ -321,7 +321,7 @@ DEPRECATEDIN_3(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, +DEPRECATEDIN_3_0(int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)) # endif @@ -562,7 +562,7 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, +DEPRECATEDIN_3_0(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p, const BIGNUM *x, const BIGNUM *y, @@ -577,7 +577,7 @@ DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, +DEPRECATEDIN_3_0(int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *p, BIGNUM *x, BIGNUM *y, @@ -604,7 +604,7 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, +DEPRECATEDIN_3_0(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *p, const BIGNUM *x, int y_bit, @@ -619,7 +619,7 @@ DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, +DEPRECATEDIN_3_0(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p, const BIGNUM *x, const BIGNUM *y, @@ -634,7 +634,7 @@ DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, +DEPRECATEDIN_3_0(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, const EC_POINT *p, BIGNUM *x, BIGNUM *y, @@ -649,7 +649,7 @@ DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, * \param ctx BN_CTX object (optional) * \return 1 on success and 0 if an error occurred */ -DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, +DEPRECATEDIN_3_0(int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p, const BIGNUM *x, int y_bit, @@ -1172,10 +1172,10 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine); * it is actually specified in ANSI X9.63. * This identifier is retained for backwards compatibility */ -DEPRECATEDIN_3(int ECDH_KDF_X9_62(unsigned char *out, size_t outlen, - const unsigned char *Z, size_t Zlen, - const unsigned char *sinfo, size_t sinfolen, - const EVP_MD *md)) +DEPRECATEDIN_3_0(int ECDH_KDF_X9_62(unsigned char *out, size_t outlen, + const unsigned char *Z, size_t Zlen, + const unsigned char *sinfo, size_t sinfolen, + const EVP_MD *md)) int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, const EC_KEY *ecdh, diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h index 07ef524f7a..88399db50d 100644 --- a/include/openssl/ecerr.h +++ b/include/openssl/ecerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ECERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_EC_strings(void); /* * EC function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define EC_F_BN_TO_FELEM 0 # define EC_F_D2I_ECPARAMETERS 0 # define EC_F_D2I_ECPKPARAMETERS 0 diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h index 27b2df6d76..006d73a431 100644 --- a/include/openssl/engineerr.h +++ b/include/openssl/engineerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ENGINEERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_ENGINE_strings(void); /* * ENGINE function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define ENGINE_F_DIGEST_UPDATE 0 # define ENGINE_F_DYNAMIC_CTRL 0 # define ENGINE_F_DYNAMIC_GET_DATA_CTX 0 diff --git a/include/openssl/err.h b/include/openssl/err.h index fc7ead8b68..25ce42c48d 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ERR_H # endif @@ -31,7 +31,7 @@ extern "C" { #endif -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # ifndef OPENSSL_NO_FILENAMES # define ERR_PUT_error(l,f,r,fn,ln) ERR_put_error(l,f,r,fn,ln) # else @@ -44,7 +44,7 @@ extern "C" { # define ERR_TXT_MALLOCED 0x01 # define ERR_TXT_STRING 0x02 -# if !OPENSSL_API_3 || defined(OSSL_FORCE_ERR_STATE) +# if !defined(OPENSSL_NO_DEPRECATED_3_0) || defined(OSSL_FORCE_ERR_STATE) # define ERR_FLAG_MARK 0x01 # define ERR_FLAG_CLEAR 0x02 @@ -114,7 +114,7 @@ struct err_state_st { # define ERR_LIB_USER 128 -# if 1 || !OPENSSL_API_3 +# if 1 || !defined(OPENSSL_NO_DEPRECATED_3_0) # define ASN1err(f, r) ERR_raise_data(ERR_LIB_ASN1, (r), NULL) # define ASYNCerr(f, r) ERR_raise_data(ERR_LIB_ASYNC, (r), NULL) # define BIOerr(f, r) ERR_raise_data(ERR_LIB_BIO, (r), NULL) @@ -167,7 +167,7 @@ struct err_state_st { # define ERR_GET_REASON(l) (int)( (l) & 0xFFFL) # define ERR_FATAL_ERROR(l) (int)( (l) & ERR_R_FATAL) -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define SYS_F_FOPEN 0 # define SYS_F_CONNECT 0 # define SYS_F_GETSERVBYNAME 0 @@ -258,7 +258,7 @@ void ERR_vset_error(int lib, int reason, const char *fmt, va_list args); ERR_set_debug(OPENSSL_FILE,OPENSSL_LINE,OPENSSL_FUNC), \ ERR_set_error) -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 /* Backward compatibility */ # define ERR_put_error(lib, func, reason, file, line) \ (ERR_new(), \ @@ -282,7 +282,7 @@ unsigned long ERR_get_error_data(const char **data, int *flags); unsigned long ERR_get_error_all(const char **file, int *line, const char **func, const char **data, int *flags); -DEPRECATEDIN_3(unsigned long ERR_get_error_line_data(const char **file, +DEPRECATEDIN_3_0(unsigned long ERR_get_error_line_data(const char **file, int *line, const char **data, int *flags)) @@ -293,7 +293,7 @@ unsigned long ERR_peek_error_data(const char **data, int *flags); unsigned long ERR_peek_error_all(const char **file, int *line, const char **func, const char **data, int *flags); -DEPRECATEDIN_3(unsigned long ERR_peek_error_line_data(const char **file, +DEPRECATEDIN_3_0(unsigned long ERR_peek_error_line_data(const char **file, int *line, const char **data, int *flags)) @@ -304,7 +304,7 @@ unsigned long ERR_peek_last_error_data(const char **data, int *flags); unsigned long ERR_peek_last_error_all(const char **file, int *line, const char **func, const char **data, int *flags); -DEPRECATEDIN_3(unsigned long ERR_peek_last_error_line_data(const char **file, +DEPRECATEDIN_3_0(unsigned long ERR_peek_last_error_line_data(const char **file, int *line, const char **data, int *flags)) @@ -314,7 +314,7 @@ void ERR_clear_error(void); char *ERR_error_string(unsigned long e, char *buf); void ERR_error_string_n(unsigned long e, char *buf, size_t len); const char *ERR_lib_error_string(unsigned long e); -DEPRECATEDIN_3(const char *ERR_func_error_string(unsigned long e)) +DEPRECATEDIN_3_0(const char *ERR_func_error_string(unsigned long e)) const char *ERR_reason_error_string(unsigned long e); void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u), @@ -340,7 +340,7 @@ int ERR_load_ERR_strings(void); DEPRECATEDIN_1_1_0(void ERR_remove_thread_state(void *)) DEPRECATEDIN_1_0_0(void ERR_remove_state(unsigned long pid)) -DEPRECATEDIN_3(ERR_STATE *ERR_get_state(void)) +DEPRECATEDIN_3_0(ERR_STATE *ERR_get_state(void)) int ERR_get_next_error_library(void); diff --git a/include/openssl/esserr.h b/include/openssl/esserr.h index ee3041aa0b..8befce5c48 100644 --- a/include/openssl/esserr.h +++ b/include/openssl/esserr.h @@ -23,7 +23,7 @@ int ERR_load_ESS_strings(void); /* * ESS function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define ESS_F_ESS_CERT_ID_NEW_INIT 0 # define ESS_F_ESS_CERT_ID_V2_NEW_INIT 0 # define ESS_F_ESS_SIGNING_CERT_ADD 0 diff --git a/include/openssl/evp.h b/include/openssl/evp.h index c1c253c1e3..87c0169db2 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_ENVELOPE_H # endif diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 7da9083ae1..7744465906 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_EVPERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_EVP_strings(void); /* * EVP function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define EVP_F_AESNI_INIT_KEY 0 # define EVP_F_AESNI_XTS_INIT_KEY 0 # define EVP_F_AES_GCM_CTRL 0 diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h index 8214853e07..2f80038f78 100644 --- a/include/openssl/hmac.h +++ b/include/openssl/hmac.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_HMAC_H # endif @@ -20,7 +20,7 @@ # include <openssl/evp.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HMAC_MAX_MD_CBLOCK 128 /* Deprecated */ # endif diff --git a/include/openssl/idea.h b/include/openssl/idea.h index 667865281d..0d208683b3 100644 --- a/include/openssl/idea.h +++ b/include/openssl/idea.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_IDEA_H # endif diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index b80f6b3e0f..d8f81c9c4d 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_KDF_H # endif diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h index 7cf2800dcd..182104aa51 100644 --- a/include/openssl/lhash.h +++ b/include/openssl/lhash.h @@ -16,7 +16,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_LHASH_H # endif diff --git a/include/openssl/md2.h b/include/openssl/md2.h index 005a7bd4fc..f4a14caa72 100644 --- a/include/openssl/md2.h +++ b/include/openssl/md2.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_MD2_H # endif diff --git a/include/openssl/md4.h b/include/openssl/md4.h index a66db24263..6ba2d5d9ac 100644 --- a/include/openssl/md4.h +++ b/include/openssl/md4.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_MD4_H # endif diff --git a/include/openssl/md5.h b/include/openssl/md5.h index 78133a3474..0a75b084a2 100644 --- a/include/openssl/md5.h +++ b/include/openssl/md5.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_MD5_H # endif diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h index c1dc1cf62d..a74e529bc7 100644 --- a/include/openssl/mdc2.h +++ b/include/openssl/mdc2.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_MDC2_H # endif diff --git a/include/openssl/modes.h b/include/openssl/modes.h index 78cc98cd7e..1c672d2a46 100644 --- a/include/openssl/modes.h +++ b/include/openssl/modes.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_MODES_H # endif diff --git a/include/openssl/objects.h b/include/openssl/objects.h index 45fa7e683b..89aa623d73 100644 --- a/include/openssl/objects.h +++ b/include/openssl/objects.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_OBJECTS_H # endif diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h index 9aa4acbbc0..84c75012d2 100644 --- a/include/openssl/objectserr.h +++ b/include/openssl/objectserr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_OBJERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_OBJ_strings(void); /* * OBJ function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define OBJ_F_OBJ_ADD_OBJECT 0 # define OBJ_F_OBJ_ADD_SIGID 0 # define OBJ_F_OBJ_CREATE 0 diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h index 1cc2cc6bcd..b9dc9887de 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_OCSP_H # endif diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h index fa68f6ef00..57f0a90c12 100644 --- a/include/openssl/ocsperr.h +++ b/include/openssl/ocsperr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_OCSPERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_OCSP_strings(void); /* * OCSP function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define OCSP_F_D2I_OCSP_NONCE 0 # define OCSP_F_OCSP_BASIC_ADD1_STATUS 0 # define OCSP_F_OCSP_BASIC_SIGN 0 diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 915b5df4ab..3f56a9fb02 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_PEM_H # endif diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h index baaff3204d..a8a5325bd4 100644 --- a/include/openssl/pem2.h +++ b/include/openssl/pem2.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_PEM2_H # endif # include <openssl/pemerr.h> diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h index ca1b5d4ae3..c37a3acb9e 100644 --- a/include/openssl/pemerr.h +++ b/include/openssl/pemerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_PEMERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_PEM_strings(void); /* * PEM function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define PEM_F_B2I_DSS 0 # define PEM_F_B2I_PVK_BIO 0 # define PEM_F_B2I_RSA 0 diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index 7fd5827d8a..d16cf47750 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_PKCS12_H # endif diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h index b994240438..12eac4a75c 100644 --- a/include/openssl/pkcs12err.h +++ b/include/openssl/pkcs12err.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_PKCS12ERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_PKCS12_strings(void); /* * PKCS12 function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define PKCS12_F_OPENSSL_ASC2UNI 0 # define PKCS12_F_OPENSSL_UNI2ASC 0 # define PKCS12_F_OPENSSL_UNI2UTF8 0 diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h index 8b208f3700..7c079a2ec5 100644 --- a/include/openssl/pkcs7.h +++ b/include/openssl/pkcs7.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_PKCS7_H # endif diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h index e82f6ef83f..41735bdfc8 100644 --- a/include/openssl/pkcs7err.h +++ b/include/openssl/pkcs7err.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_PKCS7ERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_PKCS7_strings(void); /* * PKCS7 function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB 0 # define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME 0 # define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP 0 diff --git a/include/openssl/rand.h b/include/openssl/rand.h index 974476765d..ca7eceb37d 100644 --- a/include/openssl/rand.h +++ b/include/openssl/rand.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RAND_H # endif diff --git a/include/openssl/rand_drbg.h b/include/openssl/rand_drbg.h index f52e5ee041..e9857ec431 100644 --- a/include/openssl/rand_drbg.h +++ b/include/openssl/rand_drbg.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_DRBG_RAND_H # endif @@ -42,7 +42,7 @@ /* Used by RAND_DRBG_set_defaults() to set the private DRBG type and flags. */ # define RAND_DRBG_FLAG_PRIVATE 0x10 -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 /* This #define was replaced by an internal constant and should not be used. */ # define RAND_DRBG_USED_FLAGS (RAND_DRBG_FLAG_CTR_NO_DF) # endif diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h index eb952b4ad4..e633260712 100644 --- a/include/openssl/randerr.h +++ b/include/openssl/randerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RANDERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_RAND_strings(void); /* * RAND function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define RAND_F_DRBG_BYTES 0 # define RAND_F_DRBG_CTR_INIT 0 # define RAND_F_DRBG_GET_ENTROPY 0 diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h index d7be6b49ea..250168abf9 100644 --- a/include/openssl/rc2.h +++ b/include/openssl/rc2.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RC2_H # endif diff --git a/include/openssl/rc4.h b/include/openssl/rc4.h index fed6fcae65..6a3a191abf 100644 --- a/include/openssl/rc4.h +++ b/include/openssl/rc4.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RC4_H # endif diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h index d4d97ed226..53e23ff915 100644 --- a/include/openssl/rc5.h +++ b/include/openssl/rc5.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RC5_H # endif diff --git a/include/openssl/ripemd.h b/include/openssl/ripemd.h index 7f1dbd2a68..3db616d186 100644 --- a/include/openssl/ripemd.h +++ b/include/openssl/ripemd.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RIPEMD_H # endif diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index 9214efd499..b70aef5cb5 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RSA_H # endif diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h index 1f685ec8ea..91fcc1cf8e 100644 --- a/include/openssl/rsaerr.h +++ b/include/openssl/rsaerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_RSAERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_RSA_strings(void); /* * RSA function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define RSA_F_CHECK_PADDING_MD 0 # define RSA_F_ENCODE_PKCS1 0 # define RSA_F_INT_RSA_VERIFY 0 diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h index 1b7b73d4b5..b8de23cf3a 100644 --- a/include/openssl/safestack.h +++ b/include/openssl/safestack.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SAFESTACK_H # endif diff --git a/include/openssl/seed.h b/include/openssl/seed.h index 9ae2bce1ca..81533f203b 100644 --- a/include/openssl/seed.h +++ b/include/openssl/seed.h @@ -37,7 +37,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SEED_H # endif diff --git a/include/openssl/sha.h b/include/openssl/sha.h index 5d21bdf0d8..e262ea3700 100644 --- a/include/openssl/sha.h +++ b/include/openssl/sha.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SHA_H # endif diff --git a/include/openssl/srp.h b/include/openssl/srp.h index 82b4d5b3dd..9f6f1b8644 100644 --- a/include/openssl/srp.h +++ b/include/openssl/srp.h @@ -16,7 +16,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SRP_H # endif diff --git a/include/openssl/srtp.h b/include/openssl/srtp.h index 32056cb280..d64606e5d9 100644 --- a/include/openssl/srtp.h +++ b/include/openssl/srtp.h @@ -18,7 +18,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_D1_SRTP_H # endif diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index dbf1b48f14..9995b87e65 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -14,7 +14,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SSL_H # endif @@ -178,7 +178,7 @@ extern "C" { * DEPRECATED IN 3.0.0, in favor of OSSL_default_cipher_list() * Update both macro and function simultaneously */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL" /* * This is the default set of TLSv1.3 ciphersuites @@ -1345,7 +1345,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) SSL_ctrl(s,SSL_CTRL_SET_DH_AUTO,onoff,NULL) # define SSL_set_tmp_dh(ssl,dh) \ SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)(dh)) -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)(ecdh)) # define SSL_set_tmp_ecdh(ssl,ecdh) \ @@ -2020,7 +2020,7 @@ __owur int SSL_CTX_set_default_verify_store(SSL_CTX *ctx); __owur int SSL_CTX_load_verify_file(SSL_CTX *ctx, const char *CAfile); __owur int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath); __owur int SSL_CTX_load_verify_store(SSL_CTX *ctx, const char *CAstore); -DEPRECATEDIN_3(__owur int SSL_CTX_load_verify_locations(SSL_CTX *ctx, +DEPRECATEDIN_3_0(__owur int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath)) # define SSL_get0_session SSL_get_session/* just peek at pointer */ diff --git a/include/openssl/ssl2.h b/include/openssl/ssl2.h index e9b9ba8802..428ead0540 100644 --- a/include/openssl/ssl2.h +++ b/include/openssl/ssl2.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SSL2_H # endif diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index 63ab2a58e4..efef3ccfeb 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SSL3_H # endif diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 87c6465edc..3f1c851349 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SSLERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_SSL_strings(void); /* * SSL function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define SSL_F_ADD_CLIENT_KEY_SHARE_EXT 0 # define SSL_F_ADD_KEY_SHARE 0 # define SSL_F_BYTES_TO_CIPHER_LIST 0 diff --git a/include/openssl/stack.h b/include/openssl/stack.h index 018e0d0a8b..895dba0c7c 100644 --- a/include/openssl/stack.h +++ b/include/openssl/stack.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_STACK_H # endif diff --git a/include/openssl/store.h b/include/openssl/store.h index 8cceff7dbb..7b2561c2d5 100644 --- a/include/openssl/store.h +++ b/include/openssl/store.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_OSSL_STORE_H # endif diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h index 29e365bcc9..cb7304d9e5 100644 --- a/include/openssl/storeerr.h +++ b/include/openssl/storeerr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_OSSL_STOREERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_OSSL_STORE_strings(void); /* * OSSL_STORE function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define OSSL_STORE_F_FILE_CTRL 0 # define OSSL_STORE_F_FILE_FIND 0 # define OSSL_STORE_F_FILE_GET_PASS 0 diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index abc5df3874..d3eacc293f 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_SYMHACKS_H # endif diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 62a1763623..9a1683e0fd 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -14,7 +14,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_TLS1_H # endif @@ -34,7 +34,7 @@ extern "C" { # define TLS1_1_VERSION 0x0302 # define TLS1_2_VERSION 0x0303 # define TLS1_3_VERSION 0x0304 -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define TLS_MAX_VERSION TLS1_3_VERSION # endif diff --git a/include/openssl/ts.h b/include/openssl/ts.h index 6bd1f89152..1229838da6 100644 --- a/include/openssl/ts.h +++ b/include/openssl/ts.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_TS_H # endif @@ -421,7 +421,7 @@ BIO *TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *b); unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, unsigned char *hexstr, long len); X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s); -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define TS_VERIFY_CTS_set_certs(ctx, cert) TS_VERIFY_CTX_set_certs(ctx,cert) # endif STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs); diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h index 6da6946ffc..4684dc2652 100644 --- a/include/openssl/tserr.h +++ b/include/openssl/tserr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_TSERR_H # endif @@ -33,7 +33,7 @@ int ERR_load_TS_strings(void); /* * TS function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define TS_F_DEF_SERIAL_CB 0 # define TS_F_DEF_TIME_CB 0 # define TS_F_INT_TS_RESP_VERIFY_TOKEN 0 diff --git a/include/openssl/txt_db.h b/include/openssl/txt_db.h index cb646450ca..af169a309e 100644 --- a/include/openssl/txt_db.h +++ b/include/openssl/txt_db.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_TXT_DB_H # endif diff --git a/include/openssl/ui.h b/include/openssl/ui.h index a084402c68..4553716362 100644 --- a/include/openssl/ui.h +++ b/include/openssl/ui.h @@ -27,7 +27,7 @@ # include <openssl/uierr.h> /* For compatibility reasons, the macro OPENSSL_NO_UI is currently retained */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # ifdef OPENSSL_NO_UI_CONSOLE # define OPENSSL_NO_UI # endif diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h index 36567dce45..dbc6432476 100644 --- a/include/openssl/uierr.h +++ b/include/openssl/uierr.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_UIERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_UI_strings(void); /* * UI function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define UI_F_CLOSE_CONSOLE 0 # define UI_F_ECHO_CONSOLE 0 # define UI_F_GENERAL_ALLOCATE_BOOLEAN 0 diff --git a/include/openssl/whrlpool.h b/include/openssl/whrlpool.h index f375607a36..83f34288e4 100644 --- a/include/openssl/whrlpool.h +++ b/include/openssl/whrlpool.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_WHRLPOOL_H # endif diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 3b9c7ad506..d828e87d03 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_X509_H # endif diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h index 8b5f3f6dd6..83186bb1aa 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_X509_VFY_H # endif @@ -500,7 +500,7 @@ int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); int X509_STORE_load_file(X509_STORE *ctx, const char *file); int X509_STORE_load_path(X509_STORE *ctx, const char *path); int X509_STORE_load_store(X509_STORE *ctx, const char *store); -DEPRECATEDIN_3(int X509_STORE_load_locations(X509_STORE *ctx, const char *file, +DEPRECATEDIN_3_0(int X509_STORE_load_locations(X509_STORE *ctx, const char *file, const char *dir)) int X509_STORE_set_default_paths(X509_STORE *ctx); diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h index 19eb3ddcf1..5b0a6b5eaa 100644 --- a/include/openssl/x509err.h +++ b/include/openssl/x509err.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_X509ERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_X509_strings(void); /* * X509 function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define X509_F_ADD_CERT_DIR 0 # define X509_F_BUILD_CHAIN 0 # define X509_F_BY_FILE_CTRL 0 diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h index 419dc795dd..ae16185497 100644 --- a/include/openssl/x509v3.h +++ b/include/openssl/x509v3.h @@ -12,7 +12,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_X509V3_H # endif diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h index f5f7e0bf2c..0dab8a2a36 100644 --- a/include/openssl/x509v3err.h +++ b/include/openssl/x509v3err.h @@ -13,7 +13,7 @@ # pragma once # include <openssl/macros.h> -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define HEADER_X509V3ERR_H # endif @@ -29,7 +29,7 @@ int ERR_load_X509V3_strings(void); /* * X509V3 function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define X509V3_F_A2I_GENERAL_NAME 0 # define X509V3_F_ADDR_VALIDATE_PATH_INTERNAL 0 # define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE 0 diff --git a/providers/common/include/prov/providercommonerr.h b/providers/common/include/prov/providercommonerr.h index c726a1ec29..48daf69861 100644 --- a/providers/common/include/prov/providercommonerr.h +++ b/providers/common/include/prov/providercommonerr.h @@ -23,7 +23,7 @@ int ERR_load_PROV_strings(void); /* * PROV function codes. */ -# if !OPENSSL_API_3 +# ifndef OPENSSL_NO_DEPRECATED_3_0 # define PROV_F_AESNI_INIT_KEY 0 # define PROV_F_AES_BLOCK_FINAL 0 # define PROV_F_AES_BLOCK_UPDATE 0 diff --git a/test/asn1_decode_test.c b/test/asn1_decode_test.c index 81c0f93558..b0c031a5a2 100644 --- a/test/asn1_decode_test.c +++ b/test/asn1_decode_test.c @@ -28,7 +28,7 @@ static unsigned char t_invalid_zero[] = { 0x02, 0x00 /* INTEGER tag + length */ }; -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 /* LONG case ************************************************************* */ typedef struct { @@ -162,7 +162,7 @@ static int test_uint64(void) int setup_tests(void) { -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ADD_TEST(test_long); #endif ADD_TEST(test_int32); diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c index 64f8f1754c..4ff8a20ff4 100644 --- a/test/asn1_encode_test.c +++ b/test/asn1_encode_test.c @@ -179,7 +179,7 @@ typedef struct { ENCDEC_DATA(-1, -1), \ ENCDEC_DATA(0, ASN1_LONG_UNDEF) -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 /***** LONG ******************************************************************/ typedef struct { @@ -824,7 +824,7 @@ static int test_intern(const TEST_PACKAGE *package) return fail == 0; } -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 static int test_long_32bit(void) { return test_intern(&long_test_package_32bit); @@ -858,7 +858,7 @@ static int test_uint64(void) int setup_tests(void) { -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ADD_TEST(test_long_32bit); ADD_TEST(test_long_64bit); #endif diff --git a/test/igetest.c b/test/igetest.c index a4b8cfab4a..5a9ebb5b56 100644 --- a/test/igetest.c +++ b/test/igetest.c @@ -15,7 +15,7 @@ #include "internal/nelem.h" #include "testutil.h" -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 # define TEST_SIZE 128 # define BIG_TEST_SIZE 10240 @@ -438,7 +438,7 @@ static int test_bi_ige_garble3(void) int setup_tests(void) { -#if !OPENSSL_API_3 +#ifndef OPENSSL_NO_DEPRECATED_3_0 RAND_bytes(rkey, sizeof(rkey)); RAND_bytes(rkey2, sizeof(rkey2)); RAND_bytes(plaintext, sizeof(plaintext)); diff --git a/util/libcrypto.num b/util/libcrypto.num index 625e10996b..ac28f86b25 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -149,7 +149,7 @@ ASN1_get_object 151 3_0_0 EXIST::FUNCTION: i2d_IPAddressFamily 152 3_0_0 EXIST::FUNCTION:RFC3779 ENGINE_get_ctrl_function 153 3_0_0 EXIST::FUNCTION:ENGINE X509_REVOKED_get_ext_count 154 3_0_0 EXIST::FUNCTION: -BN_is_prime_fasttest_ex 155 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +BN_is_prime_fasttest_ex 155 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 ERR_load_PKCS12_strings 156 3_0_0 EXIST::FUNCTION: EVP_sha384 157 3_0_0 EXIST::FUNCTION: i2d_DHparams 158 3_0_0 EXIST::FUNCTION:DH @@ -257,7 +257,7 @@ ASN1_NULL_free 262 3_0_0 EXIST::FUNCTION: EC_KEY_copy 263 3_0_0 EXIST::FUNCTION:EC EVP_des_ede3 264 3_0_0 EXIST::FUNCTION:DES PKCS7_add1_attrib_digest 265 3_0_0 EXIST::FUNCTION: -EC_POINT_get_affine_coordinates_GFp 266 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC +EC_POINT_get_affine_coordinates_GFp 266 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC EVP_seed_ecb 267 3_0_0 EXIST::FUNCTION:SEED BIO_dgram_sctp_wait_for_dry 268 3_0_0 EXIST::FUNCTION:DGRAM,SCTP ASN1_OCTET_STRING_NDEF_it 269 3_0_0 EXIST::FUNCTION: @@ -280,7 +280,7 @@ X509V3_EXT_get_nid 285 3_0_0 EXIST::FUNCTION: BIO_s_log 286 3_0_0 EXIST::FUNCTION: EC_POINT_set_to_infinity 287 3_0_0 EXIST::FUNCTION:EC EVP_des_ede_ofb 288 3_0_0 EXIST::FUNCTION:DES -ECDH_KDF_X9_62 289 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC +ECDH_KDF_X9_62 289 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC ASN1_UNIVERSALSTRING_to_string 290 3_0_0 EXIST::FUNCTION: CRYPTO_gcm128_setiv 291 3_0_0 EXIST::FUNCTION: ASN1_PCTX_set_oid_flags 292 3_0_0 EXIST::FUNCTION: @@ -515,7 +515,7 @@ DH_generate_parameters 526 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_0 BN_set_negative 527 3_0_0 EXIST::FUNCTION: i2d_TS_RESP_bio 528 3_0_0 EXIST::FUNCTION:TS ASYNC_WAIT_CTX_set_wait_fd 529 3_0_0 EXIST::FUNCTION: -ERR_func_error_string 530 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +ERR_func_error_string 530 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 ASN1_STRING_data 531 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0 X509_CRL_add1_ext_i2d 532 3_0_0 EXIST::FUNCTION: i2d_TS_TST_INFO 533 3_0_0 EXIST::FUNCTION:TS @@ -532,7 +532,7 @@ PEM_write_bio_RSAPrivateKey 543 3_0_0 EXIST::FUNCTION:RSA CONF_get_number 544 3_0_0 EXIST::FUNCTION: X509_EXTENSION_get_object 545 3_0_0 EXIST::FUNCTION: X509_EXTENSIONS_it 546 3_0_0 EXIST::FUNCTION: -EC_POINT_set_compressed_coordinates_GF2m 547 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M +EC_POINT_set_compressed_coordinates_GF2m 547 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC,EC2M RSA_sign_ASN1_OCTET_STRING 548 3_0_0 EXIST::FUNCTION:RSA d2i_X509_CRL_fp 549 3_0_0 EXIST::FUNCTION:STDIO i2d_RSA_PUBKEY 550 3_0_0 EXIST::FUNCTION:RSA @@ -622,7 +622,7 @@ BN_get_rfc3526_prime_8192 637 3_0_0 EXIST::FUNCTION: X509_REVOKED_it 638 3_0_0 EXIST::FUNCTION: CRYPTO_THREAD_write_lock 639 3_0_0 EXIST::FUNCTION: X509V3_NAME_from_section 640 3_0_0 EXIST::FUNCTION: -EC_POINT_set_compressed_coordinates_GFp 641 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC +EC_POINT_set_compressed_coordinates_GFp 641 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC OCSP_SINGLERESP_get0_id 642 3_0_0 EXIST::FUNCTION:OCSP UI_add_info_string 643 3_0_0 EXIST::FUNCTION: OBJ_NAME_remove 644 3_0_0 EXIST::FUNCTION: @@ -666,7 +666,7 @@ DSO_global_lookup 682 3_0_0 EXIST::FUNCTION: PKCS7_SIGNER_INFO_it 683 3_0_0 EXIST::FUNCTION: CRYPTO_ocb128_copy_ctx 684 3_0_0 EXIST::FUNCTION:OCB TS_REQ_get_ext_d2i 685 3_0_0 EXIST::FUNCTION:TS -AES_ige_encrypt 686 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +AES_ige_encrypt 686 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 d2i_SXNET 687 3_0_0 EXIST::FUNCTION: CTLOG_get0_log_id 688 3_0_0 EXIST::FUNCTION:CT CMS_RecipientInfo_ktri_get0_signer_id 689 3_0_0 EXIST::FUNCTION:CMS @@ -708,7 +708,7 @@ BIO_snprintf 726 3_0_0 EXIST::FUNCTION: EC_POINT_hex2point 727 3_0_0 EXIST::FUNCTION:EC X509v3_get_ext_by_critical 728 3_0_0 EXIST::FUNCTION: ENGINE_get_default_RSA 729 3_0_0 EXIST::FUNCTION:ENGINE -DSA_sign_setup 730 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,DSA +DSA_sign_setup 730 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DSA OPENSSL_sk_new_null 731 3_0_0 EXIST::FUNCTION: PEM_read_PKCS8 732 3_0_0 EXIST::FUNCTION:STDIO BN_mod_sqr 733 3_0_0 EXIST::FUNCTION: @@ -757,7 +757,7 @@ EVP_rc5_32_12_16_cfb64 775 3_0_0 EXIST::FUNCTION:RC5 PKCS7_dataVerify 776 3_0_0 EXIST::FUNCTION: PKCS7_SIGNER_INFO_free 777 3_0_0 EXIST::FUNCTION: PKCS7_add_attrib_smimecap 778 3_0_0 EXIST::FUNCTION: -ERR_peek_last_error_line_data 779 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +ERR_peek_last_error_line_data 779 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 EVP_PKEY_meth_set_sign 780 3_0_0 EXIST::FUNCTION: ASN1_i2d_bio 781 3_0_0 EXIST::FUNCTION: DSA_verify 782 3_0_0 EXIST::FUNCTION:DSA @@ -969,7 +969,7 @@ DH_get_default_method 993 3_0_0 EXIST::FUNCTION:DH PEM_proc_type 994 3_0_0 EXIST::FUNCTION: BIO_printf 995 3_0_0 EXIST::FUNCTION: a2i_IPADDRESS 996 3_0_0 EXIST::FUNCTION: -ERR_peek_error_line_data 997 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +ERR_peek_error_line_data 997 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 ERR_unload_strings 998 3_0_0 EXIST::FUNCTION: SEED_cfb128_encrypt 999 3_0_0 EXIST::FUNCTION:SEED ASN1_BIT_STRING_it 1000 3_0_0 EXIST::FUNCTION: @@ -1157,7 +1157,7 @@ EVP_PKEY_CTX_set0_keygen_info 1183 3_0_0 EXIST::FUNCTION: ENGINE_unregister_digests 1184 3_0_0 EXIST::FUNCTION:ENGINE IPAddressOrRange_new 1185 3_0_0 EXIST::FUNCTION:RFC3779 EVP_aes_256_ofb 1186 3_0_0 EXIST::FUNCTION: -CRYPTO_mem_debug_push 1187 3_0_0 EXIST::FUNCTION:CRYPTO_MDEBUG,DEPRECATEDIN_3 +CRYPTO_mem_debug_push 1187 3_0_0 EXIST::FUNCTION:CRYPTO_MDEBUG,DEPRECATEDIN_3_0 X509_PKEY_new 1188 3_0_0 EXIST::FUNCTION: X509_get_key_usage 1189 3_0_0 EXIST::FUNCTION: X509_ATTRIBUTE_create_by_txt 1190 3_0_0 EXIST::FUNCTION: @@ -1410,7 +1410,7 @@ EVP_PKEY_get0_DH 1442 3_0_0 EXIST::FUNCTION:DH d2i_OCSP_CRLID 1443 3_0_0 EXIST::FUNCTION:OCSP EVP_CIPHER_CTX_set_padding 1444 3_0_0 EXIST::FUNCTION: CTLOG_new_from_base64 1445 3_0_0 EXIST::FUNCTION:CT -AES_bi_ige_encrypt 1446 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +AES_bi_ige_encrypt 1446 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 ERR_pop_to_mark 1447 3_0_0 EXIST::FUNCTION: CRL_DIST_POINTS_new 1449 3_0_0 EXIST::FUNCTION: EVP_PKEY_get0_asn1 1450 3_0_0 EXIST::FUNCTION: @@ -1554,7 +1554,7 @@ SRP_VBASE_free 1588 3_0_0 EXIST::FUNCTION:SRP PKCS7_add0_attrib_signing_time 1589 3_0_0 EXIST::FUNCTION: X509_STORE_set_flags 1590 3_0_0 EXIST::FUNCTION: UI_get0_output_string 1591 3_0_0 EXIST::FUNCTION: -ERR_get_error_line_data 1592 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +ERR_get_error_line_data 1592 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 CTLOG_get0_name 1593 3_0_0 EXIST::FUNCTION:CT ASN1_TBOOLEAN_it 1594 3_0_0 EXIST::FUNCTION: RC2_set_key 1595 3_0_0 EXIST::FUNCTION:RC2 @@ -1663,7 +1663,7 @@ X509_PURPOSE_cleanup 1700 3_0_0 EXIST::FUNCTION: ESS_SIGNING_CERT_dup 1701 3_0_0 EXIST::FUNCTION: ENGINE_set_default_DSA 1702 3_0_0 EXIST::FUNCTION:ENGINE X509_REVOKED_new 1703 3_0_0 EXIST::FUNCTION: -NCONF_WIN32 1704 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +NCONF_WIN32 1704 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 RSA_padding_check_PKCS1_OAEP_mgf1 1705 3_0_0 EXIST::FUNCTION:RSA X509_policy_tree_get0_level 1706 3_0_0 EXIST::FUNCTION: ASN1_parse_dump 1708 3_0_0 EXIST::FUNCTION: @@ -1717,7 +1717,7 @@ ASYNC_init_thread 1755 3_0_0 EXIST::FUNCTION: OCSP_BASICRESP_get_ext_by_OBJ 1756 3_0_0 EXIST::FUNCTION:OCSP X509_reject_clear 1757 3_0_0 EXIST::FUNCTION: DH_security_bits 1758 3_0_0 EXIST::FUNCTION:DH -LONG_it 1759 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +LONG_it 1759 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 ASN1_dup 1760 3_0_0 EXIST::FUNCTION: TS_RESP_new 1761 3_0_0 EXIST::FUNCTION:TS i2d_PKCS8PrivateKeyInfo_fp 1762 3_0_0 EXIST::FUNCTION:STDIO @@ -1780,7 +1780,7 @@ X509V3_EXT_add_list 1821 3_0_0 EXIST::FUNCTION: CMS_compress 1822 3_0_0 EXIST::FUNCTION:CMS X509_get_ext_by_critical 1823 3_0_0 EXIST::FUNCTION: ASYNC_WAIT_CTX_clear_fd 1824 3_0_0 EXIST::FUNCTION: -ZLONG_it 1825 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +ZLONG_it 1825 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 OPENSSL_sk_find_ex 1826 3_0_0 EXIST::FUNCTION: ASN1_ENUMERATED_to_BN 1827 3_0_0 EXIST::FUNCTION: X509_CRL_get_ext_d2i 1828 3_0_0 EXIST::FUNCTION: @@ -1815,7 +1815,7 @@ i2b_PrivateKey_bio 1858 3_0_0 EXIST::FUNCTION:DSA ASN1_STRING_length_set 1859 3_0_0 EXIST::FUNCTION: PEM_write_PKCS8 1860 3_0_0 EXIST::FUNCTION:STDIO PKCS7_digest_from_attributes 1861 3_0_0 EXIST::FUNCTION: -EC_GROUP_set_curve_GFp 1862 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC +EC_GROUP_set_curve_GFp 1862 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC X509_PURPOSE_get0 1863 3_0_0 EXIST::FUNCTION: EVP_PKEY_set1_DSA 1864 3_0_0 EXIST::FUNCTION:DSA X509_NAME_it 1865 3_0_0 EXIST::FUNCTION: @@ -1847,7 +1847,7 @@ IDEA_cbc_encrypt 1890 3_0_0 EXIST::FUNCTION:IDEA BN_CTX_secure_new 1891 3_0_0 EXIST::FUNCTION: OCSP_ONEREQ_add_ext 1892 3_0_0 EXIST::FUNCTION:OCSP CMS_uncompress 1893 3_0_0 EXIST::FUNCTION:CMS -CRYPTO_mem_debug_pop 1895 3_0_0 EXIST::FUNCTION:CRYPTO_MDEBUG,DEPRECATEDIN_3 +CRYPTO_mem_debug_pop 1895 3_0_0 EXIST::FUNCTION:CRYPTO_MDEBUG,DEPRECATEDIN_3_0 EVP_aes_192_cfb128 1896 3_0_0 EXIST::FUNCTION: OCSP_REQ_CTX_nbio 1897 3_0_0 EXIST::FUNCTION:OCSP EVP_CIPHER_CTX_copy 1898 3_0_0 EXIST::FUNCTION: @@ -1920,7 +1920,7 @@ X509_CRL_it 1966 3_0_0 EXIST::FUNCTION: d2i_X509_ALGOR 1967 3_0_0 EXIST::FUNCTION: PKCS12_PBE_keyivgen 1968 3_0_0 EXIST::FUNCTION: BIO_test_flags 1969 3_0_0 EXIST::FUNCTION: -EC_POINT_get_affine_coordinates_GF2m 1970 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M +EC_POINT_get_affine_coordinates_GF2m 1970 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC,EC2M EVP_ENCODE_CTX_num 1971 3_0_0 EXIST::FUNCTION: Camellia_cfb1_encrypt 1972 3_0_0 EXIST::FUNCTION:CAMELLIA NCONF_load_fp 1973 3_0_0 EXIST::FUNCTION:STDIO @@ -2110,7 +2110,7 @@ i2d_ASN1_T61STRING 2156 3_0_0 EXIST::FUNCTION: X509_add1_trust_object 2157 3_0_0 EXIST::FUNCTION: PEM_write_X509 2158 3_0_0 EXIST::FUNCTION:STDIO BN_CTX_free 2159 3_0_0 EXIST::FUNCTION: -EC_GROUP_get_curve_GF2m 2160 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M +EC_GROUP_get_curve_GF2m 2160 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC,EC2M EVP_MD_flags 2161 3_0_0 EXIST::FUNCTION: OPENSSL_sk_set 2162 3_0_0 EXIST::FUNCTION: OCSP_request_sign 2163 3_0_0 EXIST::FUNCTION:OCSP @@ -2122,7 +2122,7 @@ X509_EXTENSION_create_by_NID 2168 3_0_0 EXIST::FUNCTION: i2d_RSAPrivateKey 2169 3_0_0 EXIST::FUNCTION:RSA d2i_CERTIFICATEPOLICIES 2170 3_0_0 EXIST::FUNCTION: CMAC_CTX_get0_cipher_ctx 2171 3_0_0 EXIST::FUNCTION:CMAC -X509_STORE_load_locations 2172 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +X509_STORE_load_locations 2172 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 OBJ_find_sigid_algs 2173 3_0_0 EXIST::FUNCTION: TS_RESP_CTX_set_accuracy 2174 3_0_0 EXIST::FUNCTION:TS NETSCAPE_SPKI_get_pubkey 2175 3_0_0 EXIST::FUNCTION: @@ -2187,7 +2187,7 @@ ENGINE_set_name 2235 3_0_0 EXIST::FUNCTION:ENGINE TS_TST_INFO_get_policy_id 2236 3_0_0 EXIST::FUNCTION:TS PKCS7_SIGNER_INFO_set 2237 3_0_0 EXIST::FUNCTION: PEM_write_bio_PKCS8_PRIV_KEY_INFO 2238 3_0_0 EXIST::FUNCTION: -EC_GROUP_set_curve_GF2m 2239 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M +EC_GROUP_set_curve_GF2m 2239 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC,EC2M ENGINE_load_builtin_engines 2240 3_0_0 EXIST::FUNCTION:ENGINE SRP_VBASE_init 2241 3_0_0 EXIST::FUNCTION:SRP SHA224_Final 2242 3_0_0 EXIST::FUNCTION: @@ -2213,7 +2213,7 @@ EVP_PKEY_missing_parameters 2261 3_0_0 EXIST::FUNCTION: X509_REQ_INFO_new 2262 3_0_0 EXIST::FUNCTION: EVP_rc2_cfb64 2263 3_0_0 EXIST::FUNCTION:RC2 PKCS7_get_smimecap 2264 3_0_0 EXIST::FUNCTION: -ERR_get_state 2265 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +ERR_get_state 2265 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 d2i_DSAPrivateKey_bio 2266 3_0_0 EXIST::FUNCTION:DSA X509_PURPOSE_get_trust 2267 3_0_0 EXIST::FUNCTION: EC_GROUP_get_point_conversion_form 2268 3_0_0 EXIST::FUNCTION:EC @@ -2577,7 +2577,7 @@ PKCS7_ENVELOPE_it 2632 3_0_0 EXIST::FUNCTION: ASIdentifierChoice_it 2633 3_0_0 EXIST::FUNCTION:RFC3779 CMS_RecipientEncryptedKey_cert_cmp 2634 3_0_0 EXIST::FUNCTION:CMS EVP_PKEY_CTX_get_app_data 2635 3_0_0 EXIST::FUNCTION: -EC_GROUP_clear_free 2636 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC +EC_GROUP_clear_free 2636 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC BN_get_rfc2409_prime_1024 2637 3_0_0 EXIST::FUNCTION: CRYPTO_set_mem_functions 2638 3_0_0 EXIST::FUNCTION: i2d_ASN1_VISIBLESTRING 2639 3_0_0 EXIST::FUNCTION: @@ -2874,7 +2874,7 @@ EVP_aes_192_cbc 2936 3_0_0 EXIST::FUNCTION: PKCS8_pkey_set0 2937 3_0_0 EXIST::FUNCTION: X509_get1_email 2938 3_0_0 EXIST::FUNCTION: EC_POINT_point2oct 2939 3_0_0 EXIST::FUNCTION:EC -EC_GROUP_get_curve_GFp 2940 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC +EC_GROUP_get_curve_GFp 2940 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC ASYNC_block_pause 2941 3_0_0 EXIST::FUNCTION: OCSP_SINGLERESP_get_ext 2942 3_0_0 EXIST::FUNCTION:OCSP CRYPTO_strdup 2943 3_0_0 EXIST::FUNCTION: @@ -3120,7 +3120,7 @@ X509_NAME_oneline 3186 3_0_0 EXIST::FUNCTION: X509V3_set_nconf 3187 3_0_0 EXIST::FUNCTION: RSAPrivateKey_dup 3188 3_0_0 EXIST::FUNCTION:RSA BN_mod_add 3189 3_0_0 EXIST::FUNCTION: -EC_POINT_set_affine_coordinates_GFp 3190 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC +EC_POINT_set_affine_coordinates_GFp 3190 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC X509_get_default_cert_file 3191 3_0_0 EXIST::FUNCTION: UI_method_set_flusher 3192 3_0_0 EXIST::FUNCTION: RSA_new_method 3193 3_0_0 EXIST::FUNCTION:RSA @@ -3452,7 +3452,7 @@ PROXY_CERT_INFO_EXTENSION_new 3523 3_0_0 EXIST::FUNCTION: EVP_bf_cbc 3524 3_0_0 EXIST::FUNCTION:BF DSA_do_verify 3525 3_0_0 EXIST::FUNCTION:DSA EC_GROUP_get_seed_len 3526 3_0_0 EXIST::FUNCTION:EC -EC_POINT_set_affine_coordinates_GF2m 3527 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M +EC_POINT_set_affine_coordinates_GF2m 3527 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC,EC2M TS_REQ_set_policy_id 3528 3_0_0 EXIST::FUNCTION:TS BIO_callback_ctrl 3529 3_0_0 EXIST::FUNCTION: v2i_GENERAL_NAME 3530 3_0_0 EXIST::FUNCTION: @@ -3531,7 +3531,7 @@ CMS_add1_recipient_cert 3608 3_0_0 EXIST::FUNCTION:CMS CMS_RecipientInfo_kekri_get0_id 3609 3_0_0 EXIST::FUNCTION:CMS BN_mod_word 3610 3_0_0 EXIST::FUNCTION: ASN1_PCTX_new 3611 3_0_0 EXIST::FUNCTION: -BN_is_prime_ex 3612 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +BN_is_prime_ex 3612 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 PKCS5_v2_PBE_keyivgen 3613 3_0_0 EXIST::FUNCTION: CRYPTO_ctr128_encrypt 3614 3_0_0 EXIST::FUNCTION: CMS_unsigned_add1_attr_by_OBJ 3615 3_0_0 EXIST::FUNCTION:CMS diff --git a/util/libssl.num b/util/libssl.num index 4b5965285a..f24cdd7834 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -354,7 +354,7 @@ SSL_set_session_id_context 354 3_0_0 EXIST::FUNCTION: SSL_new 355 3_0_0 EXIST::FUNCTION: TLSv1_1_method 356 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_1_METHOD SSL_CTX_get_cert_store 357 3_0_0 EXIST::FUNCTION: -SSL_CTX_load_verify_locations 358 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 +SSL_CTX_load_verify_locations 358 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 SSL_SESSION_print_fp 359 3_0_0 EXIST::FUNCTION:STDIO SSL_get0_dane_tlsa 360 3_0_0 EXIST::FUNCTION: SSL_CTX_set_generate_session_id 361 3_0_0 EXIST::FUNCTION: diff --git a/util/mkerr.pl b/util/mkerr.pl index c8ec94d288..1d8cdfdfb4 100755 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -496,7 +496,7 @@ EOF } print OUT "\n/*\n * $lib function codes.\n */\n"; - print OUT "# if !OPENSSL_API_3\n"; + print OUT "# ifndef OPENSSL_NO_DEPRECATED_3_0\n"; foreach my $i ( @function ) { my $z = 48 - length($i); $z = 0 if $z < 0; |