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/bio/b_dump.c | 3 +-- src/lib/libcrypto/bio/b_sock.c | 5 +++-- src/lib/libcrypto/bio/bf_buff.c | 4 ++-- src/lib/libcrypto/bio/bio_cb.c | 3 +-- src/lib/libcrypto/bio/bio_lib.c | 4 ++-- src/lib/libcrypto/bio/bss_acpt.c | 4 ++-- src/lib/libcrypto/bio/bss_bio.c | 4 ++-- src/lib/libcrypto/bio/bss_conn.c | 4 ++-- src/lib/libcrypto/bio/bss_file.c | 4 ++-- src/lib/libcrypto/bio/bss_mem.c | 4 ++-- 10 files changed, 19 insertions(+), 20 deletions(-) (limited to 'src/lib/libcrypto/bio') diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c index 4dcf710bbe..3f673205c1 100644 --- a/src/lib/libcrypto/bio/b_dump.c +++ b/src/lib/libcrypto/bio/b_dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_dump.c,v 1.30 2024/03/02 09:21:24 tb Exp $ */ +/* $OpenBSD: b_dump.c,v 1.31 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,7 +62,6 @@ #include #include -#include #include "bytestring.h" diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 00bbe9c37e..9ef9953b95 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_sock.c,v 1.71 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: b_sock.c,v 1.72 2025/05/10 05:54:38 tb Exp $ */ /* * Copyright (c) 2017 Bob Beck * @@ -32,7 +32,8 @@ #include #include -#include + +#include "err_local.h" int BIO_get_host_ip(const char *str, unsigned char *ip) diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c index 226c16835a..36b6fabde3 100644 --- a/src/lib/libcrypto/bio/bf_buff.c +++ b/src/lib/libcrypto/bio/bf_buff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bf_buff.c,v 1.28 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bf_buff.c,v 1.29 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,9 +61,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" static int buffer_write(BIO *h, const char *buf, int num); static int buffer_read(BIO *h, char *buf, int size); diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c index 18e9be8d68..990cb20708 100644 --- a/src/lib/libcrypto/bio/bio_cb.c +++ b/src/lib/libcrypto/bio/bio_cb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_cb.c,v 1.19 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bio_cb.c,v 1.20 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 #include "bio_local.h" diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c index 463d2ad23a..04e8f4c295 100644 --- a/src/lib/libcrypto/bio/bio_lib.c +++ b/src/lib/libcrypto/bio/bio_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_lib.c,v 1.54 2024/07/09 06:14:59 beck Exp $ */ +/* $OpenBSD: bio_lib.c,v 1.55 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,10 +62,10 @@ #include #include -#include #include #include "bio_local.h" +#include "err_local.h" /* * Helper function to work out whether to call the new style callback or the old diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index d74c710a7f..73d147f4c1 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_acpt.c,v 1.31 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bss_acpt.c,v 1.32 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,9 +65,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" #define SOCKET_PROTOCOL IPPROTO_TCP diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c index 39d8d1e46c..f1d1bbeecd 100644 --- a/src/lib/libcrypto/bio/bss_bio.c +++ b/src/lib/libcrypto/bio/bss_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_bio.c,v 1.29 2024/07/09 06:14:59 beck Exp $ */ +/* $OpenBSD: bss_bio.c,v 1.30 2025/05/10 05:54:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. * @@ -81,10 +81,10 @@ #include #include -#include #include #include "bio_local.h" +#include "err_local.h" static int bio_new(BIO *bio); static int bio_free(BIO *bio); diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 3b0e3d3bdd..24dad82f5f 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_conn.c,v 1.41 2024/04/19 09:54:36 tb Exp $ */ +/* $OpenBSD: bss_conn.c,v 1.42 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -68,9 +68,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" #define SOCKET_PROTOCOL IPPROTO_TCP diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c index 9b6ca2bdd8..21f71718bb 100644 --- a/src/lib/libcrypto/bio/bss_file.c +++ b/src/lib/libcrypto/bio/bss_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_file.c,v 1.35 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bss_file.c,v 1.36 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -88,9 +88,9 @@ #include #include -#include #include "bio_local.h" +#include "err_local.h" static int file_write(BIO *h, const char *buf, int num); static int file_read(BIO *h, char *buf, int size); diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c index 6d0d54db84..3e4c1e2e3f 100644 --- a/src/lib/libcrypto/bio/bss_mem.c +++ b/src/lib/libcrypto/bio/bss_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_mem.c,v 1.22 2023/07/05 21:23:37 beck Exp $ */ +/* $OpenBSD: bss_mem.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,10 +62,10 @@ #include #include -#include #include #include "bio_local.h" +#include "err_local.h" struct bio_mem { BUF_MEM *buf; -- cgit v1.2.3-55-g6feb