diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-05-25 12:57:06 -0400 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-06-02 12:40:02 +1000 |
| commit | ff234c6804571b70bc02ff44df1f42c4a3fe5cf1 (patch) | |
| tree | f1aa015ec3bcc612ed7be498fda2925ed7a83359 /crypto/conf | |
| parent | 147ed5f9def86840c9f6ba512e63a890d58ac1d6 (diff) | |
Make conf_method_st and conf_st deprecated
So they can be made opaque in a future release.
Fixes #15101
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15466)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_api.c | 1 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 1 | ||||
| -rw-r--r-- | crypto/conf/conf_lib.c | 1 | ||||
| -rw-r--r-- | crypto/conf/conf_local.h | 1 | ||||
| -rw-r--r-- | crypto/conf/conf_mod.c | 1 | ||||
| -rw-r--r-- | crypto/conf/conf_sap.c | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 41a09c42bc..e4e305c714 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -15,6 +15,7 @@ #include <string.h> #include <openssl/conf.h> #include <openssl/conf_api.h> +#include "conf_local.h" static void value_free_hash(const CONF_VALUE *a, LHASH_OF(CONF_VALUE) *conf); static void value_free_stack_doall(CONF_VALUE *a); diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 25fcc0400c..7b67854c8b 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -21,6 +21,7 @@ #include <openssl/lhash.h> #include <openssl/conf.h> #include <openssl/conf_api.h> +#include "conf_local.h" #include "conf_def.h" #include <openssl/buffer.h> #include <openssl/err.h> diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 1f106d8c07..99a33765ad 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -16,6 +16,7 @@ #include <openssl/err.h> #include <openssl/conf.h> #include <openssl/conf_api.h> +#include "conf_local.h" #include <openssl/lhash.h> static CONF_METHOD *default_CONF_method = NULL; diff --git a/crypto/conf/conf_local.h b/crypto/conf/conf_local.h index 1ee8424c50..f3b16f1138 100644 --- a/crypto/conf/conf_local.h +++ b/crypto/conf/conf_local.h @@ -7,4 +7,5 @@ * https://www.openssl.org/source/license.html */ +#include <openssl/conftypes.h> void ossl_config_add_ssl_module(void); diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index d82f0c7f2c..36b054ca51 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -21,6 +21,7 @@ #include <openssl/x509.h> #include <openssl/trace.h> #include <openssl/engine.h> +#include "conf_local.h" DEFINE_STACK_OF(CONF_MODULE) DEFINE_STACK_OF(CONF_IMODULE) diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 5cd018c167..6742ecf87f 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -11,6 +11,7 @@ #include <openssl/crypto.h> #include "internal/cryptlib.h" #include "internal/conf.h" +#include "conf_local.h" #include <openssl/x509.h> #include <openssl/asn1.h> #include <openssl/engine.h> |