diff options
| author | jsg <> | 2026-08-30 23:03:33 +0000 |
|---|---|---|
| committer | jsg <> | 2026-08-30 23:03:33 +0000 |
| commit | 51a61da390360a088d7bf67f5e96dbfd7877068d (patch) | |
| tree | d5048ca1030778963fa2d38cdeadc407b012e686 /src | |
| parent | 110827e7304c895649791b7065bcd3e0ffe1eb9a (diff) | |
| download | openbsd-51a61da390360a088d7bf67f5e96dbfd7877068d.tar.gz openbsd-51a61da390360a088d7bf67f5e96dbfd7877068d.tar.bz2 openbsd-51a61da390360a088d7bf67f5e96dbfd7877068d.zip | |
spelling; ok tb@
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/apps.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/ca.c | 8 | ||||
| -rw-r--r-- | src/usr.bin/openssl/s_client.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/s_server.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c index 46197dfd49..49ce7495bc 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.72 2025/03/18 13:03:08 tb Exp $ */ | 1 | /* $OpenBSD: apps.c,v 1.73 2026/08/30 23:03:33 jsg Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -490,7 +490,7 @@ load_pkcs12(BIO *err, BIO *in, const char *desc, pem_password_cb *pem_cb, | |||
| 490 | pem_cb = password_callback; | 490 | pem_cb = password_callback; |
| 491 | len = pem_cb(tpass, PEM_BUFSIZE, 0, cb_data); | 491 | len = pem_cb(tpass, PEM_BUFSIZE, 0, cb_data); |
| 492 | if (len < 0) { | 492 | if (len < 0) { |
| 493 | BIO_printf(err, "Passpharse callback error for %s\n", | 493 | BIO_printf(err, "Passphrase callback error for %s\n", |
| 494 | desc); | 494 | desc); |
| 495 | goto die; | 495 | goto die; |
| 496 | } | 496 | } |
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c index a2e8a68368..763b57ced8 100644 --- a/src/usr.bin/openssl/ca.c +++ b/src/usr.bin/openssl/ca.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ca.c,v 1.64 2025/12/21 07:14:47 tb Exp $ */ | 1 | /* $OpenBSD: ca.c,v 1.65 2026/08/30 23:03:33 jsg 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 | * |
| @@ -114,7 +114,7 @@ | |||
| 114 | 114 | ||
| 115 | /* Additional revocation information types */ | 115 | /* Additional revocation information types */ |
| 116 | 116 | ||
| 117 | #define REV_NONE 0 /* No addditional information */ | 117 | #define REV_NONE 0 /* No additional information */ |
| 118 | #define REV_CRL_REASON 1 /* Value is CRL reason code */ | 118 | #define REV_CRL_REASON 1 /* Value is CRL reason code */ |
| 119 | #define REV_HOLD 2 /* Value is hold instruction */ | 119 | #define REV_HOLD 2 /* Value is hold instruction */ |
| 120 | #define REV_KEY_COMPROMISE 3 /* Value is cert key compromise time */ | 120 | #define REV_KEY_COMPROMISE 3 /* Value is cert key compromise time */ |
| @@ -397,7 +397,7 @@ static const struct option ca_options[] = { | |||
| 397 | { | 397 | { |
| 398 | .name = "extfile", | 398 | .name = "extfile", |
| 399 | .argname = "file", | 399 | .argname = "file", |
| 400 | .desc = "Configuration file with X509v3 extentions to add", | 400 | .desc = "Configuration file with X509v3 extensions to add", |
| 401 | .type = OPTION_ARG, | 401 | .type = OPTION_ARG, |
| 402 | .opt.arg = &cfg.extfile, | 402 | .opt.arg = &cfg.extfile, |
| 403 | }, | 403 | }, |
| @@ -959,7 +959,7 @@ ca_main(int argc, char **argv) | |||
| 959 | } | 959 | } |
| 960 | } | 960 | } |
| 961 | /*****************************************************************/ | 961 | /*****************************************************************/ |
| 962 | /* Read extentions config file */ | 962 | /* Read extensions config file */ |
| 963 | if (cfg.extfile != NULL) { | 963 | if (cfg.extfile != NULL) { |
| 964 | extconf = NCONF_new(NULL); | 964 | extconf = NCONF_new(NULL); |
| 965 | if (NCONF_load(extconf, cfg.extfile, &errorline) <= 0) { | 965 | if (NCONF_load(extconf, cfg.extfile, &errorline) <= 0) { |
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c index 00b6f7178a..b053159f41 100644 --- a/src/usr.bin/openssl/s_client.c +++ b/src/usr.bin/openssl/s_client.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_client.c,v 1.69 2026/05/09 14:16:37 tb Exp $ */ | 1 | /* $OpenBSD: s_client.c,v 1.70 2026/08/30 23:03:33 jsg 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 | * |
| @@ -1415,7 +1415,7 @@ s_client_main(int argc, char **argv) | |||
| 1415 | } | 1415 | } |
| 1416 | if (SSL_is_dtls(con) && | 1416 | if (SSL_is_dtls(con) && |
| 1417 | DTLSv1_handle_timeout(con) > 0) | 1417 | DTLSv1_handle_timeout(con) > 0) |
| 1418 | BIO_printf(bio_err, "TIMEOUT occured\n"); | 1418 | BIO_printf(bio_err, "TIMEOUT occurred\n"); |
| 1419 | if (!ssl_pending && | 1419 | if (!ssl_pending && |
| 1420 | (pfd[2].revents & (POLLOUT|POLLERR|POLLNVAL))) { | 1420 | (pfd[2].revents & (POLLOUT|POLLERR|POLLNVAL))) { |
| 1421 | if (pfd[2].revents & (POLLERR|POLLNVAL)) { | 1421 | if (pfd[2].revents & (POLLERR|POLLNVAL)) { |
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c index f56042a4b4..3c9059c2c5 100644 --- a/src/usr.bin/openssl/s_server.c +++ b/src/usr.bin/openssl/s_server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_server.c,v 1.61 2025/01/02 13:10:03 tb Exp $ */ | 1 | /* $OpenBSD: s_server.c,v 1.62 2026/08/30 23:03:33 jsg 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 | * |
| @@ -1583,7 +1583,7 @@ sv_body(int s, unsigned char *context) | |||
| 1583 | 1583 | ||
| 1584 | if (SSL_is_dtls(con) && | 1584 | if (SSL_is_dtls(con) && |
| 1585 | DTLSv1_handle_timeout(con) > 0) | 1585 | DTLSv1_handle_timeout(con) > 0) |
| 1586 | BIO_printf(bio_err, "TIMEOUT occured\n"); | 1586 | BIO_printf(bio_err, "TIMEOUT occurred\n"); |
| 1587 | if (i <= 0) | 1587 | if (i <= 0) |
| 1588 | continue; | 1588 | continue; |
| 1589 | if (pfd[0].revents) { | 1589 | if (pfd[0].revents) { |
