diff options
| author | tb <> | 2022-01-14 08:59:30 +0000 |
|---|---|---|
| committer | tb <> | 2022-01-14 08:59:30 +0000 |
| commit | 6dfdca7f1bc2e7cc653989cd52e41ad471177a4f (patch) | |
| tree | 53bfd373edd17129f6965c5c60b2fe74bd6e962d | |
| parent | 146d5d6a018884a35292917be5886069dd2d04ef (diff) | |
| download | openbsd-6dfdca7f1bc2e7cc653989cd52e41ad471177a4f.tar.gz openbsd-6dfdca7f1bc2e7cc653989cd52e41ad471177a4f.tar.bz2 openbsd-6dfdca7f1bc2e7cc653989cd52e41ad471177a4f.zip | |
Expose Certificate Transparency symbols in headers
ok inoguchi jsing
| -rw-r--r-- | src/lib/libcrypto/opensslfeatures.h | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/ossl_typ.h | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/stack/safestack.h | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/lib/libcrypto/opensslfeatures.h b/src/lib/libcrypto/opensslfeatures.h index fa23bcc715..418f84370e 100644 --- a/src/lib/libcrypto/opensslfeatures.h +++ b/src/lib/libcrypto/opensslfeatures.h | |||
| @@ -40,9 +40,7 @@ | |||
| 40 | #define OPENSSL_NO_COMP /* XXX */ | 40 | #define OPENSSL_NO_COMP /* XXX */ |
| 41 | /* #define OPENSSL_NO_CRYPTO_MDEBUG */ | 41 | /* #define OPENSSL_NO_CRYPTO_MDEBUG */ |
| 42 | /* #define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE */ | 42 | /* #define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE */ |
| 43 | #ifndef LIBRESSL_CRYPTO_INTERNAL | 43 | /* #define OPENSSL_NO_CT */ |
| 44 | #define OPENSSL_NO_CT /* XXX until we expose it */ | ||
| 45 | #endif | ||
| 46 | /* #define OPENSSL_NO_DECC_INIT */ | 44 | /* #define OPENSSL_NO_DECC_INIT */ |
| 47 | /* #define OPENSSL_NO_DES */ | 45 | /* #define OPENSSL_NO_DES */ |
| 48 | /* #define OPENSSL_NO_DEVCRYPTOENG */ | 46 | /* #define OPENSSL_NO_DEVCRYPTOENG */ |
diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h index 4f94c4032e..d8e2d92ae4 100644 --- a/src/lib/libcrypto/ossl_typ.h +++ b/src/lib/libcrypto/ossl_typ.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ossl_typ.h,v 1.20 2022/01/14 08:34:39 tb Exp $ */ | 1 | /* $OpenBSD: ossl_typ.h,v 1.21 2022/01/14 08:59:30 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -187,12 +187,10 @@ typedef struct ocsp_req_ctx_st OCSP_REQ_CTX; | |||
| 187 | typedef struct ocsp_response_st OCSP_RESPONSE; | 187 | typedef struct ocsp_response_st OCSP_RESPONSE; |
| 188 | typedef struct ocsp_responder_id_st OCSP_RESPID; | 188 | typedef struct ocsp_responder_id_st OCSP_RESPID; |
| 189 | 189 | ||
| 190 | #ifdef LIBRESSL_CRYPTO_INTERNAL | ||
| 191 | typedef struct sct_st SCT; | 190 | typedef struct sct_st SCT; |
| 192 | typedef struct sct_ctx_st SCT_CTX; | 191 | typedef struct sct_ctx_st SCT_CTX; |
| 193 | typedef struct ctlog_st CTLOG; | 192 | typedef struct ctlog_st CTLOG; |
| 194 | typedef struct ctlog_store_st CTLOG_STORE; | 193 | typedef struct ctlog_store_st CTLOG_STORE; |
| 195 | typedef struct ct_policy_eval_ctx_st CT_POLICY_EVAL_CTX; | 194 | typedef struct ct_policy_eval_ctx_st CT_POLICY_EVAL_CTX; |
| 196 | #endif | ||
| 197 | 195 | ||
| 198 | #endif /* def HEADER_OPENSSL_TYPES_H */ | 196 | #endif /* def HEADER_OPENSSL_TYPES_H */ |
diff --git a/src/lib/libcrypto/stack/safestack.h b/src/lib/libcrypto/stack/safestack.h index 1c6d633ed5..e1e7e2487b 100644 --- a/src/lib/libcrypto/stack/safestack.h +++ b/src/lib/libcrypto/stack/safestack.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: safestack.h,v 1.20 2021/12/19 14:33:53 jsing Exp $ */ | 1 | /* $OpenBSD: safestack.h,v 1.21 2022/01/14 08:59:30 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -663,7 +663,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) | |||
| 663 | #define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st)) | 663 | #define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st)) |
| 664 | #define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st)) | 664 | #define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st)) |
| 665 | 665 | ||
| 666 | #ifdef LIBRESSL_CRYPTO_INTERNAL | ||
| 667 | #define sk_CTLOG_new(cmp) SKM_sk_new(CTLOG, (cmp)) | 666 | #define sk_CTLOG_new(cmp) SKM_sk_new(CTLOG, (cmp)) |
| 668 | #define sk_CTLOG_new_null() SKM_sk_new_null(CTLOG) | 667 | #define sk_CTLOG_new_null() SKM_sk_new_null(CTLOG) |
| 669 | #define sk_CTLOG_free(st) SKM_sk_free(CTLOG, (st)) | 668 | #define sk_CTLOG_free(st) SKM_sk_free(CTLOG, (st)) |
| @@ -685,7 +684,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) | |||
| 685 | #define sk_CTLOG_pop(st) SKM_sk_pop(CTLOG, (st)) | 684 | #define sk_CTLOG_pop(st) SKM_sk_pop(CTLOG, (st)) |
| 686 | #define sk_CTLOG_sort(st) SKM_sk_sort(CTLOG, (st)) | 685 | #define sk_CTLOG_sort(st) SKM_sk_sort(CTLOG, (st)) |
| 687 | #define sk_CTLOG_is_sorted(st) SKM_sk_is_sorted(CTLOG, (st)) | 686 | #define sk_CTLOG_is_sorted(st) SKM_sk_is_sorted(CTLOG, (st)) |
| 688 | #endif | ||
| 689 | 687 | ||
| 690 | #define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp)) | 688 | #define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp)) |
| 691 | #define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT) | 689 | #define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT) |
| @@ -1303,7 +1301,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) | |||
| 1303 | #define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st)) | 1301 | #define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st)) |
| 1304 | #define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st)) | 1302 | #define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st)) |
| 1305 | 1303 | ||
| 1306 | #ifdef LIBRESSL_CRYPTO_INTERNAL | ||
| 1307 | #define sk_SCT_new(cmp) SKM_sk_new(SCT, (cmp)) | 1304 | #define sk_SCT_new(cmp) SKM_sk_new(SCT, (cmp)) |
| 1308 | #define sk_SCT_new_null() SKM_sk_new_null(SCT) | 1305 | #define sk_SCT_new_null() SKM_sk_new_null(SCT) |
| 1309 | #define sk_SCT_free(st) SKM_sk_free(SCT, (st)) | 1306 | #define sk_SCT_free(st) SKM_sk_free(SCT, (st)) |
| @@ -1325,7 +1322,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) | |||
| 1325 | #define sk_SCT_pop(st) SKM_sk_pop(SCT, (st)) | 1322 | #define sk_SCT_pop(st) SKM_sk_pop(SCT, (st)) |
| 1326 | #define sk_SCT_sort(st) SKM_sk_sort(SCT, (st)) | 1323 | #define sk_SCT_sort(st) SKM_sk_sort(SCT, (st)) |
| 1327 | #define sk_SCT_is_sorted(st) SKM_sk_is_sorted(SCT, (st)) | 1324 | #define sk_SCT_is_sorted(st) SKM_sk_is_sorted(SCT, (st)) |
| 1328 | #endif | ||
| 1329 | 1325 | ||
| 1330 | #define sk_SRTP_PROTECTION_PROFILE_new(cmp) SKM_sk_new(SRTP_PROTECTION_PROFILE, (cmp)) | 1326 | #define sk_SRTP_PROTECTION_PROFILE_new(cmp) SKM_sk_new(SRTP_PROTECTION_PROFILE, (cmp)) |
| 1331 | #define sk_SRTP_PROTECTION_PROFILE_new_null() SKM_sk_new_null(SRTP_PROTECTION_PROFILE) | 1327 | #define sk_SRTP_PROTECTION_PROFILE_new_null() SKM_sk_new_null(SRTP_PROTECTION_PROFILE) |