20 files changed, 27 insertions, 27 deletions

diff --git a/Makefile.in b/Makefile.in
index 04e1c8e53..8d33e533d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# uncomment if you run a non bourne compatable shell. Ie. csh
+# uncomment if you run a non bourne compatible shell. Ie. csh
 #SHELL = @SH@
 
 AUTORECONF=autoreconf
diff --git a/README.platform b/README.platform
index c7be95fb6..9210e07c8 100644
--- a/README.platform
+++ b/README.platform
@@ -80,7 +80,7 @@ added to /etc/security/audit_event:
         32800:AUE_openssh:OpenSSH login:lo
 
 The BSM audit event range available for third party TCB applications is
-32768 - 65535.  Event number 32800 has been choosen for AUE_openssh.
+32768 - 65535.  Event number 32800 has been chosen for AUE_openssh.
 There is no official registry of 3rd party event numbers, so if this
 number is already in use on your system, you may change it at build time
 by configure'ing --with-cflags=-DAUE_openssh=32801 then rebuilding.
diff --git a/TODO b/TODO
index f22c7e224..771162b30 100644
--- a/TODO
+++ b/TODO
@@ -57,10 +57,10 @@ Clean up configure/makefiles:
 - Replace the whole u_intXX_t evilness in acconfig.h with something better???
  - Do it in configure.ac
 
-- Consider splitting the u_intXX_t test for sys/bitype.h  into seperate test
+- Consider splitting the u_intXX_t test for sys/bitype.h  into separate test
   to allow people to (right/wrongfully) link against Bind directly.
 
-- Consider splitting configure.ac into seperate files which do logically
+- Consider splitting configure.ac into separate files which do logically
   similar tests. E.g move all the type detection stuff into one file,
   entropy related stuff into another.
 
diff --git a/configure.ac b/configure.ac
index 663062bef..1e9f7412c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,7 +274,7 @@ typedef void foo(const char *, ...) __attribute__((format(printf, 1, 2)));]],
     [ AC_MSG_RESULT([yes]) ],
     [ AC_MSG_RESULT([no])
       AC_DEFINE(NO_ATTRIBUTE_ON_PROTOTYPE_ARGS, 1,
-         [compiler does not accept __attribute__ on protoype args]) ]
+         [compiler does not accept __attribute__ on prototype args]) ]
 )
 
 if test "x$no_attrib_nonnull" != "x1" ; then
@@ -514,7 +514,7 @@ case "$host" in
         # Some versions of VAC won't allow macro redefinitions at
         # -qlanglevel=ansi, and autoconf 2.60 sometimes insists on using that
         # particularly with older versions of vac or xlc.
