diff options
34 files changed, 71 insertions, 71 deletions
diff --git a/usr.bin/openssl/apps.c b/usr.bin/openssl/apps.c index 39ce7a5f342..c9a2f34b253 100644 --- a/usr.bin/openssl/apps.c +++ b/usr.bin/openssl/apps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.c,v 1.53 2019/07/03 03:24:02 deraadt Exp $ */ +/* $OpenBSD: apps.c,v 1.54 2019/07/14 03:30:45 guenther Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -2122,7 +2122,7 @@ app_isdir(const char *name) #define OPTION_WIDTH 18 void -options_usage(struct option *opts) +options_usage(const struct option *opts) { const char *p, *q; char optstr[32]; @@ -2149,11 +2149,11 @@ options_usage(struct option *opts) } int -options_parse(int argc, char **argv, struct option *opts, char **unnamed, +options_parse(int argc, char **argv, const struct option *opts, char **unnamed, int *argsused) { const char *errstr; - struct option *opt; + const struct option *opt; long long val; char *arg, *p; int fmt, used; diff --git a/usr.bin/openssl/apps.h b/usr.bin/openssl/apps.h index bb2340a545c..48e5ba3adb9 100644 --- a/usr.bin/openssl/apps.h +++ b/usr.bin/openssl/apps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.h,v 1.22 2019/02/09 06:27:37 inoguchi Exp $ */ +/* $OpenBSD: apps.h,v 1.23 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -317,9 +317,9 @@ struct option { const int value; }; -void options_usage(struct option *opts); -int options_parse(int argc, char **argv, struct option *opts, char **unnamed, - int *argsused); +void options_usage(const struct option *opts); +int options_parse(int argc, char **argv, const struct option *opts, + char **unnamed, int *argsused); void show_cipher(const OBJ_NAME *name, void *arg); diff --git a/usr.bin/openssl/asn1pars.c b/usr.bin/openssl/asn1pars.c index a17584e8a32..18f8a48c29b 100644 --- a/usr.bin/openssl/asn1pars.c +++ b/usr.bin/openssl/asn1pars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1pars.c,v 1.9 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: asn1pars.c,v 1.10 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -126,7 +126,7 @@ asn1pars_opt_strparse(char *arg) return (0); } -static struct option asn1pars_options[] = { +static const struct option asn1pars_options[] = { { .name = "dump", .desc = "Dump unknown data in hex form", diff --git a/usr.bin/openssl/certhash.c b/usr.bin/openssl/certhash.c index 5838f0209b2..51253804132 100644 --- a/usr.bin/openssl/certhash.c +++ b/usr.bin/openssl/certhash.c @@ -37,7 +37,7 @@ static struct { int verbose; } certhash_config; -struct option certhash_options[] = { +static const struct option certhash_options[] = { { .name = "n", .desc = "Perform a dry-run - do not make any changes", diff --git a/usr.bin/openssl/ciphers.c b/usr.bin/openssl/ciphers.c index 2b8ad5ba85a..a20f19c3afd 100644 --- a/usr.bin/openssl/ciphers.c +++ b/usr.bin/openssl/ciphers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciphers.c,v 1.9 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: ciphers.c,v 1.10 2019/07/14 03:30:45 guenther Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -29,7 +29,7 @@ struct { int verbose; } ciphers_config; -struct option ciphers_options[] = { +static const struct option ciphers_options[] = { { .name = "h", .type = OPTION_FLAG, diff --git a/usr.bin/openssl/crl.c b/usr.bin/openssl/crl.c index cb1c18fa409..fc189f4c3fa 100644 --- a/usr.bin/openssl/crl.c +++ b/usr.bin/openssl/crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crl.c,v 1.12 2019/01/19 21:17:05 jsg Exp $ */ +/* $OpenBSD: crl.c,v 1.13 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -88,7 +88,7 @@ static struct { int verify; } crl_config; -static struct option crl_options[] = { +static const struct option crl_options[] = { { .name = "CAfile", .argname = "file", diff --git a/usr.bin/openssl/crl2p7.c b/usr.bin/openssl/crl2p7.c index a9c48a3da0e..8e5bf6a4366 100644 --- a/usr.bin/openssl/crl2p7.c +++ b/usr.bin/openssl/crl2p7.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crl2p7.c,v 1.8 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: crl2p7.c,v 1.9 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -102,7 +102,7 @@ crl2p7_opt_certfile(char *arg) return (0); } -static struct option crl2p7_options[] = { +static const struct option crl2p7_options[] = { { .name = "certfile", .argname = "file", diff --git a/usr.bin/openssl/dh.c b/usr.bin/openssl/dh.c index 827ca9c7eac..9557d15a3f4 100644 --- a/usr.bin/openssl/dh.c +++ b/usr.bin/openssl/dh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: dh.c,v 1.12 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -85,7 +85,7 @@ static struct { int text; } dh_config; -static struct option dh_options[] = { +static const struct option dh_options[] = { { .name = "C", .desc = "Convert DH parameters into C code", diff --git a/usr.bin/openssl/dhparam.c b/usr.bin/openssl/dhparam.c index f27a5c9e819..b0dd5109495 100644 --- a/usr.bin/openssl/dhparam.c +++ b/usr.bin/openssl/dhparam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhparam.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: dhparam.c,v 1.12 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -144,7 +144,7 @@ struct { int text; } dhparam_config; -struct option dhparam_options[] = { +static const struct option dhparam_options[] = { { .name = "2", .desc = "Generate DH parameters with a generator value of 2 " diff --git a/usr.bin/openssl/dsa.c b/usr.bin/openssl/dsa.c index 494d49712ee..1b5e302bd5c 100644 --- a/usr.bin/openssl/dsa.c +++ b/usr.bin/openssl/dsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa.c,v 1.14 2019/07/10 10:28:28 inoguchi Exp $ */ +/* $OpenBSD: dsa.c,v 1.15 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -105,7 +105,7 @@ dsa_opt_enc(int argc, char **argv, int *argsused) return (1); } -static struct option dsa_options[] = { +static const struct option dsa_options[] = { { .name = "in", .argname = "file", diff --git a/usr.bin/openssl/dsaparam.c b/usr.bin/openssl/dsaparam.c index 8b189cf559b..3c2ac898001 100644 --- a/usr.bin/openssl/dsaparam.c +++ b/usr.bin/openssl/dsaparam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsaparam.c,v 1.10 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: dsaparam.c,v 1.11 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -90,7 +90,7 @@ static struct { int text; } dsaparam_config; -static struct option dsaparam_options[] = { +static const struct option dsaparam_options[] = { { .name = "C", .desc = "Convert DSA parameters into C code", diff --git a/usr.bin/openssl/ec.c b/usr.bin/openssl/ec.c index f9056154ed8..3aa9b0c2c55 100644 --- a/usr.bin/openssl/ec.c +++ b/usr.bin/openssl/ec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec.c,v 1.13 2019/02/09 15:49:21 inoguchi Exp $ */ +/* $OpenBSD: ec.c,v 1.14 2019/07/14 03:30:45 guenther Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -140,7 +140,7 @@ ec_opt_named(char *arg) return (0); } -static struct option ec_options[] = { +static const struct option ec_options[] = { { .name = "conv_form", .argname = "form", diff --git a/usr.bin/openssl/ecparam.c b/usr.bin/openssl/ecparam.c index b1e52fadaff..7bacd37ec51 100644 --- a/usr.bin/openssl/ecparam.c +++ b/usr.bin/openssl/ecparam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecparam.c,v 1.17 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: ecparam.c,v 1.18 2019/07/14 03:30:45 guenther Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -139,7 +139,7 @@ ecparam_opt_enctype(char *arg) return (0); } -struct option ecparam_options[] = { +static const struct option ecparam_options[] = { { .name = "C", .desc = "Convert the EC parameters into C code", diff --git a/usr.bin/openssl/enc.c b/usr.bin/openssl/enc.c index 4de92bd6361..8518ff4c9da 100644 --- a/usr.bin/openssl/enc.c +++ b/usr.bin/openssl/enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc.c,v 1.20 2019/04/01 16:06:54 jsing Exp $ */ +/* $OpenBSD: enc.c,v 1.21 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -124,7 +124,7 @@ enc_opt_cipher(int argc, char **argv, int *argsused) return (1); } -static struct option enc_options[] = { +static const struct option enc_options[] = { { .name = "A", .desc = "Process base64 data on one line (requires -a)", diff --git a/usr.bin/openssl/errstr.c b/usr.bin/openssl/errstr.c index 0d31d4fc85a..bb6bfc785f8 100644 --- a/usr.bin/openssl/errstr.c +++ b/usr.bin/openssl/errstr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: errstr.c,v 1.6 2015/10/17 15:00:11 doug Exp $ */ +/* $OpenBSD: errstr.c,v 1.7 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -72,7 +72,7 @@ struct { int stats; } errstr_config; -struct option errstr_options[] = { +static const struct option errstr_options[] = { { .name = "stats", .desc = "Print debugging statistics for the hash table", diff --git a/usr.bin/openssl/gendh.c b/usr.bin/openssl/gendh.c index 18ff504e446..facc9248f3a 100644 --- a/usr.bin/openssl/gendh.c +++ b/usr.bin/openssl/gendh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gendh.c,v 1.10 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: gendh.c,v 1.11 2019/07/14 03:30:45 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -91,7 +91,7 @@ static struct { char *outfile; } gendh_config; -static struct option gendh_options[] = { +static const struct option gendh_options[] = { { .name = "2", .desc = "Generate DH parameters with a generator value of 2 " diff --git a/usr.bin/openssl/gendsa.c b/usr.bin/openssl/gendsa.c index f2e155128c4..4eb0b1f44d0 100644 --- a/usr.bin/openssl/gendsa.c +++ b/usr.bin/openssl/gendsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gendsa.c,v 1.11 2019/06/07 02:32:22 inoguchi Exp $ */ +/* $OpenBSD: gendsa.c,v 1.12 2019/07/14 03:30:46 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -83,7 +83,7 @@ static struct { char *passargout; } gendsa_config; -static struct option gendsa_options[] = { +static const struct option gendsa_options[] = { #ifndef OPENSSL_NO_AES { .name = "aes128", diff --git a/usr.bin/openssl/genpkey.c b/usr.bin/openssl/genpkey.c index ef16a5e0dab..e2b46b77961 100644 --- a/usr.bin/openssl/genpkey.c +++ b/usr.bin/openssl/genpkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: genpkey.c,v 1.12 2018/02/08 11:17:44 jsing Exp $ */ +/* $OpenBSD: genpkey.c,v 1.13 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006 */ @@ -141,7 +141,7 @@ genpkey_opt_pkeyopt(char *arg) return (0); } -struct option genpkey_options[] = { +static const struct option genpkey_options[] = { { .name = "algorithm", .argname = "name", diff --git a/usr.bin/openssl/genrsa.c b/usr.bin/openssl/genrsa.c index 63d3de42188..d7cd6b05289 100644 --- a/usr.bin/openssl/genrsa.c +++ b/usr.bin/openssl/genrsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: genrsa.c,v 1.14 2019/07/09 11:02:52 inoguchi Exp $ */ +/* $OpenBSD: genrsa.c,v 1.15 2019/07/14 03:30:46 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -157,7 +157,7 @@ set_enc(int argc, char **argv, int *argsused) return (0); } -static struct option genrsa_options[] = { +static const struct option genrsa_options[] = { { .name = "3", .desc = "Use 3 for the E value", diff --git a/usr.bin/openssl/nseq.c b/usr.bin/openssl/nseq.c index d50bace12fb..516bde34d21 100644 --- a/usr.bin/openssl/nseq.c +++ b/usr.bin/openssl/nseq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nseq.c,v 1.8 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: nseq.c,v 1.9 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -70,7 +70,7 @@ static struct { int toseq; } nseq_config; -static struct option nseq_options[] = { +static const struct option nseq_options[] = { { .name = "in", .argname = "file", diff --git a/usr.bin/openssl/passwd.c b/usr.bin/openssl/passwd.c index 428f75a7ca6..4033b553723 100644 --- a/usr.bin/openssl/passwd.c +++ b/usr.bin/openssl/passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: passwd.c,v 1.9 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: passwd.c,v 1.10 2019/07/14 03:30:46 guenther Exp $ */ #if defined OPENSSL_NO_MD5 #define NO_MD5CRYPT_1 @@ -53,7 +53,7 @@ static struct { int usecrypt; } passwd_config; -static struct option passwd_options[] = { +static const struct option passwd_options[] = { #ifndef NO_MD5CRYPT_1 { .name = "1", diff --git a/usr.bin/openssl/pkcs7.c b/usr.bin/openssl/pkcs7.c index f1edc9e4897..4c184911c94 100644 --- a/usr.bin/openssl/pkcs7.c +++ b/usr.bin/openssl/pkcs7.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs7.c,v 1.10 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: pkcs7.c,v 1.11 2019/07/14 03:30:46 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -81,7 +81,7 @@ static struct { int text; } pkcs7_config; -static struct option pkcs7_options[] = { +static const struct option pkcs7_options[] = { { .name = "in", .argname = "file", diff --git a/usr.bin/openssl/pkcs8.c b/usr.bin/openssl/pkcs8.c index 7938bf8b09c..0629b20c37f 100644 --- a/usr.bin/openssl/pkcs8.c +++ b/usr.bin/openssl/pkcs8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs8.c,v 1.13 2018/08/24 22:56:45 jmc Exp $ */ +/* $OpenBSD: pkcs8.c,v 1.14 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999-2004. */ @@ -103,7 +103,7 @@ pkcs8_opt_v2(char *arg) return (0); } -static struct option pkcs8_options[] = { +static const struct option pkcs8_options[] = { { .name = "in", .argname = "file", diff --git a/usr.bin/openssl/pkey.c b/usr.bin/openssl/pkey.c index fa88e55032f..06b4c018947 100644 --- a/usr.bin/openssl/pkey.c +++ b/usr.bin/openssl/pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkey.c,v 1.14 2019/02/09 15:49:21 inoguchi Exp $ */ +/* $OpenBSD: pkey.c,v 1.15 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006 */ @@ -97,7 +97,7 @@ pkey_opt_cipher(int argc, char **argv, int *argsused) return (0); } -static struct option pkey_options[] = { +static const struct option pkey_options[] = { { .name = "in", .argname = "file", diff --git a/usr.bin/openssl/pkeyparam.c b/usr.bin/openssl/pkeyparam.c index 51ea2b55fb5..81bed13958c 100644 --- a/usr.bin/openssl/pkeyparam.c +++ b/usr.bin/openssl/pkeyparam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkeyparam.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: pkeyparam.c,v 1.12 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006 */ @@ -72,7 +72,7 @@ struct { int text; } pkeyparam_config; -struct option pkeyparam_options[] = { +static const struct option pkeyparam_options[] = { { .name = "in", .argname = "file", diff --git a/usr.bin/openssl/pkeyutl.c b/usr.bin/openssl/pkeyutl.c index b0800181b07..09a1a9755fa 100644 --- a/usr.bin/openssl/pkeyutl.c +++ b/usr.bin/openssl/pkeyutl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkeyutl.c,v 1.15 2019/02/17 15:01:08 inoguchi Exp $ */ +/* $OpenBSD: pkeyutl.c,v 1.16 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -96,7 +96,7 @@ static int do_keyop(EVP_PKEY_CTX * ctx, int pkey_op, unsigned char *out, size_t * poutlen, unsigned char *in, size_t inlen); -struct option pkeyutl_options[] = { +static const struct option pkeyutl_options[] = { { .name = "asn1parse", .desc = "ASN.1 parse the output data", diff --git a/usr.bin/openssl/prime.c b/usr.bin/openssl/prime.c index 5e1ad70ca09..ee0c3429806 100644 --- a/usr.bin/openssl/prime.c +++ b/usr.bin/openssl/prime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prime.c,v 1.12 2019/01/20 01:59:06 tb Exp $ */ +/* $OpenBSD: prime.c,v 1.13 2019/07/14 03:30:46 guenther Exp $ */ /* ==================================================================== * Copyright (c) 2004 The OpenSSL Project. All rights reserved. * @@ -64,7 +64,7 @@ struct { int safe; } prime_config; -struct option prime_options[] = { +static const struct option prime_options[] = { { .name = "bits", .argname = "n", diff --git a/usr.bin/openssl/rand.c b/usr.bin/openssl/rand.c index 0f91dde8b4e..fb639e3bc5f 100644 --- a/usr.bin/openssl/rand.c +++ b/usr.bin/openssl/rand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rand.c,v 1.13 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: rand.c,v 1.14 2019/07/14 03:30:46 guenther Exp $ */ /* ==================================================================== * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. * @@ -68,7 +68,7 @@ struct { char *outfile; } rand_config; -struct option rand_options[] = { +static const struct option rand_options[] = { { .name = "base64", .desc = "Perform base64 encoding on output", diff --git a/usr.bin/openssl/rsa.c b/usr.bin/openssl/rsa.c index 4017899c455..231674b5a60 100644 --- a/usr.bin/openssl/rsa.c +++ b/usr.bin/openssl/rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa.c,v 1.13 2019/02/09 15:49:21 inoguchi Exp $ */ +/* $OpenBSD: rsa.c,v 1.14 2019/07/14 03:30:46 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -109,7 +109,7 @@ rsa_opt_cipher(int argc, char **argv, int *argsused) return (0); } -static struct option rsa_options[] = { +static const struct option rsa_options[] = { { .name = "check", .desc = "Check consistency of RSA private key", diff --git a/usr.bin/openssl/rsautl.c b/usr.bin/openssl/rsautl.c index 7d7434c634a..06d7a81ae04 100644 --- a/usr.bin/openssl/rsautl.c +++ b/usr.bin/openssl/rsautl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsautl.c,v 1.17 2019/02/04 11:21:05 tb Exp $ */ +/* $OpenBSD: rsautl.c,v 1.18 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -89,7 +89,7 @@ struct { int rsa_mode; } rsautl_config; -struct option rsautl_options[] = { +static const struct option rsautl_options[] = { { .name = "asn1parse", .desc = "ASN.1 parse the output data", diff --git a/usr.bin/openssl/s_time.c b/usr.bin/openssl/s_time.c index 3263a2dff36..cdaac7e8583 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.33 2019/07/03 03:24:02 deraadt Exp $ */ +/* $OpenBSD: s_time.c,v 1.34 2019/07/14 03:30:46 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -115,7 +115,7 @@ struct { char *www_path; } s_time_config; -struct option s_time_options[] = { +static const struct option s_time_options[] = { { .name = "bugs", .desc = "Enable workarounds for known SSL/TLS bugs", diff --git a/usr.bin/openssl/sess_id.c b/usr.bin/openssl/sess_id.c index e739d99d948..d8a2bf272f7 100644 --- a/usr.bin/openssl/sess_id.c +++ b/usr.bin/openssl/sess_id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sess_id.c,v 1.9 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: sess_id.c,v 1.10 2019/07/14 03:30:46 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -80,7 +80,7 @@ static struct { int text; } sess_id_config; -static struct option sess_id_options[] = { +static const struct option sess_id_options[] = { { .name = "cert", .desc = "Output certificate if present in session", diff --git a/usr.bin/openssl/spkac.c b/usr.bin/openssl/spkac.c index 549a220589e..7fd8523c015 100644 --- a/usr.bin/openssl/spkac.c +++ b/usr.bin/openssl/spkac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spkac.c,v 1.10 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: spkac.c,v 1.11 2019/07/14 03:30:46 guenther Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. Based on an original idea by Massimiliano Pala * (madwolf@openca.org). @@ -86,7 +86,7 @@ static struct { int verify; } spkac_config; -static struct option spkac_options[] = { +static const struct option spkac_options[] = { { .name = "challenge", .argname = "string", diff --git a/usr.bin/openssl/version.c b/usr.bin/openssl/version.c index 7e570044d27..374e0d0c4ad 100644 --- a/usr.bin/openssl/version.c +++ b/usr.bin/openssl/version.c @@ -1,4 +1,4 @@ -/* $OpenBSD: version.c,v 1.8 2015/10/17 15:00:11 doug Exp $ */ +/* $OpenBSD: version.c,v 1.9 2019/07/14 03:30:46 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -157,7 +157,7 @@ version_all_opts(void) return (0); } -static struct option version_options[] = { +static const struct option version_options[] = { { .name = "a", .desc = "All information (same as setting all other flags)", |