openssh: Update to 7.9p1

5 files changed, 45 insertions, 10 deletions

diff --git a/pkg/openssh/README.md b/pkg/openssh/README.md
index ece72d1a..bf1686db 100644
--- a/pkg/openssh/README.md
+++ b/pkg/openssh/README.md
@@ -11,8 +11,9 @@ Generated with
 		LIBS='-lcrypto -lbsd -lcrypto-sha'
 
 Several changes were made:
-* `SECCOMP_AUDIT_ARCH` is removed and instead defined in `gen.lua` dependent on
-  the target toolchain architecture.
+* `SECCOMP_AUDIT_ARCH` and `SANDBOX_SECCOMP_FILTER` were removed
+  and instead defined in `gen.lua` dependent on the target toolchain
+  architecture.
 * `HAVE_READPASSPHRASE` and `HAVE_STRNVIS` are undefined because although we do
   build them into `libbsd.a`, we don't include the whole openbsd header
   directory.
diff --git a/pkg/openssh/config.h b/pkg/openssh/config.h
index 879660dd..1954c217 100644
--- a/pkg/openssh/config.h
+++ b/pkg/openssh/config.h
@@ -53,7 +53,7 @@
 /* #undef DISABLE_UTMPX */
 #define DISABLE_WTMP 1
 #define DISABLE_WTMPX 1
-#define ENABLE_PKCS11 1
+#define ENABLE_PKCS11 /**/
 /* #undef FFLUSH_NULL_BUG */
 /* #undef FILESYSTEM_NO_BACKSLASH */
 /* #undef FSID_HAS_VAL */
@@ -133,10 +133,23 @@
 #define HAVE_DES_CRYPT 1
 /* #undef HAVE_DEV_PTMX */
 /* #undef HAVE_DEV_PTS_AND_PTC */
+#define HAVE_DH_GET0_KEY 1
+#define HAVE_DH_GET0_PQG 1
+#define HAVE_DH_SET0_KEY 1
+#define HAVE_DH_SET0_PQG 1
+#define HAVE_DH_SET_LENGTH 1
 #define HAVE_DIRENT_H 1
 #define HAVE_DIRFD 1
 #define HAVE_DIRNAME 1
 #define HAVE_DSA_GENERATE_PARAMETERS_EX 1
+#define HAVE_DSA_GET0_KEY 1
+#define HAVE_DSA_GET0_PQG 1
+#define HAVE_DSA_SET0_KEY 1
+#define HAVE_DSA_SET0_PQG 1
+#define HAVE_DSA_SIG_GET0 1
+#define HAVE_DSA_SIG_SET0 1
+#define HAVE_ECDSA_SIG_GET0 1
+#define HAVE_ECDSA_SIG_SET0 1
 #define HAVE_ELF_H 1
 #define HAVE_ENDGRENT 1
 #define HAVE_ENDIAN_H 1
@@ -147,11 +160,18 @@
 #define HAVE_ERR_H 1
 /* #undef HAVE_ETC_DEFAULT_LOGIN */
 #define HAVE_EVP_CIPHER_CTX_CTRL 1
+#define HAVE_EVP_CIPHER_CTX_GET_IV 1
+#define HAVE_EVP_CIPHER_CTX_SET_IV 1
+/* #undef HAVE_EVP_CIPHER_CTX_IV */
+/* #undef HAVE_EVP_CIPHER_CTX_IV_NOCONST */
 #define HAVE_EVP_DIGESTFINAL_EX 1
 #define HAVE_EVP_DIGESTINIT_EX 1
 #define HAVE_EVP_MD_CTX_CLEANUP 1
 #define HAVE_EVP_MD_CTX_COPY_EX 1
+#define HAVE_EVP_MD_CTX_FREE 1
 #define HAVE_EVP_MD_CTX_INIT 1
+#define HAVE_EVP_MD_CTX_NEW 1
+#define HAVE_EVP_PKEY_GET0_RSA 1
 #define HAVE_EVP_RIPEMD160 1
 #define HAVE_EVP_SHA256 1
 #define HAVE_EXIT_IN_UTMP 1
