From e74e562f1c518839cc9b63aafd4af6644e01d9ca Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Thu, 3 Sep 2020 16:14:28 +0100
Subject: 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)
---
 apps/ca.c       | 2 --
 apps/lib/apps.c | 1 -
 apps/ocsp.c     | 2 --
 apps/req.c      | 2 --
 4 files changed, 7 deletions(-)

(limited to 'apps')

diff --git a/apps/ca.c b/apps/ca.c
index 9ddd464..6ae52c2 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -34,8 +34,6 @@
 #include "apps.h"
 #include "progs.h"
 
-DEFINE_STACK_OF(CONF_VALUE)
-
 #ifndef W_OK
 # define F_OK 0
 # define W_OK 2
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 9bc9763..9c608e6 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -62,7 +62,6 @@ static int WIN32_rename(const char *from, const char *to);
 #define PASS_SOURCE_SIZE_MAX 4
 
 DEFINE_STACK_OF(CONF)
-DEFINE_STACK_OF(CONF_VALUE)
 
 typedef struct {
     const char *name;
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 2540ce1..93c17f4 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -33,8 +33,6 @@
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
-DEFINE_STACK_OF(CONF_VALUE)
-
 #if defined(__TANDEM)
 # if defined(OPENSSL_TANDEM_FLOSS)
 #  include <floss.h(floss_fork)>
diff --git a/apps/req.c b/apps/req.c
index 5f3c7b5..cb5850c 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -35,8 +35,6 @@
 # include <openssl/dsa.h>
 #endif
 
-DEFINE_STACK_OF(CONF_VALUE)
-
 #define BITS            "default_bits"
 #define KEYFILE         "default_keyfile"
 #define PROMPT          "prompt"
-- 
cgit v1.1