Start making ts opaque

Move the not yet exposed EssCertIDv2 struct internals to ts_local.h and move
the ASN.1 function prototypes that we don't want to expose with them.

Include ts_local.h where necessary or where it will be needed soon.

ok jsing

1 files changed, 3 insertions, 42 deletions

diff --git a/src/lib/libcrypto/ts/ts.h b/src/lib/libcrypto/ts/ts.h
index bfcf9dfe8f..31b916983e 100644
--- a/src/lib/libcrypto/ts/ts.h
+++ b/src/lib/libcrypto/ts/ts.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.h,v 1.14 2022/07/23 07:13:03 tb Exp $ */
+/* $OpenBSD: ts.h,v 1.15 2022/07/24 08:16:47 tb Exp $ */
 /* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL
  * project 2002, 2003, 2004.
  */
@@ -265,32 +265,10 @@ typedef struct ESS_signing_cert {
 } ESS_SIGNING_CERT;
 
 #ifdef LIBRESSL_INTERNAL
-/*
- * ESSCertIDv2 ::=  SEQUENCE {
- *     hashAlgorithm           AlgorithmIdentifier
- *            DEFAULT {algorithm id-sha256},
- *     certHash                 Hash,
- *     issuerSerial             IssuerSerial OPTIONAL }
- */
-
-typedef struct ESS_cert_id_v2 {
-        X509_ALGOR *hash_alg;   /* Default SHA-256. */
-        ASN1_OCTET_STRING *hash;
-        ESS_ISSUER_SERIAL *issuer_serial;
-} ESS_CERT_ID_V2;
-
+typedef struct ESS_cert_id_v2 ESS_CERT_ID_V2;
 DECLARE_STACK_OF(ESS_CERT_ID_V2)
 
-/*
- * SigningCertificateV2 ::=  SEQUENCE {
- *     certs        SEQUENCE OF ESSCertIDv2,
- *     policies     SEQUENCE OF PolicyInformation OPTIONAL }
- */
-
-typedef struct ESS_signing_cert_v2 {
-        STACK_OF(ESS_CERT_ID_V2) *cert_ids;
-        STACK_OF(POLICYINFO) *policy_info;
-} ESS_SIGNING_CERT_V2;
+typedef struct ESS_signing_cert_v2 ESS_SIGNING_CERT_V2;
 #endif /* LIBRESSL_INTERNAL */
 
 TS_REQ  *TS_REQ_new(void);
@@ -379,23 +357,6 @@ ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a,
                     const unsigned char **pp, long length);
 ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
 
-#ifdef LIBRESSL_INTERNAL
-ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new(void);
-void ESS_CERT_ID_V2_free(ESS_CERT_ID_V2 *a);
-int i2d_ESS_CERT_ID_V2(const ESS_CERT_ID_V2 *a, unsigned char **pp);
-ESS_CERT_ID_V2 *d2i_ESS_CERT_ID_V2(ESS_CERT_ID_V2 **a, const unsigned char **pp,
-    long length);
-ESS_CERT_ID_V2 *ESS_CERT_ID_V2_dup(ESS_CERT_ID_V2 *a);
-
-ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_new(void);
-void ESS_SIGNING_CERT_V2_free(ESS_SIGNING_CERT_V2 *a);
-int i2d_ESS_SIGNING_CERT_V2(const ESS_SIGNING_CERT_V2 *a,
-    unsigned char **pp);
-ESS_SIGNING_CERT_V2 *d2i_ESS_SIGNING_CERT_V2(ESS_SIGNING_CERT_V2 **a,
-    const unsigned char **pp, long length);
-ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_dup(ESS_SIGNING_CERT_V2 *a);
-#endif /* LIBRESSL_INTERNAL */
-
 int TS_REQ_set_version(TS_REQ *a, long version);
 long TS_REQ_get_version(const TS_REQ *a);