diff options
| author | Michael Forney <mforney@mforney.org> | 2016-08-03 00:35:55 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-08-03 00:36:21 -0700 |
| commit | 93fa334e23bdeee80542710d45b4227f013e64e5 (patch) | |
| tree | 33f40bf97969f9de740b28723f2640674a9e35f4 | |
| parent | c493fdf426310f16eee3e786502af1367b487baf (diff) | |
openssh: Update to 7.3p1
| -rw-r--r-- | core/openssh/.rev | 2 | ||||
| -rw-r--r-- | core/openssh/config.h | 22 | ||||
| -rw-r--r-- | core/openssh/gen.rc | 5 | ||||
| m--------- | core/openssh/src | 0 |
4 files changed, 17 insertions, 12 deletions
diff --git a/core/openssh/.rev b/core/openssh/.rev index d00491fd..0cfbf088 100644 --- a/core/openssh/.rev +++ b/core/openssh/.rev @@ -1 +1 @@ -1 +2 diff --git a/core/openssh/config.h b/core/openssh/config.h index 5c665db2..c1c4a37b 100644 --- a/core/openssh/config.h +++ b/core/openssh/config.h @@ -129,6 +129,9 @@ #define HAVE_ELF_H 1 #define HAVE_ENDIAN_H 1 #define HAVE_ENDUTENT 1 +#define HAVE_ERR 1 +#define HAVE_ERRX 1 +#define HAVE_ERR_H 1 /* #undef HAVE_ETC_DEFAULT_LOGIN */ #define HAVE_EVP_CIPHER_CTX_CTRL 1 #define HAVE_EVP_DIGESTFINAL_EX 1 @@ -268,6 +271,7 @@ /* #undef HAVE_SETLUID */ /* #undef HAVE_SETPASSENT */ /* #undef HAVE_SETPCRED */ +/* #undef HAVE_SETPFLAGS */ /* #undef HAVE_SETPPRIV */ /* #undef HAVE_SETPROCTITLE */ #define HAVE_SETRESGID 1 @@ -344,6 +348,7 @@ #define HAVE_U_INTXX_T 1 #define HAVE_VASPRINTF 1 /* #undef HAVE_VIS_H */ +#define HAVE_WARN 1 /* #undef HAVE__GETLONG */ /* #undef HAVE__GETPTY */ /* #undef HAVE__GETSHORT */ @@ -375,18 +380,17 @@ /* #undef MAIL_DIRECTORY */ /* #undef NEED_SETPGRP */ /* #undef NO_ATTRIBUTE_ON_RETURN_TYPE */ -/* #undef NO_IPPORT_RESERVED_CONCEPT */ /* #undef NO_SSH_LASTLOG */ /* #undef NO_UID_RESTORATION_TEST */ /* #undef NO_X11_UNIX_SOCKETS */ -#define OPENSSL_EVP_DIGESTUPDATE_VOID 1 -/* #undef OPENSSL_HAS_ECC */ -/* #undef OPENSSL_HAS_NISTP256 */ -/* #undef OPENSSL_HAS_NISTP384 */ -/* #undef OPENSSL_HAS_NISTP521 */ -/* #undef OPENSSL_HAVE_EVPCTR */ -/* #undef OPENSSL_HAVE_EVPGCM */ -#define OPENSSL_LOBOTOMISED_AES 1 +/* #undef OPENSSL_EVP_DIGESTUPDATE_VOID */ +#define OPENSSL_HAS_ECC 1 +#define OPENSSL_HAS_NISTP256 1 +#define OPENSSL_HAS_NISTP384 1 +#define OPENSSL_HAS_NISTP521 1 +#define OPENSSL_HAVE_EVPCTR 1 +#define OPENSSL_HAVE_EVPGCM 1 +/* #undef OPENSSL_LOBOTOMISED_AES */ #define OPENSSL_PRNG_ONLY 1 #define PACKAGE_BUGREPORT "openssh-unix-dev@mindrot.org" #define PACKAGE_NAME "OpenSSH" diff --git a/core/openssh/gen.rc b/core/openssh/gen.rc index 3e8d3704..8267e46a 100644 --- a/core/openssh/gen.rc +++ b/core/openssh/gen.rc @@ -13,6 +13,7 @@ build '$outdir'/umac128.c.o cc '$srcdir'/umac.c ; defs=(\ '-Dumac_update=umac128_update' \ '-Dumac_final=umac128_final' \ '-Dumac_delete=umac128_delete' \ + '-Dumac_ctx=umac128_ctx' \ ) with cflags '$cflags '$"defs lib libopenbsd-compat.a openbsd-compat/^(\ @@ -51,7 +52,7 @@ lib libssh.a -d $"deps\ compat.c crc32.c deattack.c fatal.c hostfile.c\ log.c match.c md-sha256.c moduli.c nchan.c packet.c opacket.c\ readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c\ - atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c\ + atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c utf8.c\ monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c\ msg.c progressmeter.c dns.c entropy.c gss-genr.c umac.c umac128.c.o\ ssh-pkcs11.c smult_curve25519_ref.c\ @@ -61,7 +62,7 @@ lib libssh.a -d $"deps\ 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\ - platform-pledge.c + platform-pledge.c platform-tracing.c libs=(\ libssh.a libopenbsd-compat.a\ diff --git a/core/openssh/src b/core/openssh/src -Subproject 5c35450a0c901d9375fb23343a8dc82397da5f7 +Subproject 99522ba7ec6963a05c04a156bf20e3ba3605987 |