From efc7e65fc69451c4b273e410b712263273af45ef Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 5 Mar 2023 13:12:53 +0000 Subject: [PATCH] openssl: make all config structs static These are per-app, so per-file. Most of them already are static, adjust the rest of them. --- usr.bin/openssl/ciphers.c | 4 ++-- usr.bin/openssl/dhparam.c | 4 ++-- usr.bin/openssl/errstr.c | 4 ++-- usr.bin/openssl/genpkey.c | 4 ++-- usr.bin/openssl/pkeyparam.c | 4 ++-- usr.bin/openssl/pkeyutl.c | 4 ++-- usr.bin/openssl/prime.c | 4 ++-- usr.bin/openssl/rand.c | 4 ++-- usr.bin/openssl/req.c | 4 ++-- usr.bin/openssl/rsautl.c | 4 ++-- usr.bin/openssl/s_time.c | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/usr.bin/openssl/ciphers.c b/usr.bin/openssl/ciphers.c index eb63a358907..73d9e63b6fd 100644 --- a/usr.bin/openssl/ciphers.c +++ b/usr.bin/openssl/ciphers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciphers.c,v 1.16 2022/11/11 17:07:38 joshua Exp $ */ +/* $OpenBSD: ciphers.c,v 1.17 2023/03/05 13:12:53 tb Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -24,7 +24,7 @@ #include "apps.h" #include "progs.h" -struct { +static struct { int usage; int use_supported; int verbose; diff --git a/usr.bin/openssl/dhparam.c b/usr.bin/openssl/dhparam.c index 8c4cc198c66..8a487cb918e 100644 --- a/usr.bin/openssl/dhparam.c +++ b/usr.bin/openssl/dhparam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhparam.c,v 1.15 2022/11/11 17:07:38 joshua Exp $ */ +/* $OpenBSD: dhparam.c,v 1.16 2023/03/05 13:12:53 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -131,7 +131,7 @@ #define DEFBITS 2048 -struct { +static struct { int C; int check; int dsaparam; diff --git a/usr.bin/openssl/errstr.c b/usr.bin/openssl/errstr.c index 4d7ba02def0..64f0141ba06 100644 --- a/usr.bin/openssl/errstr.c +++ b/usr.bin/openssl/errstr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: errstr.c,v 1.8 2022/11/11 17:07:39 joshua Exp $ */ +/* $OpenBSD: errstr.c,v 1.9 2023/03/05 13:12:53 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -68,7 +68,7 @@ #include #include -struct { +static struct { int stats; } errstr_config; diff --git a/usr.bin/openssl/genpkey.c b/usr.bin/openssl/genpkey.c index 61b24af3305..ce266f404c8 100644 --- a/usr.bin/openssl/genpkey.c +++ b/usr.bin/openssl/genpkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: genpkey.c,v 1.14 2022/11/11 17:07:39 joshua Exp $ */ +/* $OpenBSD: genpkey.c,v 1.15 2023/03/05 13:12:53 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006 */ @@ -68,7 +68,7 @@ static int init_keygen_file(BIO * err, EVP_PKEY_CTX **pctx, const char *file); static int genpkey_cb(EVP_PKEY_CTX * ctx); -struct { +static struct { const EVP_CIPHER *cipher; EVP_PKEY_CTX **ctx; int do_param; diff --git a/usr.bin/openssl/pkeyparam.c b/usr.bin/openssl/pkeyparam.c index 9c519e31a67..57b5ad80421 100644 --- a/usr.bin/openssl/pkeyparam.c +++ b/usr.bin/openssl/pkeyparam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkeyparam.c,v 1.15 2022/11/11 17:07:39 joshua Exp $ */ +/* $OpenBSD: pkeyparam.c,v 1.16 2023/03/05 13:12:53 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006 */ @@ -65,7 +65,7 @@ #include #include -struct { +static struct { int check; char *infile; int noout; diff --git a/usr.bin/openssl/pkeyutl.c b/usr.bin/openssl/pkeyutl.c index d92aa161fb6..8c0fd28b296 100644 --- a/usr.bin/openssl/pkeyutl.c +++ b/usr.bin/openssl/pkeyutl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkeyutl.c,v 1.17 2022/11/11 17:07:39 joshua Exp $ */ +/* $OpenBSD: pkeyutl.c,v 1.18 2023/03/05 13:12:53 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -68,7 +68,7 @@ #define KEY_PUBKEY 2 #define KEY_CERT 3 -struct { +static struct { int asn1parse; EVP_PKEY_CTX *ctx; int hexdump; diff --git a/usr.bin/openssl/prime.c b/usr.bin/openssl/prime.c index d42ac20f1c0..64b1953e338 100644 --- a/usr.bin/openssl/prime.c +++ b/usr.bin/openssl/prime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prime.c,v 1.15 2022/12/26 19:32:30 jmc Exp $ */ +/* $OpenBSD: prime.c,v 1.16 2023/03/05 13:12:53 tb Exp $ */ /* ==================================================================== * Copyright (c) 2004 The OpenSSL Project. All rights reserved. * @@ -56,7 +56,7 @@ #include #include -struct { +static struct { int bits; int checks; int generate; diff --git a/usr.bin/openssl/rand.c b/usr.bin/openssl/rand.c index 6e67cf28e71..6ae6a8d8ee3 100644 --- a/usr.bin/openssl/rand.c +++ b/usr.bin/openssl/rand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rand.c,v 1.15 2022/11/11 17:07:39 joshua Exp $ */ +/* $OpenBSD: rand.c,v 1.16 2023/03/05 13:12:53 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. * @@ -62,7 +62,7 @@ #include #include -struct { +static struct { int base64; int hex; char *outfile; diff --git a/usr.bin/openssl/req.c b/usr.bin/openssl/req.c index 1fa7e368b94..797cbfa7182 100644 --- a/usr.bin/openssl/req.c +++ b/usr.bin/openssl/req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: req.c,v 1.25 2023/03/04 06:25:42 tb Exp $ */ +/* $OpenBSD: req.c,v 1.26 2023/03/05 13:12:53 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -129,7 +129,7 @@ static int duplicated(LHASH_OF(OPENSSL_STRING) *addexts, char *kv); static CONF *req_conf = NULL; static CONF *addext_conf = NULL; -struct { +static struct { LHASH_OF(OPENSSL_STRING) *addexts; BIO *addext_bio; int batch; diff --git a/usr.bin/openssl/rsautl.c b/usr.bin/openssl/rsautl.c index c3af9156355..2916b2d9a07 100644 --- a/usr.bin/openssl/rsautl.c +++ b/usr.bin/openssl/rsautl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsautl.c,v 1.19 2022/11/11 17:07:39 joshua Exp $ */ +/* $OpenBSD: rsautl.c,v 1.20 2023/03/05 13:12:53 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -75,7 +75,7 @@ #define KEY_PUBKEY 2 #define KEY_CERT 3 -struct { +static struct { int asn1parse; int hexdump; char *infile; diff --git a/usr.bin/openssl/s_time.c b/usr.bin/openssl/s_time.c index 7e3cee84250..d6f012fd41b 100644 --- a/usr.bin/openssl/s_time.c +++ b/usr.bin/openssl/s_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_time.c,v 1.36 2022/11/11 17:07:39 joshua Exp $ */ +/* $OpenBSD: s_time.c,v 1.37 2023/03/05 13:12:53 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -98,7 +98,7 @@ static SSL_CTX *tm_ctx = NULL; static const SSL_METHOD *s_time_meth = NULL; static long bytes_read = 0; -struct { +static struct { int bugs; char *CAfile; char *CApath; -- 2.20.1