From dcbbedc9acedb9203cec6f635f57b433f541d560 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 10 May 2025 05:54:39 +0000 Subject: Use err_local.h rather than err.h in most places ok jsing --- src/lib/libcrypto/ct/ct_b64.c | 4 ++-- src/lib/libcrypto/ct/ct_log.c | 4 ++-- src/lib/libcrypto/ct/ct_oct.c | 4 ++-- src/lib/libcrypto/ct/ct_policy.c | 7 ++++--- src/lib/libcrypto/ct/ct_sct.c | 4 ++-- src/lib/libcrypto/ct/ct_sct_ctx.c | 4 ++-- src/lib/libcrypto/ct/ct_vfy.c | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) (limited to 'src/lib/libcrypto/ct') diff --git a/src/lib/libcrypto/ct/ct_b64.c b/src/lib/libcrypto/ct/ct_b64.c index 101cd1e2b1..e6e0532add 100644 --- a/src/lib/libcrypto/ct/ct_b64.c +++ b/src/lib/libcrypto/ct/ct_b64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_b64.c,v 1.7 2023/07/08 07:22:58 beck Exp $ */ +/* $OpenBSD: ct_b64.c,v 1.8 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -61,11 +61,11 @@ #include #include -#include #include #include "bytestring.h" #include "ct_local.h" +#include "err_local.h" /* * Decodes the base64 string |in| into |out|. diff --git a/src/lib/libcrypto/ct/ct_log.c b/src/lib/libcrypto/ct/ct_log.c index 72045477ac..48611df979 100644 --- a/src/lib/libcrypto/ct/ct_log.c +++ b/src/lib/libcrypto/ct/ct_log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_log.c,v 1.9 2024/11/05 09:35:40 tb Exp $ */ +/* $OpenBSD: ct_log.c,v 1.10 2025/05/10 05:54:38 tb Exp $ */ /* Author: Adam Eijdenberg . */ /* ==================================================================== * Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved. @@ -65,13 +65,13 @@ #include #include #include -#include #include #include #include #include "conf_local.h" #include "crypto_local.h" +#include "err_local.h" /* diff --git a/src/lib/libcrypto/ct/ct_oct.c b/src/lib/libcrypto/ct/ct_oct.c index 1f5e5c75d0..686d845f11 100644 --- a/src/lib/libcrypto/ct/ct_oct.c +++ b/src/lib/libcrypto/ct/ct_oct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_oct.c,v 1.9 2023/07/08 07:22:58 beck Exp $ */ +/* $OpenBSD: ct_oct.c,v 1.10 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -67,10 +67,10 @@ #include #include #include -#include #include "bytestring.h" #include "ct_local.h" +#include "err_local.h" int o2i_SCT_signature(SCT *sct, CBS *cbs) diff --git a/src/lib/libcrypto/ct/ct_policy.c b/src/lib/libcrypto/ct/ct_policy.c index eb2b312019..a242b0d8f8 100644 --- a/src/lib/libcrypto/ct/ct_policy.c +++ b/src/lib/libcrypto/ct/ct_policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_policy.c,v 1.6 2023/07/08 07:22:58 beck Exp $ */ +/* $OpenBSD: ct_policy.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* * Implementations of Certificate Transparency SCT policies. * Written by Rob Percival (robpercival@google.com) for the OpenSSL project. @@ -56,11 +56,12 @@ # error "CT is disabled" #endif -#include -#include #include +#include + #include "ct_local.h" +#include "err_local.h" /* * Number of seconds in the future that an SCT timestamp can be, by default, diff --git a/src/lib/libcrypto/ct/ct_sct.c b/src/lib/libcrypto/ct/ct_sct.c index 4b2716e734..d647e34d92 100644 --- a/src/lib/libcrypto/ct/ct_sct.c +++ b/src/lib/libcrypto/ct/ct_sct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_sct.c,v 1.10 2023/07/22 17:02:49 tb Exp $ */ +/* $OpenBSD: ct_sct.c,v 1.11 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com), Stephen Henson (steve@openssl.org) * and Adam Eijdenberg (adam.eijdenberg@gmail.com) for the OpenSSL project 2016. @@ -67,11 +67,11 @@ #include #include -#include #include #include #include "ct_local.h" +#include "err_local.h" SCT * SCT_new(void) diff --git a/src/lib/libcrypto/ct/ct_sct_ctx.c b/src/lib/libcrypto/ct/ct_sct_ctx.c index b2b6d4e269..930c7df59b 100644 --- a/src/lib/libcrypto/ct/ct_sct_ctx.c +++ b/src/lib/libcrypto/ct/ct_sct_ctx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_sct_ctx.c,v 1.6 2022/06/30 11:14:47 tb Exp $ */ +/* $OpenBSD: ct_sct_ctx.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -64,11 +64,11 @@ #include #include -#include #include #include #include "ct_local.h" +#include "err_local.h" SCT_CTX * SCT_CTX_new(void) diff --git a/src/lib/libcrypto/ct/ct_vfy.c b/src/lib/libcrypto/ct/ct_vfy.c index 424117263a..5dbb2096e1 100644 --- a/src/lib/libcrypto/ct/ct_vfy.c +++ b/src/lib/libcrypto/ct/ct_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct_vfy.c,v 1.6 2022/01/06 14:34:40 jsing Exp $ */ +/* $OpenBSD: ct_vfy.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ /* * Written by Rob Stradling (rob@comodo.com) and Stephen Henson * (steve@openssl.org) for the OpenSSL project 2014. @@ -60,11 +60,11 @@ #include #include -#include #include #include #include "ct_local.h" +#include "err_local.h" typedef enum sct_signature_type_t { SIGNATURE_TYPE_NOT_SET = -1, -- cgit v1.2.3-55-g6feb