summaryrefslogtreecommitdiff
path: root/crypto/conf
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-09-03 16:14:28 +0100
committerMatt Caswell <matt@openssl.org>2020-09-13 11:11:20 +0100
commite74e562f1c518839cc9b63aafd4af6644e01d9ca (patch)
treeed8d2cc7f428c78fd9fc3456bafcce76e346d739 /crypto/conf
parentdd731474207126615679f4cc9ae772d7da990332 (diff)
downloadopenssl-new-e74e562f1c518839cc9b63aafd4af6644e01d9ca.tar.gz
Fix safestack issues in conf.h
Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'crypto/conf')
-rw-r--r--crypto/conf/conf_api.c2
-rw-r--r--crypto/conf/conf_mod.c1
-rw-r--r--crypto/conf/conf_ssl.c2
3 files changed, 0 insertions, 5 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index b4edfb28ae..d64cc5031a 100644
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -16,8 +16,6 @@
#include <openssl/conf.h>
#include <openssl/conf_api.h>
-DEFINE_STACK_OF(CONF_VALUE)
-
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_mod.c b/crypto/conf/conf_mod.c
index a0b9fd3b61..fa7f6b9d9f 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -21,7 +21,6 @@
#include <openssl/trace.h>
#include <openssl/engine.h>
-DEFINE_STACK_OF(CONF_VALUE)
DEFINE_STACK_OF(CONF_MODULE)
DEFINE_STACK_OF(CONF_IMODULE)
diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c
index eefd279a10..5b949be616 100644
--- a/crypto/conf/conf_ssl.c
+++ b/crypto/conf/conf_ssl.c
@@ -14,8 +14,6 @@
#include "internal/sslconf.h"
#include "conf_local.h"
-DEFINE_STACK_OF(CONF_VALUE)
-
/*
* SSL library configuration module placeholder. We load it here but defer
* all decisions about its contents to libssl.