From 8be50d4c4a9ed8cbc1c2ad2f3f309e28692c20cc Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 14 Jan 2022 08:59:30 +0000 Subject: [PATCH] Expose Certificate Transparency symbols in headers ok inoguchi jsing --- lib/libcrypto/opensslfeatures.h | 4 +--- lib/libcrypto/ossl_typ.h | 4 +--- lib/libcrypto/stack/safestack.h | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/libcrypto/opensslfeatures.h b/lib/libcrypto/opensslfeatures.h index fa23bcc715a..418f84370e3 100644 --- a/lib/libcrypto/opensslfeatures.h +++ b/lib/libcrypto/opensslfeatures.h @@ -40,9 +40,7 @@ #define OPENSSL_NO_COMP /* XXX */ /* #define OPENSSL_NO_CRYPTO_MDEBUG */ /* #define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE */ -#ifndef LIBRESSL_CRYPTO_INTERNAL -#define OPENSSL_NO_CT /* XXX until we expose it */ -#endif +/* #define OPENSSL_NO_CT */ /* #define OPENSSL_NO_DECC_INIT */ /* #define OPENSSL_NO_DES */ /* #define OPENSSL_NO_DEVCRYPTOENG */ diff --git a/lib/libcrypto/ossl_typ.h b/lib/libcrypto/ossl_typ.h index 4f94c4032e1..d8e2d92ae40 100644 --- a/lib/libcrypto/ossl_typ.h +++ b/lib/libcrypto/ossl_typ.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ossl_typ.h,v 1.20 2022/01/14 08:34:39 tb Exp $ */ +/* $OpenBSD: ossl_typ.h,v 1.21 2022/01/14 08:59:30 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. * @@ -187,12 +187,10 @@ typedef struct ocsp_req_ctx_st OCSP_REQ_CTX; typedef struct ocsp_response_st OCSP_RESPONSE; typedef struct ocsp_responder_id_st OCSP_RESPID; -#ifdef LIBRESSL_CRYPTO_INTERNAL typedef struct sct_st SCT; typedef struct sct_ctx_st SCT_CTX; typedef struct ctlog_st CTLOG; typedef struct ctlog_store_st CTLOG_STORE; typedef struct ct_policy_eval_ctx_st CT_POLICY_EVAL_CTX; -#endif #endif /* def HEADER_OPENSSL_TYPES_H */ diff --git a/lib/libcrypto/stack/safestack.h b/lib/libcrypto/stack/safestack.h index 1c6d633ed59..e1e7e2487be 100644 --- a/lib/libcrypto/stack/safestack.h +++ b/lib/libcrypto/stack/safestack.h @@ -1,4 +1,4 @@ -/* $OpenBSD: safestack.h,v 1.20 2021/12/19 14:33:53 jsing Exp $ */ +/* $OpenBSD: safestack.h,v 1.21 2022/01/14 08:59:30 tb Exp $ */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -663,7 +663,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st)) #define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st)) -#ifdef LIBRESSL_CRYPTO_INTERNAL #define sk_CTLOG_new(cmp) SKM_sk_new(CTLOG, (cmp)) #define sk_CTLOG_new_null() SKM_sk_new_null(CTLOG) #define sk_CTLOG_free(st) SKM_sk_free(CTLOG, (st)) @@ -685,7 +684,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_CTLOG_pop(st) SKM_sk_pop(CTLOG, (st)) #define sk_CTLOG_sort(st) SKM_sk_sort(CTLOG, (st)) #define sk_CTLOG_is_sorted(st) SKM_sk_is_sorted(CTLOG, (st)) -#endif #define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp)) #define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT) @@ -1303,7 +1301,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st)) #define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st)) -#ifdef LIBRESSL_CRYPTO_INTERNAL #define sk_SCT_new(cmp) SKM_sk_new(SCT, (cmp)) #define sk_SCT_new_null() SKM_sk_new_null(SCT) #define sk_SCT_free(st) SKM_sk_free(SCT, (st)) @@ -1325,7 +1322,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define sk_SCT_pop(st) SKM_sk_pop(SCT, (st)) #define sk_SCT_sort(st) SKM_sk_sort(SCT, (st)) #define sk_SCT_is_sorted(st) SKM_sk_is_sorted(SCT, (st)) -#endif #define sk_SRTP_PROTECTION_PROFILE_new(cmp) SKM_sk_new(SRTP_PROTECTION_PROFILE, (cmp)) #define sk_SRTP_PROTECTION_PROFILE_new_null() SKM_sk_new_null(SRTP_PROTECTION_PROFILE) -- 2.20.1