upstream: Typo fixes, mostly in comments.

From THE-Spellchecker via github PR#620.

OpenBSD-Commit-ID: 64929fafa3caae5a162f23257917ecf33f8a3764

diff --git a/addrmatch.c b/addrmatch.c
index b0dc096804db02315aa88f3d3275a9cfa9c61b31..4dd2f285be8c89c04c38ea0ea149331a3db6e4b9 100644 (file)
--- a/addrmatch.c
+++ b/addrmatch.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: addrmatch.c,v 1.17 2021/04/03 06:18:40 djm Exp $ */
+/*     $OpenBSD: addrmatch.c,v 1.18 2026/02/06 22:59:18 dtucker Exp $ */
 
 /*
  * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -128,7 +128,7 @@ addr_match_cidr_list(const char *addr, const char *_list)
 
                /*
                 * NB. This function is called in pre-auth with untrusted data,
-                * so be extra paranoid about junk reaching getaddrino (via
+                * so be extra paranoid about junk reaching getaddrinfo (via
                 * addr_pton_cidr).
                 */
 

diff --git a/auth2-chall.c b/auth2-chall.c
index dc63091cf64151f373e468c9a61cab93b43c74cf..f74a214077f5cc15a2ec12a3c15c375fefe3a192 100644 (file)
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.58 2026/02/06 01:24:36 djm Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.59 2026/02/06 22:59:18 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -167,7 +167,7 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt)
                for (i = 0; devices[i]; i++) {
                        if (i >= sizeof(kbdintctxt->devices_done) * 8 ||
                            i >= sizeof(devices) / sizeof(devices[0]))
-                               fatal_f("internal error: too may devices");
+                               fatal_f("internal error: too many devices");
                        if ((kbdintctxt->devices_done & (1 << i)) != 0 ||
                            !auth2_method_allowed(authctxt,
                            "keyboard-interactive", devices[i]->name))

diff --git a/channels.c b/channels.c
index efade6d810c4d6d80ebf847ed2b0a28b9ef9c7a4..83ff8bb8e23761d8d4978d77539456b6f776ef46 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.453 2026/01/04 09:52:58 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.454 2026/02/06 22:59:18 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -4754,7 +4754,7 @@ connect_to_helper(struct ssh *ssh, const char *name, int port, int socktype,
                /*
                 * Fake up a struct addrinfo for AF_UNIX connections.
                 * channel_connect_ctx_free() must check ai_family
-                * and use free() not freeaddirinfo() for AF_UNIX.
+                * and use free() not freeaddrinfo() for AF_UNIX.
                 */
                ai = xcalloc(1, sizeof(*ai) + sizeof(*sunaddr));
                ai->ai_addr = (struct sockaddr *)(ai + 1);

diff --git a/scp.c b/scp.c
index 88cad77410f1e42cb489863fb75d2bafc06190fa..86418d85e2fc022a6785c7ffcc0e49d61303f6e0 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.270 2025/12/03 06:29:50 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.271 2026/02/06 22:59:18 dtucker Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -969,7 +969,7 @@ brace_expand(const char *pattern, char ***patternsp, size_t *npatternsp)
                        continue;
                }
                /*
-                * Pattern did not expand; append the finename component to
+                * Pattern did not expand; append the filename component to
                 * the completed list
                 */
                if ((cp2 = strrchr(cp, '/')) != NULL)

diff --git a/session.c b/session.c
index 34b049a0f5d96f4994a722cf4624f2c317ab0362..778b6d63cfd7d45da011feba79ac150347e91cf3 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.345 2025/11/17 12:59:29 jca Exp $ */
+/* $OpenBSD: session.c,v 1.346 2026/02/06 22:59:18 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -314,7 +314,7 @@ do_authenticated(struct ssh *ssh, Authctxt *authctxt)
 
        auth_log_authopts("active", auth_opts, 0);
 
-       /* setup the channel layer */
+       /* set up the channel layer */
        /* XXX - streamlocal? */
        set_fwdpermit_from_authopts(ssh, auth_opts);
 

diff --git a/ssh-ecdsa-sk.c b/ssh-ecdsa-sk.c
index 9be9e6b48833d52b33234e3f4817cb8fa0488933..eb5c8bc1eb0d665b05c44fff05cf5eb94c2134ef 100644 (file)
--- a/ssh-ecdsa-sk.c
+++ b/ssh-ecdsa-sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-ecdsa-sk.c,v 1.20 2026/02/05 22:05:49 djm Exp $ */
+/* $OpenBSD: ssh-ecdsa-sk.c,v 1.21 2026/02/06 22:59:18 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -210,7 +210,7 @@ webauthn_check_prepare_hash(const u_char *data, size_t datalen,
        fprintf(stderr, "%s: received origin: %s\n", __func__, origin);
        fprintf(stderr, "%s: received clientData:\n", __func__);
        sshbuf_dump(wrapper, stderr);
-       fprintf(stderr, "%s: expected clientData premable:\n", __func__);
+       fprintf(stderr, "%s: expected clientData preamble:\n", __func__);
        sshbuf_dump(m, stderr);
 #endif
        /* Check that the supplied clientData has the preamble we expect */

diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 0691b618e77cf164159c6162d2209c6298ece336..c490974d8cfaa87bd4f59652cdf93306f36b5fd7 100644 (file)
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.75 2025/11/23 07:04:18 tb Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.76 2026/02/06 22:59:18 dtucker Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -1890,7 +1890,7 @@ pkcs11_register_provider(char *provider_id, char *pin,
        p = xcalloc(1, sizeof(*p));
        p->name = xstrdup(provider_id);
        p->handle = handle;
-       /* setup the pkcs11 callbacks */
+       /* set up the pkcs11 callbacks */
        if ((rv = (*getfunctionlist)(&f)) != CKR_OK) {
                error("C_GetFunctionList for provider %s failed: %lu",
                    provider_id, rv);

diff --git a/sshkey.c b/sshkey.c
index 96c4c6c07ca468a5ac6ae86ac1aa540f9065b9c9..59d14531c4735b1ffc7b4b084c113c09351fcb8c 100644 (file)
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.160 2026/02/05 22:05:49 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.161 2026/02/06 22:59:18 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -2218,7 +2218,7 @@ sshkey_sign(struct sshkey *key,
 }
 
 /*
- * ssh_key_verify returns 0 for a correct signature  and < 0 on error.
+ * ssh_key_verify returns 0 for a correct signature and < 0 on error.
  * If "alg" specified, then the signature must use that algorithm.
  */
 int

diff --git a/sshkey.h b/sshkey.h
index 37231847916a04802465c1ed0b8417fab0368aa6..c7e6cbd89c2e5a47b11fbfaee5baf4339f45d925 100644 (file)
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.h,v 1.71 2025/12/22 01:49:03 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.72 2026/02/06 22:59:18 dtucker Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -98,7 +98,7 @@ enum sshkey_private_format {
 #define SSHKEY_FLAG_EXT                0x0001
 
 #define SSHKEY_CERT_MAX_PRINCIPALS     256
-/* XXX opaquify? */
+/* XXX opacify? */
 struct sshkey_cert {
        struct sshbuf   *certblob; /* Kept around for use on wire */
        u_int            type; /* SSH2_CERT_TYPE_USER or SSH2_CERT_TYPE_HOST */
@@ -113,7 +113,7 @@ struct sshkey_cert {
        char            *signature_type;
 };
 
-/* XXX opaquify? */
+/* XXX opacify? */
 struct sshkey {
        int      type;
        int      flags;

diff --git a/umac.c b/umac.c
index 8d6e1641521c101314e598d4c0c895a457507ccd..6e31b115b409cbb15b3567c511fcb0afea322001 100644 (file)
--- a/umac.c
+++ b/umac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umac.c,v 1.27 2025/09/05 10:34:35 dtucker Exp $ */
+/* $OpenBSD: umac.c,v 1.28 2026/02/06 22:59:18 dtucker Exp $ */
 /* -----------------------------------------------------------------------
  *
  * umac.c -- C Implementation UMAC Message Authentication
@@ -40,7 +40,7 @@
   * "Barreto"). The only two files needed are rijndael-alg-fst.c and
   * rijndael-alg-fst.h. Brian Gladman's version is distributed with the GNU
   * Public license at http://fp.gladman.plus.com/AES/index.htm. It
-  * includes a fast IA-32 assembly version. The OpenSSL crypo library is
+  * includes a fast IA-32 assembly version. The OpenSSL crypto library is
   * the third.
   *
   * 5) With FORCE_C_ONLY flags set to 0, incorrect results are sometimes
@@ -53,7 +53,7 @@
 /* ---------------------------------------------------------------------- */
 
 #ifndef UMAC_OUTPUT_LEN
-#define UMAC_OUTPUT_LEN     8  /* Alowable: 4, 8, 12, 16                  */
+#define UMAC_OUTPUT_LEN     8  /* Allowable: 4, 8, 12, 16                  */
 #endif
 
 #if UMAC_OUTPUT_LEN != 4 && UMAC_OUTPUT_LEN != 8 && \