diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-05 17:28:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-07 11:37:25 +0100 |
| commit | 936c2b9e933eacae80d3489e5f7316589f3e9a07 (patch) | |
| tree | bcc8e013817b791df5b290c5ec1892e93969b5fc /crypto/err | |
| 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)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 10 |
1 files changed, 5 insertions, 5 deletions
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(); |