commit: 85e3a8768324e0e0926e50f6cee12129d5fbd1be
parent b629feda212a0fef12518cd927b30f942e8f4ff3
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 28 Apr 2019 01:03:32 -0700
openssh: Update to 8.0p1
Diffstat:
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pkg/openssh/README.md b/pkg/openssh/README.md
@@ -11,9 +11,9 @@ Generated with
LIBS='-lcrypto -lbsd'
Several changes were made:
-* `SECCOMP_AUDIT_ARCH` and `SANDBOX_SECCOMP_FILTER` were removed
- and instead defined in `gen.lua` dependent on the target toolchain
- architecture.
+* `SECCOMP_AUDIT_ARCH`, `SANDBOX_SECCOMP_FILTER`, and `SANDBOX_RLIMIT`
+ were removed and instead defined in `gen.lua` dependent on the
+ target toolchain architecture.
* `HAVE_STRNVIS` was undefined because although we do build it into
`libbsd.a`, we don't include the whole openbsd header directory.
* `HAVE_PLEDGE` is defined because we have a stub definition in
diff --git a/pkg/openssh/config.h b/pkg/openssh/config.h
@@ -150,6 +150,7 @@
#define HAVE_DSA_SIG_SET0 1
#define HAVE_ECDSA_SIG_GET0 1
#define HAVE_ECDSA_SIG_SET0 1
+#define HAVE_EC_KEY_METHOD_NEW 1
#define HAVE_ELF_H 1
#define HAVE_ENDGRENT 1
#define HAVE_ENDIAN_H 1
@@ -161,9 +162,9 @@
/* #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_CIPHER_CTX_SET_IV 1
#define HAVE_EVP_DIGESTFINAL_EX 1
#define HAVE_EVP_DIGESTINIT_EX 1
#define HAVE_EVP_MD_CTX_CLEANUP 1
@@ -177,7 +178,9 @@
#define HAVE_EXIT_IN_UTMP 1
#define HAVE_EXPLICIT_BZERO 1
#define HAVE_FCHMOD 1
+#define HAVE_FCHMODAT 1
#define HAVE_FCHOWN 1
+#define HAVE_FCHOWNAT 1
/* #undef HAVE_FCNTL_CLOSEM */
#define HAVE_FCNTL_H 1
#define HAVE_FD_MASK 1
@@ -314,7 +317,10 @@
/* #undef HAVE_OLD_PAM */
/* #undef HAVE_OPENLOG_R */
#define HAVE_OPENPTY 1
-#define HAVE_OPENSSL 1
+#define HAVE_OPENSSL_ADD_ALL_ALGORITHMS 1
+#define HAVE_OPENSSL_INIT_CRYPTO 1
+#define HAVE_OPENSSL_VERSION 1
+#define HAVE_OPENSSL_VERSION_NUM 1
/* #undef HAVE_OSF_SIA */
/* #undef HAVE_PAM_GETENVLIST */
/* #undef HAVE_PAM_PAM_APPL_H */
@@ -506,6 +512,7 @@
#define HAVE_USER_FROM_UID 1
#define HAVE_USLEEP 1
/* #undef HAVE_UTIL_H */
+#define HAVE_UTIMENSAT 1
#define HAVE_UTIMES 1
#define HAVE_UTIME_H 1
#define HAVE_UTMPNAME 1
diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua
@@ -65,7 +65,7 @@ lib('libssh.a', [[
canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c
cipher-ctr.c cleanup.c
compat.c crc32.c fatal.c hostfile.c
- log.c match.c moduli.c nchan.c packet.c opacket.c
+ log.c match.c moduli.c nchan.c packet.c
readpass.c ttymodes.c xmalloc.c addrmatch.c
atomicio.c dispatch.c mac.c uuencode.c misc.c utf8.c
monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c
@@ -75,8 +75,8 @@ lib('libssh.a', [[
ssh-ed25519.c digest-openssl.c digest-libc.c hmac.c
sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c
kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c
- kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c
- kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c
+ kexgexc.c kexgexs.c
+ sntrup4591761.c kexsntrup4591761x25519.c kexgen.c
platform-pledge.c platform-tracing.c platform-misc.c
libopenbsd-compat.a
$builddir/pkg/(libressl/libcrypto.a.d zlib/libz.a)
diff --git a/pkg/openssh/ver b/pkg/openssh/ver
@@ -1 +1 @@
-7.9p1 r0
+8.0p1 r0