-        # It also throws errors about null macro argments, but these are
+        # It also throws errors about null macro arguments, but these are
         # not fatal.
         AC_MSG_CHECKING([if compiler allows macro redefinitions])
         AC_COMPILE_IFELSE(
@@ -753,7 +753,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         PATH="$PATH:/usr/etc"
         AC_DEFINE([WITH_IRIX_ARRAY], [1],
                 [Define if you have/want arrays
-                (cluster-wide session managment, not C arrays)])
+                (cluster-wide session management, not C arrays)])
         AC_DEFINE([WITH_IRIX_PROJECT], [1],
                 [Define if you want IRIX project management])
         AC_DEFINE([WITH_IRIX_AUDIT], [1],
@@ -3005,7 +3005,7 @@ LIBS="$saved_LIBS"
 
 ### Configure cryptographic random number support
 
-# Check wheter OpenSSL seeds itself
+# Check whether OpenSSL seeds itself
 if test "x$openssl" = "xyes" ; then
         AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded])
         AC_RUN_IFELSE(
@@ -3904,7 +3904,7 @@ fi
 
 AC_CHECK_TYPES([struct timespec])
 
-# We need int64_t or else certian parts of the compile will fail.
+# We need int64_t or else certain parts of the compile will fail.
 if test "x$ac_cv_have_int64_t" = "xno" && \
         test "x$ac_cv_sizeof_long_int" != "x8" && \
         test "x$ac_cv_sizeof_long_long_int" = "x0" ; then
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index db6aaa08a..261020af3 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -22,7 +22,7 @@
 
 CSIH_SCRIPT=/usr/share/csih/cygwin-service-installation-helper.sh
 
-# List of apps used.  This is checkad for existance in csih_sanity_check
+# List of apps used.  This is checkad for existence in csih_sanity_check
 # Don't use *any* transient commands before sourcing the csih helper script,
 # otherwise the sanity checks are short-circuited.
 declare -a csih_required_commands=(
diff --git a/contrib/cygwin/ssh-user-config b/contrib/cygwin/ssh-user-config
index 33dc0cbea..6fa4bb3ea 100644
--- a/contrib/cygwin/ssh-user-config
+++ b/contrib/cygwin/ssh-user-config
@@ -127,7 +127,7 @@ readonly -f check_user_homedir
 check_user_dot_ssh_dir() {
   if [ -e "${pwdhome}/.ssh" -a ! -d "${pwdhome}/.ssh" ]
   then
-    csih_error "${pwdhome}/.ssh is existant but not a directory. Cannot create user identity files."
+    csih_error "${pwdhome}/.ssh is existent but not a directory. Cannot create user identity files."
   fi
   
   if [ ! -e "${pwdhome}/.ssh" ]
diff --git a/contrib/solaris/README b/contrib/solaris/README
index fefdd4b53..cabecaa1a 100644
--- a/contrib/solaris/README
+++ b/contrib/solaris/README
@@ -5,7 +5,7 @@ SVR4 style package tools.
 
 The build process is called a 'dummy install'.. Which means the software does
 a  "make install-nokeys DESTDIR=[fakeroot]".  This way all manpages should
-be handled correctly and key are defered until the first time the sshd
+be handled correctly and key are deferred until the first time the sshd
 is started.
 
 Directions:
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index d9c4298f1..be07bd5f8 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -56,7 +56,7 @@ arbitrary TCP/IP ports can also be forwarded over the secure channel.
 
 OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it
 up to date in terms of security and features, as well as removing all
-patented algorithms to seperate libraries (OpenSSL).
+patented algorithms to separate libraries (OpenSSL).
 
 This package includes all files necessary for both the OpenSSH
 client and server.
@@ -70,7 +70,7 @@ arbitrary TCP/IP ports can also be forwarded over the secure channel.
 
 OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it
 up to date in terms of security and features, as well as removing all
-patented algorithms to seperate libraries (OpenSSL).
+patented algorithms to separate libraries (OpenSSL).
 
 This package contains an X Window System passphrase dialog for OpenSSH.
 
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 9666bda4b..b1f489f79 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -657,7 +657,7 @@ mm_sshpam_query(void *ctx, char **name, char **info,
         sshpam_set_maxtries_reached(buffer_get_int(&m));
         *num = buffer_get_int(&m);
         if (*num > PAM_MAX_NUM_MSG)
-                fatal("%s: recieved %u PAM messages, expected <= %u",
+                fatal("%s: received %u PAM messages, expected <= %u",
                     __func__, *num, PAM_MAX_NUM_MSG);
         *prompts = xcalloc((*num + 1), sizeof(char *));
         *echo_on = xcalloc((*num + 1), sizeof(u_int));
diff --git a/openbsd-compat/bcrypt_pbkdf.c b/openbsd-compat/bcrypt_pbkdf.c
index 0a07f9a0f..785234563 100644
--- a/openbsd-compat/bcrypt_pbkdf.c
+++ b/openbsd-compat/bcrypt_pbkdf.c
@@ -46,7 +46,7 @@
  * function with the following modifications:
  * 1. The input password and salt are preprocessed with SHA512.
  * 2. The output length is expanded to 256 bits.
- * 3. Subsequently the magic string to be encrypted is lengthened and modifed
+ * 3. Subsequently the magic string to be encrypted is lengthened and modified
  *    to "OxychromaticBlowfishSwatDynamite"
  * 4. The hash function is defined to perform 64 rounds of initial state
  *    expansion. (More rounds are performed by iterating the hash.)
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index 9cef694b9..202c055db 100644
--- a/openbsd-compat/bsd-cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
@@ -41,7 +41,7 @@ typedef void *HANDLE;
 #define UNLEN 256
 
 /* Cygwin functions for which declarations are only available when including
-   windows headers, so we have to define them here explicitely. */
+   windows headers, so we have to define them here explicitly. */
 extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
 extern void cygwin_set_impersonation_token (const HANDLE);
 
diff --git a/openbsd-compat/bsd-nextstep.h b/openbsd-compat/bsd-nextstep.h
index 610f9e381..4a45b15af 100644
--- a/openbsd-compat/bsd-nextstep.h
+++ b/openbsd-compat/bsd-nextstep.h
@@ -36,7 +36,7 @@
 /* NeXT's readdir() is BSD (struct direct) not POSIX (struct dirent) */
 #define dirent direct
 
-/* Swap out NeXT's BSD wait() for a more POSIX complient one */
+/* Swap out NeXT's BSD wait() for a more POSIX compliant one */
 pid_t posix_wait(int *);
 #define wait(a) posix_wait(a)
 
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c
index d95b6a401..f27b9d808 100644
--- a/openbsd-compat/bsd-snprintf.c
+++ b/openbsd-compat/bsd-snprintf.c
@@ -30,7 +30,7 @@
  *    probably requires libm on most operating systems.  Don't yet
  *    support the exponent (e,E) and sigfig (g,G).  Also, fmtint()
  *    was pretty badly broken, it just wasn't being exercised in ways
- *    which showed it, so that's been fixed.  Also, formated the code
+ *    which showed it, so that's been fixed.  Also, formatted the code
  *    to mutt conventions, and removed dead code left over from the
  *    original.  Also, there is now a builtin-test, just compile with:
  *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
diff --git a/openbsd-compat/bsd-waitpid.h b/openbsd-compat/bsd-waitpid.h
index 5ce3ee4b5..b551268ab 100644
--- a/openbsd-compat/bsd-waitpid.h
+++ b/openbsd-compat/bsd-waitpid.h
@@ -27,7 +27,7 @@
 #define _BSD_WAITPID_H
 
 #ifndef HAVE_WAITPID
-/* Clean out any potental issues */
+/* Clean out any potential issues */
 #undef WIFEXITED
 #undef WIFSTOPPED
 #undef WIFSIGNALED
diff --git a/openbsd-compat/explicit_bzero.c b/openbsd-compat/explicit_bzero.c
index 53a003472..6ef9825a9 100644
--- a/openbsd-compat/explicit_bzero.c
+++ b/openbsd-compat/explicit_bzero.c
@@ -41,7 +41,7 @@ explicit_bzero(void *p, size_t n)
         /*
          * clang -fsanitize=memory needs to intercept memset-like functions
          * to correctly detect memory initialisation. Make sure one is called
-         * directly since our indirection trick above sucessfully confuses it.
+         * directly since our indirection trick above successfully confuses it.
          */
 #if defined(__has_feature)
 # if __has_feature(memory_sanitizer)
diff --git a/openbsd-compat/fmt_scaled.c b/openbsd-compat/fmt_scaled.c
index 7c5193e26..f68f24123 100644
--- a/openbsd-compat/fmt_scaled.c
+++ b/openbsd-compat/fmt_scaled.c
@@ -188,7 +188,7 @@ scan_scaled(char *scaled, long long *result)
                         /* scale whole part */
                         whole *= scale_fact;
 
-                        /* truncate fpart so it does't overflow.
+                        /* truncate fpart so it doesn't overflow.
                          * then scale fractional part.
                          */
                         while (fpart >= LLONG_MAX / scale_fact) {
diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c
index 014cac264..3028e429a 100644
--- a/openbsd-compat/port-uw.c
+++ b/openbsd-compat/port-uw.c
@@ -99,7 +99,7 @@ nischeck(char *namep)
 
         if ((fd = fopen (password_file, "r")) == NULL) {
                 /*
-                 * If the passwd file has dissapeared we are in a bad state.
+                 * If the passwd file has disappeared we are in a bad state.
                  * However, returning 0 will send us back through the
                  * authentication scheme that has checked the ia database for
                  * passwords earlier.
diff --git a/openbsd-compat/sha2.c b/openbsd-compat/sha2.c
index a22099bbe..b55ea30ac 100644
--- a/openbsd-compat/sha2.c
+++ b/openbsd-compat/sha2.c
@@ -72,7 +72,7 @@
  * Please make sure that your system defines BYTE_ORDER.  If your
  * architecture is little-endian, make sure it also defines
  * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
- * equivilent.
+ * equivalent.
  *
  * If your system does not define the above, then you can do so by
  * hand like this:
diff --git a/packet.c b/packet.c
index 4bfb50726..574aef60e 100644
--- a/packet.c
+++ b/packet.c
@@ -597,7 +597,7 @@ ssh_packet_close_internal(struct ssh *ssh, int do_close)
                 state->newkeys[mode] = NULL;
                 ssh_clear_newkeys(ssh, mode);           /* next keys */
         }
-        /* comression state is in shared mem, so we can only release it once */
+        /* compression state is in shared mem, so we can only release it once */
         if (do_close && state->compression_buffer) {
                 sshbuf_free(state->compression_buffer);
                 if (state->compression_out_started) {
@@ -965,7 +965,7 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
             state->p_read.packets > MAX_PACKETS)
                 return 1;
 
-        /* Rekey after (cipher-specific) maxiumum blocks */
+        /* Rekey after (cipher-specific) maximum blocks */
         out_blocks = ROUNDUP(outbound_packet_len,
             state->newkeys[MODE_OUT]->enc.block_size);
         return (state->max_blocks_out &&
diff --git a/sshd.8 b/sshd.8
index 968ba66bb..62cac6f28 100644
--- a/sshd.8
+++ b/sshd.8
@@ -277,7 +277,7 @@ locked, listed in
 .Cm DenyUsers
 or its group is listed in
 .Cm DenyGroups
-\&.  The definition of a locked account is system dependant. Some platforms
+\&.  The definition of a locked account is system dependent. Some platforms
 have their own account database (eg AIX) and some modify the passwd field (
 .Ql \&*LK\&*
 on Solaris and UnixWare,