9 files changed, 27 insertions, 13 deletions

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 829e0c075..059b6d3b3 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -129,7 +129,9 @@ utimensat(int fd, const char *path, const struct timespec times[2],
     int flag)
 {
         struct timeval tv[2];
+# ifdef HAVE_FUTIMES
         int ret, oflags = O_WRONLY;
+# endif
 
         tv[0].tv_sec = times[0].tv_sec;
         tv[0].tv_usec = times[0].tv_nsec / 1000;
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c
index f27b9d808..f041121fd 100644
--- a/openbsd-compat/bsd-snprintf.c
+++ b/openbsd-compat/bsd-snprintf.c
@@ -73,7 +73,7 @@
  * Fix incorrect zpadlen handling in fmtfp.
  * Thanks to Ollie Oldham <ollie.oldham@metro-optix.com> for spotting it.
  * few mods to make it easier to compile the tests.
- * addedd the "Ollie" test to the floating point ones.
+ * added the "Ollie" test to the floating point ones.
  *
  * Martin Pool (mbp@samba.org) April 2003
  *    Remove NO_CONFIG_H so that the test case can be built within a source
diff --git a/openbsd-compat/fnmatch.c b/openbsd-compat/fnmatch.c
index da841d203..b5641a091 100644
--- a/openbsd-compat/fnmatch.c
+++ b/openbsd-compat/fnmatch.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: fnmatch.c,v 1.21 2016/03/01 20:29:03 millert Exp $    */
+/*      $OpenBSD: fnmatch.c,v 1.22 2020/03/13 03:25:45 djm Exp $        */
 
 /* Copyright (c) 2011, VMware, Inc.
  * All rights reserved.
@@ -294,7 +294,7 @@ int fnmatch(const char *pattern, const char *string, int flags)
         const int leading_dir = !!(flags & FNM_LEADING_DIR);
         const char *dummyptr, *matchptr, *strendseg;
         int wild;
-        /* For '*' wild processing only; surpress 'used before initialization'
+        /* For '*' wild processing only; suppress 'used before initialization'
          * warnings with dummy initialization values;
          */
         const char *strstartseg = NULL;
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 1e346a8f6..e89151789 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glob.c,v 1.48 2019/02/04 16:45:40 millert Exp $ */
+/*      $OpenBSD: glob.c,v 1.49 2020/04/21 08:25:22 dtucker Exp $ */
 /*
  * Copyright (c) 1989, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -83,6 +83,10 @@
 
 #include "charclass.h"
 
+#ifdef TILDE
+# undef TILDE
+#endif
+
 #define DOLLAR          '$'
 #define DOT             '.'
 #define EOS             '\0'
@@ -829,7 +833,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp,
         if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
                 /* first time around -- clear initial gl_offs items */
                 pathv += pglob->gl_offs;
-                for (i = pglob->gl_offs; --i >= 0; )
+                for (i = pglob->gl_offs; i > 0; i--)
                         *--pathv = NULL;
         }
         pglob->gl_pathv = pathv;
@@ -841,7 +845,7 @@ globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp,
                 if (pglob->gl_statv == NULL && pglob->gl_offs > 0) {
                         /* first time around -- clear initial gl_offs items */
                         statv += pglob->gl_offs;
-                        for (i = pglob->gl_offs; --i >= 0; )
+                        for (i = pglob->gl_offs; i > 0; i--)
                                 *--statv = NULL;
                 }
                 pglob->gl_statv = statv;
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 4a16702ef..e5fd6f5bb 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -197,7 +197,7 @@ int writev(int, struct iovec *, int);
 #include "bsd-waitpid.h"
 #include "bsd-poll.h"
 
-#ifndef HAVE_GETPEEREID
+#if defined(HAVE_DECL_GETPEEREID) && HAVE_DECL_GETPEEREID == 0
 int getpeereid(int , uid_t *, gid_t *);
 #endif
 
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index abdcb8763..388ae8aa0 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -62,6 +62,12 @@ void ssh_libcrypto_init(void);
 # define OPENSSL_DSA_MAX_MODULUS_BITS   10000
 #endif
 
+#ifdef LIBRESSL_VERSION_NUMBER
+# if LIBRESSL_VERSION_NUMBER < 0x3010000fL
+#  define HAVE_BROKEN_CHACHA20
+# endif
+#endif
+
 #ifndef OPENSSL_HAVE_EVPCTR
 # define EVP_aes_128_ctr evp_aes_128_ctr
 # define EVP_aes_192_ctr evp_aes_128_ctr
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index e1ad3f117..e0d3eba51 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -383,12 +383,13 @@ aix_restoreauthdb(void)
 
 # ifdef USE_AIX_KRB_NAME
 /*
- * aix_krb5_get_principal_name: returns the user's kerberos client principal name if
- * configured, otherwise NULL.  Caller must free returned string.
+ * aix_krb5_get_principal_name: returns the user's kerberos client principal
+ * name if configured, otherwise NULL.  Caller must free returned string.
  */
 char *
-aix_krb5_get_principal_name(char *pw_name)
+aix_krb5_get_principal_name(const char *const_pw_name)
 {
+        char *pw_name = (char *)const_pw_name;
         char *authname = NULL, *authdomain = NULL, *principal = NULL;
 
         setuserdb(S_READ);
@@ -398,7 +399,8 @@ aix_krb5_get_principal_name(char *pw_name)
                 debug("AIX getuserattr S_AUTHNAME: %s", strerror(errno));
 
         if (authdomain != NULL)
-                xasprintf(&principal, "%s@%s", authname ? authname : pw_name, authdomain);
+                xasprintf(&principal, "%s@%s", authname ? authname : pw_name,
+                    authdomain);
         else if (authname != NULL)
                 principal = xstrdup(authname);
         enduserdb();
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 904de3096..0ee366140 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -97,7 +97,7 @@ char *sys_auth_get_lastlogin_msg(const char *, uid_t);
 # define CUSTOM_FAILED_LOGIN 1
 # if defined(S_AUTHDOMAIN)  && defined (S_AUTHNAME)
 # define USE_AIX_KRB_NAME
-char *aix_krb5_get_principal_name(char *);
+char *aix_krb5_get_principal_name(const char *);
 # endif
 #endif
 
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index 622988822..f46094faf 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -193,7 +193,7 @@ ssh_selinux_change_context(const char *newname)
         }
         if ((cx = index(oldctx, ':')) == NULL || (cx = index(cx + 1, ':')) ==
             NULL) {
-                logit ("%s: unparseable context %s", __func__, oldctx);
+                logit ("%s: unparsable context %s", __func__, oldctx);
                 return;
         }