@@ -325,7 +345,20 @@
 /* #undef HAVE_RPC_TYPES_H */
 /* #undef HAVE_RRESVPORT_AF */
 #define HAVE_RSA_GENERATE_KEY_EX 1
+#define HAVE_RSA_GET0_CRT_PARAMS 1
+#define HAVE_RSA_GET0_FACTORS 1
+#define HAVE_RSA_GET0_KEY 1
 #define HAVE_RSA_GET_DEFAULT_METHOD 1
+#define HAVE_RSA_METH_DUP 1
+#define HAVE_RSA_METH_FREE 1
+#define HAVE_RSA_METH_GET_FINISH 1
+#define HAVE_RSA_METH_SET1_NAME 1
+#define HAVE_RSA_METH_SET_FINISH 1
+#define HAVE_RSA_METH_SET_PRIV_DEC 1
+#define HAVE_RSA_METH_SET_PRIV_ENC 1
+#define HAVE_RSA_SET0_CRT_PARAMS 1
+#define HAVE_RSA_SET0_FACTORS 1
+#define HAVE_RSA_SET0_KEY 1
 /* #undef HAVE_SANDBOX_H */
 /* #undef HAVE_SANDBOX_INIT */
 #define HAVE_SA_FAMILY_T 1
@@ -338,10 +371,6 @@
 #define HAVE_SETEGID 1
 #define HAVE_SETENV 1
 #define HAVE_SETEUID 1
-/* #undef SIZEOF_INT */
-/* #undef SIZEOF_LONG_INT */
-/* #undef SIZEOF_LONG_LONG_INT */
-/* #undef SIZEOF_SHORT_INT */
 /* #undef HAVE_SETGROUPENT */
 #define HAVE_SETGROUPS 1
 #define HAVE_SETLINEBUF 1
@@ -457,7 +486,7 @@
 #define HAVE_TIME_H 1
 /* #undef HAVE_TIME_IN_UTMP */
 /* #undef HAVE_TIME_IN_UTMPX */
-/* #undef HAVE_TIMINGSAFE_BCMP */
+#define HAVE_TIMINGSAFE_BCMP 1
 /* #undef HAVE_TMPDIR_H */
 #define HAVE_TRUNCATE 1
 /* #undef HAVE_TTYENT_H */
@@ -557,6 +586,10 @@
 /* #undef SANDBOX_SOLARIS */
 /* #undef SANDBOX_SYSTRACE */
 /* #undef SETEUID_BREAKS_SETUID */
+/* #undef SIZEOF_INT */
+/* #undef SIZEOF_LONG_INT */
+/* #undef SIZEOF_LONG_LONG_INT */
+/* #undef SIZEOF_SHORT_INT */
 #define SNPRINTF_CONST const
 #define SPT_TYPE SPT_REUSEARGV
 /* #undef SSHD_ACQUIRES_CTTY */
diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua
index f23c42e8..c3172730 100644
--- a/pkg/openssh/gen.lua
+++ b/pkg/openssh/gen.lua
@@ -34,7 +34,8 @@ lib('libopenbsd-compat.a', [[openbsd-compat/(
 	bsd-flock.c bsd-getpagesize.c bsd-getpeereid.c bsd-malloc.c bsd-misc.c
 	bsd-nextstep.c bsd-openpty.c bsd-poll.c bsd-setres_id.c bsd-signal.c
 	bsd-snprintf.c bsd-statvfs.c bsd-waitpid.c fake-rfc2553.c
-	getrrsetbyname-ldns.c kludge-fd_set.c openssl-compat.c xcrypt.c
+	getrrsetbyname-ldns.c kludge-fd_set.c openssl-compat.c
+	libressl-api-compat.c xcrypt.c
 
 	port-aix.c port-irix.c port-linux.c port-solaris.c port-net.c port-uw.c
 )]])
diff --git a/pkg/openssh/rev b/pkg/openssh/rev
index ec635144..f599e28b 100644
--- a/pkg/openssh/rev
+++ b/pkg/openssh/rev
@@ -1 +1 @@
-9
+10
diff --git a/pkg/openssh/src b/pkg/openssh/src
-Subproject 71508e06fab14bc415a79a08f5535ad7bffa93d
+Subproject aede1c34243a6f7feae2fb2cb686ade5f9be6f3