From 01fb82eb2aa0a4eaf5c394ea8bb37ea4c26f8a3f Mon Sep 17 00:00:00 2001
From: "jsg@openbsd.org" <jsg@openbsd.org>
Date: Fri, 17 May 2024 02:39:11 +0000
Subject: [PATCH] upstream: spelling; ok djm@

OpenBSD-Commit-ID: bdea29bb3ed2a5a7782999c4c663b219d2270483
---
 cipher.c       | 4 ++--
 ed25519.sh     | 4 ++--
 readconf.c     | 4 ++--
 sftp-client.c  | 4 ++--
 sshd-session.c | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cipher.c b/cipher.c
index 90b139c89..f12daa123 100644
--- a/cipher.c
+++ b/cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.c,v 1.120 2023/10/10 06:49:54 tb Exp $ */
+/* $OpenBSD: cipher.c,v 1.121 2024/05/17 02:39:11 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -372,7 +372,7 @@ cipher_crypt(struct sshcipher_ctx *cc, u_int seqnr, u_char *dest,
 		if (!EVP_CIPHER_CTX_ctrl(cc->evp, EVP_CTRL_GCM_IV_GEN,
 		    1, lastiv))
 			return SSH_ERR_LIBCRYPTO_ERROR;
-		/* set tag on decyption */
+		/* set tag on decryption */
 		if (!cc->encrypt &&
 		    !EVP_CIPHER_CTX_ctrl(cc->evp, EVP_CTRL_GCM_SET_TAG,
 		    authlen, (u_char *)src + aadlen + len))
diff --git a/ed25519.sh b/ed25519.sh
index 8722338db..9e6cbc9c3 100644
--- a/ed25519.sh
+++ b/ed25519.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#       $OpenBSD: ed25519.sh,v 1.1 2023/01/15 23:05:32 djm Exp $
+#       $OpenBSD: ed25519.sh,v 1.2 2024/05/17 02:39:11 jsg Exp $
 #       Placed in the Public Domain.
 #
 AUTHOR="supercop-20221122/crypto_sign/ed25519/ref/implementors"
@@ -74,7 +74,7 @@ for i in $FILES; do
 	    sed -e "s/crypto_sign_open/crypto_sign_ed25519_open/g"
 	    ;;
 	*/crypto_sign/ed25519/ref/fe25519.*)
-	    # avoid a couple of name collions with other files
+	    # avoid a couple of name collisions with other files
 	    sed -e "s/reduce_add_sub/fe25519_reduce_add_sub/g" \
 	        -e "s/ equal[(]/ fe25519_equal(/g" \
 	        -e "s/^int /static int /g"
diff --git a/readconf.c b/readconf.c
index 3a64a0441..4e3791cb7 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.386 2024/03/04 04:13:18 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.387 2024/05/17 02:39:11 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3337,7 +3337,7 @@ parse_ssh_uri(const char *uri, char **userp, char **hostp, int *portp)
 	return r;
 }
 
-/* XXX the following is a near-vebatim copy from servconf.c; refactor */
+/* XXX the following is a near-verbatim copy from servconf.c; refactor */
 static const char *
 fmt_multistate_int(int val, const struct multistate *m)
 {
diff --git a/sftp-client.c b/sftp-client.c
index 5cc8bb539..be40d2097 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.175 2023/11/13 09:18:19 tobhe Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.176 2024/05/17 02:39:11 jsg Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -2440,7 +2440,7 @@ handle_dest_replies(struct sftp_conn *to, const char *to_path, int synchronous,
 		 * server not to have reordered replies that could have
 		 * inserted holes where none existed in the source file.
 		 *
-		 * XXX we could get a more accutate progress bar if we updated
+		 * XXX we could get a more accurate progress bar if we updated
 		 * the counter based on the reply from the destination...
 		 */
 		(*nreqsp)--;
diff --git a/sshd-session.c b/sshd-session.c
index 238cbff8a..d669a03f1 100644
--- a/sshd-session.c
+++ b/sshd-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd-session.c,v 1.1 2024/05/17 00:30:24 djm Exp $ */
+/* $OpenBSD: sshd-session.c,v 1.2 2024/05/17 02:39:11 jsg Exp $ */
 /*
  * SSH2 implementation:
  * Privilege Separation:
@@ -1132,7 +1132,7 @@ main(int ac, char **av)
 		}
 	}
 	if (!have_key)
-		fatal("internal error: monitor recieved no hostkeys");
+		fatal("internal error: monitor received no hostkeys");
 
 	/* Ensure that umask disallows at least group and world write */
 	new_umask = umask(0077) | 0022;