From a8d177acf0bbb4da4d7c2d9dd4c645d447f8da75 Mon Sep 17 00:00:00 2001
From: Rob Percival <robpercival@google.com>
Date: Thu, 25 Feb 2016 16:24:10 +0000
Subject: [PATCH] Moves SCT struct typedef into ossl_typ.h
Reviewed-by: Ben Laurie <ben@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
---
include/openssl/ct.h | 7 +------
include/openssl/ossl_typ.h | 2 ++
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/openssl/ct.h b/include/openssl/ct.h
index 0ea051bb54..520174ff9a 100644
--- a/include/openssl/ct.h
+++ b/include/openssl/ct.h
@@ -58,6 +58,7 @@
#ifndef HEADER_CT_H
# define HEADER_CT_H
+# include <openssl/ossl_typ.h>
# include <openssl/safestack.h>
# include <openssl/x509.h>
@@ -82,12 +83,6 @@ typedef enum {
SCT_VERSION_V1 = 0
} sct_version_t;
-/*******************
- * Data structures *
- *******************/
-
-/* Signed Certificate Timestamp (SCT) */
-typedef struct sct_st SCT;
DEFINE_STACK_OF(SCT)
/*****************
diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h
index d29be73134..536ffa2fec 100644
--- a/include/openssl/ossl_typ.h
+++ b/include/openssl/ossl_typ.h
@@ -200,6 +200,8 @@ typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
typedef struct ocsp_response_st OCSP_RESPONSE;
typedef struct ocsp_responder_id_st OCSP_RESPID;
+typedef struct sct_st SCT;
+
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
defined(INTMAX_MAX) && defined(UINTMAX_MAX)
typedef intmax_t ossl_intmax_t;
--
2.25.1