diff options
| author | tb <> | 2023-11-21 17:56:19 +0000 |
|---|---|---|
| committer | tb <> | 2023-11-21 17:56:19 +0000 |
| commit | 1740aa5a02c9685a344ca455a39790bd21680064 (patch) | |
| tree | ff4645c5482bdc02143400e2f36d337adeb41a6d /src/usr.bin/openssl | |
| parent | 7c178f9af5dd84d292b8bda62f75d0c3ff7d5206 (diff) | |
| download | openbsd-1740aa5a02c9685a344ca455a39790bd21680064.tar.gz openbsd-1740aa5a02c9685a344ca455a39790bd21680064.tar.bz2 openbsd-1740aa5a02c9685a344ca455a39790bd21680064.zip | |
Make a few purpose things const
This should allow us to constify a sizable table in libcrypto in an
upcoming bump.
Diffstat (limited to 'src/usr.bin/openssl')
| -rw-r--r-- | src/usr.bin/openssl/apps.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/cms.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/verify.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/x509.c | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c index 70857e0423..6ffbe6f0c4 100644 --- a/src/usr.bin/openssl/apps.c +++ b/src/usr.bin/openssl/apps.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: apps.c,v 1.66 2023/07/23 11:39:29 tb Exp $ */ | 1 | /* $OpenBSD: apps.c,v 1.67 2023/11/21 17:56:19 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -1716,7 +1716,7 @@ args_verify(char ***pargs, int *pargc, int *badarg, BIO *err, | |||
| 1716 | } | 1716 | } |
| 1717 | (*pargs)++; | 1717 | (*pargs)++; |
| 1718 | } else if (strcmp(arg, "-purpose") == 0) { | 1718 | } else if (strcmp(arg, "-purpose") == 0) { |
| 1719 | X509_PURPOSE *xptmp; | 1719 | const X509_PURPOSE *xptmp; |
| 1720 | if (!argn) | 1720 | if (!argn) |
| 1721 | *badarg = 1; | 1721 | *badarg = 1; |
| 1722 | else { | 1722 | else { |
diff --git a/src/usr.bin/openssl/cms.c b/src/usr.bin/openssl/cms.c index 121a413a21..b94e14675b 100644 --- a/src/usr.bin/openssl/cms.c +++ b/src/usr.bin/openssl/cms.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms.c,v 1.34 2023/04/14 15:27:13 tb Exp $ */ | 1 | /* $OpenBSD: cms.c,v 1.35 2023/11/21 17:56:19 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -1140,7 +1140,7 @@ cms_usage(void) | |||
| 1140 | 1140 | ||
| 1141 | fprintf(stderr, "\nValid purposes:\n\n"); | 1141 | fprintf(stderr, "\nValid purposes:\n\n"); |
| 1142 | for (i = 0; i < X509_PURPOSE_get_count(); i++) { | 1142 | for (i = 0; i < X509_PURPOSE_get_count(); i++) { |
| 1143 | X509_PURPOSE *ptmp = X509_PURPOSE_get0(i); | 1143 | const X509_PURPOSE *ptmp = X509_PURPOSE_get0(i); |
| 1144 | fprintf(stderr, " %-18s%s\n", X509_PURPOSE_get0_sname(ptmp), | 1144 | fprintf(stderr, " %-18s%s\n", X509_PURPOSE_get0_sname(ptmp), |
| 1145 | X509_PURPOSE_get0_name(ptmp)); | 1145 | X509_PURPOSE_get0_name(ptmp)); |
| 1146 | } | 1146 | } |
diff --git a/src/usr.bin/openssl/verify.c b/src/usr.bin/openssl/verify.c index b4e0f33f6a..a87d5d47df 100644 --- a/src/usr.bin/openssl/verify.c +++ b/src/usr.bin/openssl/verify.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: verify.c,v 1.17 2023/04/14 15:27:13 tb Exp $ */ | 1 | /* $OpenBSD: verify.c,v 1.18 2023/11/21 17:56:19 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -251,7 +251,7 @@ verify_usage(void) | |||
| 251 | 251 | ||
| 252 | fprintf(stderr, "\nValid purposes:\n\n"); | 252 | fprintf(stderr, "\nValid purposes:\n\n"); |
| 253 | for (i = 0; i < X509_PURPOSE_get_count(); i++) { | 253 | for (i = 0; i < X509_PURPOSE_get_count(); i++) { |
| 254 | X509_PURPOSE *ptmp = X509_PURPOSE_get0(i); | 254 | const X509_PURPOSE *ptmp = X509_PURPOSE_get0(i); |
| 255 | fprintf(stderr, " %-18s%s\n", X509_PURPOSE_get0_sname(ptmp), | 255 | fprintf(stderr, " %-18s%s\n", X509_PURPOSE_get0_sname(ptmp), |
| 256 | X509_PURPOSE_get0_name(ptmp)); | 256 | X509_PURPOSE_get0_name(ptmp)); |
| 257 | } | 257 | } |
diff --git a/src/usr.bin/openssl/x509.c b/src/usr.bin/openssl/x509.c index 8e8a9f2dc3..7f60110c47 100644 --- a/src/usr.bin/openssl/x509.c +++ b/src/usr.bin/openssl/x509.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509.c,v 1.34 2023/11/13 11:50:36 tb Exp $ */ | 1 | /* $OpenBSD: x509.c,v 1.35 2023/11/21 17:56:19 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -86,7 +86,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, | |||
| 86 | X509 *x, X509 *xca, EVP_PKEY *pkey, STACK_OF(OPENSSL_STRING) *sigopts, | 86 | X509 *x, X509 *xca, EVP_PKEY *pkey, STACK_OF(OPENSSL_STRING) *sigopts, |
| 87 | char *serial, int create, int days, int clrext, CONF *conf, char *section, | 87 | char *serial, int create, int days, int clrext, CONF *conf, char *section, |
| 88 | ASN1_INTEGER *sno); | 88 | ASN1_INTEGER *sno); |
| 89 | static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt); | 89 | static int purpose_print(BIO *bio, X509 *cert, const X509_PURPOSE *pt); |
| 90 | 90 | ||
| 91 | static struct { | 91 | static struct { |
| 92 | char *alias; | 92 | char *alias; |
| @@ -1022,7 +1022,7 @@ x509_main(int argc, char **argv) | |||
| 1022 | } | 1022 | } |
| 1023 | #endif | 1023 | #endif |
| 1024 | else if (cfg.pprint == i) { | 1024 | else if (cfg.pprint == i) { |
| 1025 | X509_PURPOSE *ptmp; | 1025 | const X509_PURPOSE *ptmp; |
| 1026 | int j; | 1026 | int j; |
| 1027 | 1027 | ||
| 1028 | BIO_printf(STDout, "Certificate purposes:\n"); | 1028 | BIO_printf(STDout, "Certificate purposes:\n"); |
| @@ -1534,10 +1534,10 @@ sign(X509 *x, EVP_PKEY *pkey, int days, int clrext, const EVP_MD *digest, | |||
| 1534 | } | 1534 | } |
| 1535 | 1535 | ||
| 1536 | static int | 1536 | static int |
| 1537 | purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt) | 1537 | purpose_print(BIO *bio, X509 *cert, const X509_PURPOSE *pt) |
| 1538 | { | 1538 | { |
| 1539 | int id, i, idret; | 1539 | int id, i, idret; |
| 1540 | char *pname; | 1540 | const char *pname; |
| 1541 | 1541 | ||
| 1542 | id = X509_PURPOSE_get_id(pt); | 1542 | id = X509_PURPOSE_get_id(pt); |
| 1543 | pname = X509_PURPOSE_get0_name(pt); | 1543 | pname = X509_PURPOSE_get0_name(pt); |