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/dh/dh_ameth.c | 4 ++-- src/lib/libcrypto/dh/dh_check.c | 3 +-- src/lib/libcrypto/dh/dh_gen.c | 4 ++-- src/lib/libcrypto/dh/dh_key.c | 4 ++-- src/lib/libcrypto/dh/dh_lib.c | 4 ++-- src/lib/libcrypto/dh/dh_pmeth.c | 4 ++-- 6 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src/lib/libcrypto/dh') diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c index 289307bfd6..ec59245b9c 100644 --- a/src/lib/libcrypto/dh/dh_ameth.c +++ b/src/lib/libcrypto/dh/dh_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_ameth.c,v 1.42 2025/01/17 05:04:25 tb Exp $ */ +/* $OpenBSD: dh_ameth.c,v 1.43 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -61,12 +61,12 @@ #include #include #include -#include #include #include "asn1_local.h" #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" #include "evp_local.h" static void diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c index a880f9fca1..1ba85bc824 100644 --- a/src/lib/libcrypto/dh/dh_check.c +++ b/src/lib/libcrypto/dh/dh_check.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_check.c,v 1.30 2024/11/29 15:59:57 tb Exp $ */ +/* $OpenBSD: dh_check.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,7 +60,6 @@ #include #include -#include #include "bn_local.h" #include "dh_local.h" diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c index 3ffa5d80f1..f28f75909c 100644 --- a/src/lib/libcrypto/dh/dh_gen.c +++ b/src/lib/libcrypto/dh/dh_gen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_gen.c,v 1.21 2023/07/08 15:29:03 beck Exp $ */ +/* $OpenBSD: dh_gen.c,v 1.22 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,10 +60,10 @@ #include #include -#include #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb); diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c index 93b04f398f..89a02c8309 100644 --- a/src/lib/libcrypto/dh/dh_key.c +++ b/src/lib/libcrypto/dh/dh_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_key.c,v 1.42 2024/05/09 20:43:36 tb Exp $ */ +/* $OpenBSD: dh_key.c,v 1.43 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,10 +60,10 @@ #include #include -#include #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" static int generate_key(DH *dh) diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c index 803aca6421..db76244550 100644 --- a/src/lib/libcrypto/dh/dh_lib.c +++ b/src/lib/libcrypto/dh/dh_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_lib.c,v 1.46 2024/11/29 15:59:57 tb Exp $ */ +/* $OpenBSD: dh_lib.c,v 1.47 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,9 +63,9 @@ #include #include -#include #include "dh_local.h" +#include "err_local.h" static const DH_METHOD *default_DH_method = NULL; diff --git a/src/lib/libcrypto/dh/dh_pmeth.c b/src/lib/libcrypto/dh/dh_pmeth.c index 1e5327b11f..18517b0cde 100644 --- a/src/lib/libcrypto/dh/dh_pmeth.c +++ b/src/lib/libcrypto/dh/dh_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_pmeth.c,v 1.17 2024/08/26 22:00:47 op Exp $ */ +/* $OpenBSD: dh_pmeth.c,v 1.18 2025/05/10 05:54:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -64,12 +64,12 @@ #include #include #include -#include #include #include #include "bn_local.h" #include "dh_local.h" +#include "err_local.h" #include "evp_local.h" /* DH pkey context structure */ -- cgit v1.2.3-55-g6feb