diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-07-25 21:57:48 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-09-12 18:33:15 +0200 |
| commit | 14e275e8fb736be4ea83441b630515f7be97d06b (patch) | |
| tree | 8a0438dadaaf5bc625d513345f74ec43bf7e623d /crypto | |
| parent | 1f86b8228b49938e0e368f361202570d7eab5806 (diff) | |
Deprecate the public definition of ERR_STATE
The intention is to make it opaque later on.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9462)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/err/err.c | 6 | ||||
| -rw-r--r-- | crypto/err/err_blocks.c | 3 | ||||
| -rw-r--r-- | crypto/err/err_prn.c | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index deaa579090..25426be730 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -7,6 +7,9 @@ * https://www.openssl.org/source/license.html */ +/* TODO: When ERR_STATE becomes opaque, this musts be removed */ +#define OSSL_FORCE_ERR_STATE + #include <stdio.h> #include <stdarg.h> #include <string.h> @@ -24,6 +27,9 @@ #include "e_os.h" #include "err_locl.h" +/* Forward declaration in case it's not published because of configuration */ +ERR_STATE *ERR_get_state(void); + static int err_load_strings(const ERR_STRING_DATA *str); static void ERR_STATE_free(ERR_STATE *s); diff --git a/crypto/err/err_blocks.c b/crypto/err/err_blocks.c index cf1bb9708a..c2ff7c0823 100644 --- a/crypto/err/err_blocks.c +++ b/crypto/err/err_blocks.c @@ -7,6 +7,9 @@ * https://www.openssl.org/source/license.html */ +/* TODO: When ERR_STATE becomes opaque, this musts be removed */ +#define OSSL_FORCE_ERR_STATE + #include <string.h> #include <openssl/err.h> #include "err_locl.h" diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c index 9ea3eb3dee..1e1531b91d 100644 --- a/crypto/err/err_prn.c +++ b/crypto/err/err_prn.c @@ -7,6 +7,9 @@ * https://www.openssl.org/source/license.html */ +/* TODO: When ERR_STATE becomes opaque, this musts be removed */ +#define OSSL_FORCE_ERR_STATE + #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/crypto.h> |