Moves SCT struct typedef into ossl_typ.h

Reviewed-by: Ben Laurie <ben@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/include/openssl/ct.h b/include/openssl/ct.h
index 0ea051bb54a5d19c5249689d1663b31fc7789295..520174ff9acbeda9488a07f23238d0baab7339a1 100644 (file)
--- 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 d29be73134acab91b3883eede9d4d1d9842dc350..536ffa2fec583332b5c2eb36dd7686fb1ec5a94b 100644 (file)
--- 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;