From 6ea9ba6b09ff9e35104226f2e1b9e2540f4afa4e Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 2 Jan 2025 12:36:21 +0000 Subject: openssl(1) doesn't need 5 .h files: merge timeouts.h into apps.h This is an extra header for two stupid constants... discussed with jsing --- src/usr.bin/openssl/apps.h | 6 +++- src/usr.bin/openssl/s_client.c | 3 +- src/usr.bin/openssl/s_server.c | 3 +- src/usr.bin/openssl/timeouts.h | 67 ------------------------------------------ 4 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 src/usr.bin/openssl/timeouts.h diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h index f5f654d6d2..f8d67ccacd 100644 --- a/src/usr.bin/openssl/apps.h +++ b/src/usr.bin/openssl/apps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.h,v 1.39 2025/01/02 12:31:44 tb Exp $ */ +/* $OpenBSD: apps.h,v 1.40 2025/01/02 12:36:21 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -128,6 +128,10 @@ #include +/* numbers in us */ +#define DGRAM_RCV_TIMEOUT 250000 +#define DGRAM_SND_TIMEOUT 250000 + extern CONF *config; extern char *default_config_file; extern BIO *bio_err; diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c index 299042c59a..45260ac875 100644 --- a/src/usr.bin/openssl/s_client.c +++ b/src/usr.bin/openssl/s_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_client.c,v 1.64 2023/12/29 12:15:49 tb Exp $ */ +/* $OpenBSD: s_client.c,v 1.65 2025/01/02 12:36:21 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -160,7 +160,6 @@ #include #include "s_apps.h" -#include "timeouts.h" /*#define SSL_HOST_NAME "www.netscape.com" */ /*#define SSL_HOST_NAME "193.118.187.102" */ diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c index 328ac28ab5..8984586ab5 100644 --- a/src/usr.bin/openssl/s_server.c +++ b/src/usr.bin/openssl/s_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_server.c,v 1.59 2023/12/29 12:15:49 tb Exp $ */ +/* $OpenBSD: s_server.c,v 1.60 2025/01/02 12:36:21 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -175,7 +175,6 @@ #include #include "s_apps.h" -#include "timeouts.h" static void s_server_init(void); static void sv_usage(void); diff --git a/src/usr.bin/openssl/timeouts.h b/src/usr.bin/openssl/timeouts.h deleted file mode 100644 index dd2f85028d..0000000000 --- a/src/usr.bin/openssl/timeouts.h +++ /dev/null @@ -1,67 +0,0 @@ -/* $OpenBSD: timeouts.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ -/* - * DTLS implementation written by Nagendra Modadugu - * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. - */ -/* ==================================================================== - * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@OpenSSL.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#ifndef INCLUDED_TIMEOUTS_H -#define INCLUDED_TIMEOUTS_H - -/* numbers in us */ -#define DGRAM_RCV_TIMEOUT 250000 -#define DGRAM_SND_TIMEOUT 250000 - -#endif /* ! INCLUDED_TIMEOUTS_H */ -- cgit v1.2.3-55-g6feb