summaryrefslogtreecommitdiffstats
path: root/ssl/statem
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-09-03 10:23:44 +0100
committerMatt Caswell <matt@openssl.org>2020-09-13 11:09:45 +0100
commite6623cfbffcc03e2483632359e005ca13adacc9d (patch)
tree64caba9fa625624f304162011a54a55b09b0ad41 /ssl/statem
parent6ac1cd10ba8a1d92d3858e53a7aea2cf444adf26 (diff)
Fix safestack issues in x509.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 'ssl/statem')
-rw-r--r--ssl/statem/extensions.c2
-rw-r--r--ssl/statem/extensions_srvr.c1
-rw-r--r--ssl/statem/statem_clnt.c2
-rw-r--r--ssl/statem/statem_lib.c3
-rw-r--r--ssl/statem/statem_srvr.c2
5 files changed, 0 insertions, 10 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index c842e20fbf..ec38b2f6a0 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -14,8 +14,6 @@
#include "statem_local.h"
#include "internal/cryptlib.h"
-DEFINE_STACK_OF(X509_NAME)
-
static int final_renegotiate(SSL *s, unsigned int context, int sent);
static int init_server_name(SSL *s, unsigned int context);
static int final_server_name(SSL *s, unsigned int context, int sent);
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index c686d00f0e..6adb9cab82 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -13,7 +13,6 @@
#include "internal/cryptlib.h"
DEFINE_STACK_OF(OCSP_RESPID)
-DEFINE_STACK_OF(X509_EXTENSION)
#define COOKIE_STATE_FORMAT_VERSION 0
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index f8a3d25c08..a3e7b5ad0a 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -28,8 +28,6 @@
#include <openssl/trace.h>
#include <internal/cryptlib.h>
-DEFINE_STACK_OF(X509)
-
static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL *s, PACKET *pkt);
static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL *s, PACKET *pkt);
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 79195b2aa2..6d0efb3239 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -21,9 +21,6 @@
#include <openssl/x509.h>
#include <openssl/trace.h>
-DEFINE_STACK_OF(X509)
-DEFINE_STACK_OF(X509_NAME)
-
/*
* Map error codes to TLS/SSL alart types.
*/
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index f42e7865eb..a1a28e905a 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -26,8 +26,6 @@
#include <openssl/core_names.h>
#include <openssl/asn1t.h>
-DEFINE_STACK_OF(X509)
-
#define TICKET_NONCE_SIZE 8
typedef struct {