From 18915677de720d33a4947675f69af6f933f47d54 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Fri, 23 Dec 2022 13:57:01 +0400
Subject: [PATCH] LibreSSL: opaque TS structs, 3.6.0 provides TS accessors

See LibreSSL 3.6.0 (October 5th, 2022) changelog:
https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.6.0-relnotes.txt

Courtesy of Theo Buehler < tb AT openbsd DOT org>, who provided these
fixes as local ports patches;  I merely upstream them.
---
 src/crypto/TS.cpp         | 17 -----------------
 src/crypto/X509Crypto.cpp |  2 --
 2 files changed, 19 deletions(-)

diff --git a/src/crypto/TS.cpp b/src/crypto/TS.cpp
index d4d03fe58..38168a3de 100644
--- a/src/crypto/TS.cpp
+++ b/src/crypto/TS.cpp
@@ -53,23 +53,6 @@ void *OPENSSL_memdup(const void *data, size_t size)
 
 	return memcpy(copy, data, size);
 }
-
-static void TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int f)
-{
-    ctx->flags = unsigned(f);
-}
-
-static void TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx, unsigned char *hexstr, long len)
-{
-    OPENSSL_free(ctx->imprint);
-    ctx->imprint = hexstr;
-    ctx->imprint_len = unsigned(len);
-}
-
-static void TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s)
-{
-    ctx->store = s;
-}
 #endif
 
 TS::TS(const string &url, const Digest &digest, const string &useragent)
diff --git a/src/crypto/X509Crypto.cpp b/src/crypto/X509Crypto.cpp
index daa53eb43..de2515e06 100644
--- a/src/crypto/X509Crypto.cpp
+++ b/src/crypto/X509Crypto.cpp
@@ -37,7 +37,6 @@
 using namespace digidoc;
 using namespace std;
 
-#ifndef LIBRESSL_VERSION_NUMBER
 /*-
  * IssuerSerial ::= SEQUENCE {
  *         issuer                   GeneralNames,
@@ -48,7 +47,6 @@ using ESS_ISSUER_SERIAL = struct ESS_issuer_serial {
     GENERAL_NAMES *issuer;
     ASN1_INTEGER *serial;
 };
-#endif
 
 /**
  * Initialize RSA crypter.