<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/35ab1a7d5700e0866284f51878bef52bfcc1c0b5">https://github.com/macports/macports-ports/commit/35ab1a7d5700e0866284f51878bef52bfcc1c0b5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 35ab1a7d5700e0866284f51878bef52bfcc1c0b5
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Thu Oct 17 01:18:02 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> net/openssh: accept and send LANG, LC_* variables in default example files.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/52745
</span>---
net/openssh/Portfile | 6 +-
net/openssh/files/macports-config.patch | 64 ++++++++
...ssh-8.1p1-gsskex-all-20141021-mp-20191015.patch | 162 ++++++++++-----------
net/openssh/files/openssh-8.1p1-hpnssh14v18.diff | 146 +++++++++----------
net/openssh/files/series | 1 +
net/openssh/files/series-gsskex | 1 +
net/openssh/files/series-hpn | 1 +
7 files changed, 226 insertions(+), 155 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/Portfile b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7cd372b..cfcd8de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name openssh
version 8.1p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,7 @@ if {${name} eq ${subport}} {
</span> patch-sandbox-darwin.c-apple-sandbox-named-external.diff \
patch-sshd.c-apple-sandbox-named-external.diff \
0002-Apple-keychain-integration-other-changes.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-config.patch
</span>
# We need a couple of patches
# - pam.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +63,9 @@ if {${name} eq ${subport}} {
</span> # fail to load the sandbox description and libsandbox.1.dylib.
# - 0002-Apple-keychain-integration-other-changes.patch
# Adds Apple Keychain integration and ssh-agent's launchd mode
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - macports-config.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Changes the default configuration from the upstream-provided one by popular
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # request.
</span>
post-patch {
# reinplace prefix in path to sandbox definition added by
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/macports-config.patch b/net/openssh/files/macports-config.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d98c39b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/macports-config.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_config 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_config 2019-10-17 01:07:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # list of available options, their meanings and defaults, please see the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ssh_config(5) man page.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Host *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Host *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ForwardAgent no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ForwardX11 no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PasswordAuthentication yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,3 +43,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # VisualHostKey no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ProxyCommand ssh -q -W %h:%p gateway.example.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # RekeyLimit 1G 1h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SendEnv LANG LC_*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_config.5 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_config.5 2019-10-17 01:11:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,6 +71,15 @@ Since the first obtained value for each
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ host-specific declarations should be given near the beginning of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file, and general defaults at the end.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Pp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The MacPorts software distribution modifies the default example file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with some options which are not the default in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Xr ssh 1 :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Pp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Bl -bullet -offset indent -compact
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.It
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Cm SendEnv No LANG LC_*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.El
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Pp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The file contains keyword-argument pairs, one per line.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Lines starting with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Ql #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd_config 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd_config 2019-10-17 01:12:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,6 +105,9 @@ AuthorizedKeysFile .ssh/authorized_keys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no default banner path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Banner none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Allow client to pass locale environment variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AcceptEnv LANG LC_*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # override default of no subsystems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Subsystem sftp /usr/libexec/sftp-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd_config.5 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd_config.5 2019-10-17 01:13:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,15 @@ Arguments may optionally be enclosed in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Pq \&"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in order to represent arguments containing spaces.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Pp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The MacPorts software distribution modifies the default example file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with some options which are not the default in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Xr sshd 8 :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Pp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Bl -bullet -offset indent -compact
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.It
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Cm AcceptEnv No LANG LC_*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.El
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Pp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The possible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keywords and their meanings are as follows (note that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keywords are case-insensitive and arguments are case-sensitive):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch b/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a883e1..08cae5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> create mode 100644 kexgsss.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ChangeLog.gssapi 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ChangeLog.gssapi 2019-10-17 01:16:01.000000000 +0200
</span> @@ -0,0 +1,113 @@
+20110101
+ - Finally update for OpenSSH 5.6p1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,8 +204,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> + add support for GssapiTrustDns option for gssapi-with-mic
+ (from jbasney AT ncsa.uiuc.edu)
+ <gssapi-with-mic support is Bugzilla #1008>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.in 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.in 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.in 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in 2019-10-17 01:16:01.000000000 +0200
</span> @@ -87,6 +87,7 @@ LIBOPENSSH_OBJS=\
LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,8 +231,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
sftp-server.o sftp-common.o sftp-realpath.o \
sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/auth-krb5.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth-krb5.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth-krb5.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth-krb5.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -182,8 +182,13 @@ auth_krb5_password(Authctxt *authctxt, c
len = strlen(authctxt->krb5_ticket_file) + 6;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -280,8 +280,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>
return (krb5_cc_resolve(ctx, ccname, ccache));
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/auth2-gss.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth2-gss.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth2-gss.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth2-gss.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -1,7 +1,7 @@
/* $OpenBSD: auth2-gss.c,v 1.29 2018/07/31 03:10:27 djm Exp $ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,8 +373,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> Authmethod method_gssapi = {
"gssapi-with-mic",
userauth_gssapi,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/auth2.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth2.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth2.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth2.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -73,6 +73,7 @@ extern Authmethod method_passwd;
extern Authmethod method_kbdint;
extern Authmethod method_hostbased;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,8 +391,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> &method_gssapi,
#endif
&method_passwd,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/clientloop.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/clientloop.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clientloop.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clientloop.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -112,6 +112,10 @@
#include "ssherr.h"
#include "hostfile.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -424,8 +424,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> /* Buffer input from the connection. */
client_process_net_input(ssh, readset);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/config.h.in 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/config.h.in 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/config.h.in 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config.h.in 2019-10-17 01:16:01.000000000 +0200
</span> @@ -1884,6 +1884,9 @@
/* Use btmp to log bad logins */
#undef USE_BTMP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,8 +446,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> /* Define if you have Solaris process contracts */
#undef USE_SOLARIS_PROCESS_CONTRACTS
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac 2019-10-17 01:16:01.000000000 +0200
</span> @@ -667,6 +667,30 @@ main() { if (NSVersionOfRunTimeLibrary("
[Use tunnel device compatibility to OpenBSD])
AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -479,8 +479,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> m4_pattern_allow([AU_IPv])
AC_CHECK_DECL([AU_IPv4],
AC_DEFINE([LASTLOG_WRITE_PUTUTXLINE], [1],
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gss-genr.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gss-genr.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gss-genr.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gss-genr.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -1,7 +1,7 @@
/* $OpenBSD: gss-genr.c,v 1.26 2018/07/10 09:13:30 djm Exp $ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -857,8 +857,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> +}
+
#endif /* GSSAPI */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gss-serv-krb5.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gss-serv-krb5.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gss-serv-krb5.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gss-serv-krb5.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -1,7 +1,7 @@
/* $OpenBSD: gss-serv-krb5.c,v 1.9 2018/07/09 21:37:55 markus Exp $ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -995,8 +995,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> };
#endif /* KRB5 */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gss-serv.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gss-serv.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gss-serv.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gss-serv.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -1,7 +1,7 @@
/* $OpenBSD: gss-serv.c,v 1.31 2018/07/09 21:37:55 markus Exp $ */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1293,8 +1293,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> }
/* Privileged */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/kex.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kex.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kex.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kex.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -55,11 +55,16 @@
#include "misc.h"
#include "dispatch.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1415,8 +1415,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> free(kex->failed_choice);
free(kex->hostkey_alg);
free(kex->name);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/kex.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kex.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kex.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kex.h 2019-10-17 01:16:01.000000000 +0200
</span> @@ -102,6 +102,15 @@ enum kex_exchange {
KEX_ECDH_SHA2,
KEX_C25519_SHA256,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1482,7 +1482,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
__attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kexgssc.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexgssc.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -0,0 +1,405 @@
+/*
+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1890,7 +1890,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> +
+#endif /* defined(GSSAPI) && defined(WITH_OPENSSL) */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kexgsss.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexgsss.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2237,8 +2237,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> + return r;
+}
+#endif /* defined(GSSAPI) && defined(WITH_OPENSSL) */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/monitor.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -147,6 +147,8 @@ int mm_answer_gss_setup_ctx(struct ssh *
int mm_answer_gss_accept_ctx(struct ssh *, int, struct sshbuf *);
int mm_answer_gss_userok(struct ssh *, int, struct sshbuf *);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2469,8 +2469,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> +
#endif /* GSSAPI */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/monitor.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor.h 2019-10-17 01:16:01.000000000 +0200
</span> @@ -63,6 +63,9 @@ enum monitor_reqtype {
MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2481,8 +2481,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> };
struct ssh;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/monitor_wrap.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor_wrap.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor_wrap.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor_wrap.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -978,13 +978,15 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2558,8 +2558,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> +}
+
#endif /* GSSAPI */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/monitor_wrap.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor_wrap.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor_wrap.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor_wrap.h 2019-10-17 01:16:01.000000000 +0200
</span> @@ -63,8 +63,10 @@ int mm_sshkey_verify(const struct sshkey
OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2572,8 +2572,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> #endif
#ifdef USE_PAM
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/readconf.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -67,6 +67,7 @@
#include "uidswap.h"
#include "myproposal.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2704,8 +2704,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> #endif /* GSSAPI */
dump_cfg_fmtint(oHashKnownHosts, o->hash_known_hosts);
dump_cfg_fmtint(oHostbasedAuthentication, o->hostbased_authentication);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/readconf.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h 2019-10-17 01:16:01.000000000 +0200
</span> @@ -40,7 +40,13 @@ typedef struct {
int challenge_response_authentication;
/* Try S/Key or TIS, authentication. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2720,8 +2720,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> int password_authentication; /* Try password
* authentication. */
int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/servconf.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/servconf.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/servconf.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/servconf.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -64,6 +64,7 @@
#include "auth.h"
#include "myproposal.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2837,8 +2837,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> #endif
dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
dump_cfg_fmtint(sKbdInteractiveAuthentication,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/servconf.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/servconf.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/servconf.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/servconf.h 2019-10-17 01:16:01.000000000 +0200
</span> @@ -126,8 +126,11 @@ typedef struct {
int kerberos_get_afs_token; /* If true, try to get AFS token if
* authenticated with Kerberos. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2851,8 +2851,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> int password_authentication; /* If true, permit password
* authentication. */
int kbd_interactive_authentication; /* If true, permit */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh-gss.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-gss.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-gss.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-gss.h 2019-10-17 01:16:01.000000000 +0200
</span> @@ -1,6 +1,6 @@
/* $OpenBSD: ssh-gss.h,v 1.14 2018/07/10 09:13:30 djm Exp $ */
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2969,9 +2969,9 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> #endif /* GSSAPI */
#endif /* _SSH_GSS_H */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh_config 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh_config 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_config 2019-10-17 01:07:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_config 2019-10-17 01:16:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,8 @@ Host *
</span> # HostbasedAuthentication no
# GSSAPIAuthentication no
# GSSAPIDelegateCredentials no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2980,15 +2980,15 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> # BatchMode no
# CheckHostIP yes
# AddressFamily any
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh_config.5 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh_config.5 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_config.5 2019-10-17 01:11:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_config.5 2019-10-17 01:16:01.000000000 +0200
</span> @@ -1,4 +1,4 @@
-.\"
+kex-gss\n.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
.\" All rights reserved
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -758,10 +758,66 @@ The default is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -767,10 +767,66 @@ The default is
</span> Specifies whether user authentication based on GSSAPI is allowed.
The default is
.Cm no .
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3055,8 +3055,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> .It Cm HashKnownHosts
Indicates that
.Xr ssh 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshconnect2.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect2.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshconnect2.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -77,14 +77,13 @@
#include "keychain.h"
int found_in_keychain = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3288,8 +3288,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> #endif /* GSSAPI */
static int
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshd.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd.c 2019-10-17 01:16:01.000000000 +0200
</span> @@ -123,6 +123,10 @@
#include "version.h"
#include "ssherr.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3452,8 +3452,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> kex->kex[KEX_C25519_SHA256] = kex_gen_server;
kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
kex->load_host_public_key=&get_hostkey_public_by_type;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshd_config 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd_config 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd_config 2019-10-17 01:12:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd_config 2019-10-17 01:16:01.000000000 +0200
</span> @@ -69,6 +69,8 @@ AuthorizedKeysFile .ssh/authorized_keys
# GSSAPI options
#GSSAPIAuthentication no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3463,9 +3463,9 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>
# Set this to 'yes' to enable PAM authentication, account processing,
# and session processing. If this is enabled, PAM authentication will
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshd_config.5 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd_config.5 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -650,6 +650,11 @@ The default is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd_config.5 2019-10-17 01:13:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd_config.5 2019-10-17 01:16:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -659,6 +659,11 @@ The default is
</span> Specifies whether user authentication based on GSSAPI is allowed.
The default is
.Cm no .
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3477,7 +3477,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> .It Cm GSSAPICleanupCredentials
Specifies whether to automatically destroy the user's credentials cache
on logout.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -669,6 +674,30 @@ machine's default store.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -678,6 +683,30 @@ machine's default store.
</span> This facility is provided to assist with operation on multi homed machines.
The default is
.Cm yes .
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3508,8 +3508,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> .It Cm HostbasedAcceptedKeyTypes
Specifies the key types that will be accepted for hostbased authentication
as a list of comma-separated patterns.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshkey.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshkey.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshkey.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshkey.c 2019-10-17 01:16:02.000000000 +0200
</span> @@ -145,6 +145,7 @@ static const struct keytype keytypes[] =
# endif /* OPENSSL_HAS_NISTP521 */
# endif /* OPENSSL_HAS_ECC */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3527,8 +3527,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> continue;
if (!include_sigonly && kt->sigonly)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshkey.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshkey.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshkey.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshkey.h 2019-10-17 01:16:02.000000000 +0200
</span> @@ -65,6 +65,7 @@ enum sshkey_types {
KEY_ED25519_CERT,
KEY_XMSS,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3537,8 +3537,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> KEY_UNSPEC
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/auth.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth.c 2019-10-17 01:16:02.000000000 +0200
</span> @@ -399,7 +399,8 @@ auth_root_allowed(struct ssh *ssh, const
case PERMIT_NO_PASSWD:
if (strcmp(method, "publickey") == 0 ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3671,7 +3671,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> * Returns pid on success, 0 on failure.
* The child stdout and stderr maybe captured, left attached or sent to
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth-compat.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth-compat.c 2019-10-17 01:16:02.000000000 +0200
</span> @@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2000 Markus Friedl. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3848,7 +3848,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> + }
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth-compat.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth-compat.h 2019-10-17 01:16:02.000000000 +0200
</span> @@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2000 Markus Friedl. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3884,8 +3884,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> +const char *auth_get_canonical_hostname(struct ssh *, int);
+
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/auth.h 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth.h 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth.h 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth.h 2019-10-17 01:16:02.000000000 +0200
</span> @@ -40,6 +40,8 @@
#include <krb5.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3904,8 +3904,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> HostStatus
check_key_in_hostfiles(struct passwd *, struct sshkey *, const char *,
const char *, const char *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/kexdh.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kexdh.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kexdh.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexdh.c 2019-10-17 01:16:02.000000000 +0200
</span> @@ -48,13 +48,23 @@ kex_dh_keygen(struct kex *kex)
{
switch (kex->kex_type) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3930,8 +3930,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> kex->dh = dh_new_group16();
break;
case KEX_DH_GRP18_SHA512:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/kexgen.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kexgen.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kexgen.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexgen.c 2019-10-17 01:16:02.000000000 +0200
</span> @@ -44,7 +44,7 @@
static int input_kex_gen_init(int, u_int32_t, struct ssh *);
static int input_kex_gen_reply(int type, u_int32_t seq, struct ssh *ssh);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3941,8 +3941,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> kex_gen_hash(
int hash_alg,
const struct sshbuf *client_version,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/session.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/session.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/session.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c 2019-10-17 01:16:02.000000000 +0200
</span> @@ -2689,13 +2689,19 @@ do_cleanup(struct ssh *ssh, Authctxt *au
#ifdef KRB5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3965,8 +3965,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> #endif
/* remove agent socket */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh.1 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh.1 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh.1 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh.1 2019-10-17 01:16:02.000000000 +0200
</span> @@ -497,7 +497,13 @@ For full details of the options listed b
.It GatewayPorts
.It GlobalKnownHostsFile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3990,8 +3990,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> .Ar key
(key types),
.Ar key-cert
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh.c 2019-10-17 00:58:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh.c 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh.c 2019-10-17 01:16:02.000000000 +0200
</span> @@ -736,6 +736,8 @@ main(int ac, char **av)
cp = mac_alg_list('\n');
else if (strcmp(optarg, "kex") == 0)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/openssh-8.1p1-hpnssh14v18.diff b/net/openssh/files/openssh-8.1p1-hpnssh14v18.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 666b421..97b7b8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/openssh-8.1p1-hpnssh14v18.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/openssh-8.1p1-hpnssh14v18.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/HPN-README 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/HPN-README 2019-10-17 01:17:02.000000000 +0200
</span> @@ -0,0 +1,130 @@
+Notes:
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,8 +131,8 @@
</span> + (tasota@gmail.com) an NSF REU grant recipient for 2013.
+ This work was financed, in part, by Cisco System, Inc., the National
+ Library of Medicine, and the National Science Foundation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.in 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.in 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.in 2019-10-17 01:16:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in 2019-10-17 01:17:02.000000000 +0200
</span> @@ -43,7 +43,7 @@ LD=@LD@
CFLAGS=@CFLAGS@
OBJCFLAGS=@OBJCFLAGS@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,8 +151,8 @@
</span> compat.o fatal.o hostfile.o \
log.o match.o moduli.o nchan.o packet.o \
readpass.o ttymodes.o xmalloc.o addrmatch.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/auth2.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth2.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth2.c 2019-10-17 01:16:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth2.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -58,6 +58,7 @@
#endif
#include "monitor_wrap.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,8 +182,8 @@
</span> debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
if ((style = strchr(user, ':')) != NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/canohost.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/canohost.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/canohost.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/canohost.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -19,7 +19,7 @@ char *get_peer_ipaddr(int);
int get_peer_port(int);
char *get_local_ipaddr(int);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,8 +193,8 @@
</span>
#endif /* _CANOHOST_H */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/channels.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/channels.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/channels.c 2019-10-17 01:16:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/channels.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -220,6 +220,9 @@ static int rdynamic_connect_finish(struc
/* Setup helper */
static void channel_handler_init(struct ssh_channels *sc);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -356,8 +356,8 @@
</span> nc->single_connection = single_connection;
(*chanids)[n] = nc->self;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/channels.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/channels.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/channels.h 2019-10-17 01:16:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/channels.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -150,8 +150,10 @@ struct Channel {
u_int local_window_max;
u_int local_consumed;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -378,7 +378,7 @@
</span> +
#endif
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cipher-ctr-mt.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cipher-ctr-mt.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -0,0 +1,660 @@
+/*
+ * OpenSSH Multi-threaded AES-CTR Cipher
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1040,8 +1040,8 @@
</span> +}
+
+#endif /* defined(WITH_OPENSSL) */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cipher.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cipher.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cipher.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cipher.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -51,6 +51,9 @@
#include "openbsd-compat/openssl-compat.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1114,8 +1114,8 @@
</span> free(cipher_list);
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cipher.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cipher.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cipher.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cipher.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -50,7 +50,9 @@
struct sshcipher;
struct sshcipher_ctx;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1136,8 +1136,8 @@
</span>
u_int cipher_ctx_is_plaintext(struct sshcipher_ctx *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/clientloop.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/clientloop.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clientloop.c 2019-10-17 01:16:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clientloop.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -1619,9 +1619,11 @@ client_request_x11(struct ssh *ssh, cons
sock = x11_connect_display(ssh);
if (sock < 0)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1183,8 +1183,8 @@
</span> #if defined(SSH_TUN_FILTER)
if (options.tun_open == SSH_TUNMODE_POINTOPOINT)
channel_register_filter(ssh, c->self, sys_tun_infilter,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/compat.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/compat.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compat.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compat.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -150,6 +150,13 @@ compat_datafellows(const char *version)
debug("match: %s pat %s compat 0x%08x",
version, check[i].pat, check[i].bugs);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1199,8 +1199,8 @@
</span> return check[i].bugs;
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/compat.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/compat.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/compat.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/compat.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -62,6 +62,7 @@
#define SSH_BUG_CURVE25519PAD 0x10000000
#define SSH_BUG_HOSTKEYS 0x20000000
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1209,8 +1209,8 @@
</span>
u_int compat_datafellows(const char *);
int proto_spec(const char *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/kex.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kex.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kex.c 2019-10-17 01:16:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kex.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -58,6 +58,7 @@
#include "ssherr.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1267,8 +1267,8 @@
</span> }
need = dh_need = 0;
for (mode = 0; mode < MODE_MAX; mode++) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/log.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/log.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/log.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/log.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -46,6 +46,12 @@
#include <syslog.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1282,8 +1282,8 @@
</span> #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
# include <vis.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/packet.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/packet.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/packet.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/packet.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -265,6 +265,9 @@ ssh_alloc_session_state(void)
return NULL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1426,8 +1426,8 @@
</span> +{
+ return ssh->state->send_context;
+}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/packet.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/packet.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/packet.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/packet.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -86,6 +86,11 @@ struct ssh {
/* APP data */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1463,8 +1463,8 @@
</span>
/* new API */
int sshpkt_start(struct ssh *ssh, u_char type);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/progressmeter.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/progressmeter.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/progressmeter.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/progressmeter.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -68,6 +68,8 @@ static const char *file; /* name of the
static off_t start_pos; /* initial position of transfer */
static off_t end_pos; /* ending position of transfer */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1526,8 +1526,8 @@
</span> }
/*ARGSUSED*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/readconf.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.c 2019-10-12 13:10:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.c 2019-10-17 01:16:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -67,6 +67,7 @@
#include "uidswap.h"
#include "myproposal.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1669,8 +1669,8 @@
</span> if (options->control_master == -1)
options->control_master = 0;
if (options->control_persist == -1) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/readconf.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.h 2019-10-17 01:16:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -50,6 +50,10 @@ typedef struct {
int strict_host_key_checking; /* Strict host key checking. */
int compression; /* Compress packets in both directions. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1694,8 +1694,8 @@
</span> int no_host_authentication_for_localhost;
int identities_only;
int server_alive_interval;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sandbox-seccomp-filter.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sandbox-seccomp-filter.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sandbox-seccomp-filter.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sandbox-seccomp-filter.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -203,6 +203,9 @@ static const struct sock_filter preauth_
#ifdef __NR_geteuid32
SC_ALLOW(__NR_geteuid32),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1716,8 +1716,8 @@
</span> #ifdef __NR_time
SC_ALLOW(__NR_time),
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/scp.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/scp.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/scp.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scp.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -1066,7 +1066,7 @@ source(int argc, char **argv)
off_t i, statbytes;
size_t amt, nr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1727,8 +1727,8 @@
</span> int len;
for (indx = 0; indx < argc; ++indx) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/servconf.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/servconf.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/servconf.c 2019-10-17 01:16:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/servconf.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -64,6 +64,7 @@
#include "auth.h"
#include "myproposal.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1867,8 +1867,8 @@
</span> case sHostbasedAuthentication:
intptr = &options->hostbased_authentication;
goto parse_flag;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/servconf.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/servconf.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/servconf.h 2019-10-17 01:16:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/servconf.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -183,6 +183,11 @@ typedef struct {
char *adm_forced_command;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1881,8 +1881,8 @@
</span>
int permit_tun;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/serverloop.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/serverloop.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/serverloop.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/serverloop.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -343,6 +343,7 @@ process_input(struct ssh *ssh, fd_set *r
!= 0)
fatal("%s: ssh_packet_process_incoming: %s",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1926,8 +1926,8 @@
</span> if (session_open(the_authctxt, c->self) != 1) {
debug("session open failed, free channel %d", c->self);
channel_free(ssh, c);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/serverloop.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/serverloop.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/serverloop.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/serverloop.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -20,7 +20,6 @@
*/
#ifndef SERVERLOOP_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1936,8 +1936,8 @@
</span> struct ssh;
void server_loop2(struct ssh *, Authctxt *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/session.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/session.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/session.c 2019-10-17 01:16:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -97,6 +97,7 @@
#include "sftp.h"
#include "atomicio.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1988,8 +1988,8 @@
</span> }
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sftp.1 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sftp.1 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sftp.1 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sftp.1 2019-10-17 01:17:02.000000000 +0200
</span> @@ -286,7 +286,8 @@ diagnostic messages from
Specify how many requests may be outstanding at any one time.
Increasing this may slightly improve file transfer speed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2000,8 +2000,8 @@
</span> .It Fl r
Recursively copy entire directories when uploading and downloading.
Note that
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sftp.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sftp.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sftp.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sftp.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -71,7 +71,7 @@ typedef void EditLine;
#include "sftp-client.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2011,8 +2011,8 @@
</span>
/* File to read commands from */
FILE* infile;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh.c 2019-10-17 01:16:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -960,6 +960,10 @@ main(int ac, char **av)
break;
case 'T':
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2162,8 +2162,8 @@
</span> /* XXX should be pre-session */
if (!options.control_persist)
ssh_init_stdio_forwarding(ssh);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh_api.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh_api.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_api.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_api.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -389,7 +389,10 @@ _ssh_read_banner(struct ssh *ssh, struct
}
debug("Remote protocol version %d.%d, remote software version %.100s",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2176,8 +2176,8 @@
</span> ssh->compat = compat_datafellows(remote_version);
if (remote_major == 1 && remote_minor == 99) {
remote_major = 2;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh_api.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh_api.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_api.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_api.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -29,6 +29,7 @@
#include "ssh.h"
#include "ssh2.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2186,8 +2186,8 @@
</span>
struct kex_params {
char *proposal[PROPOSAL_MAX];
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshbuf.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshbuf.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshbuf.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshbuf.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -28,7 +28,7 @@
# endif /* OPENSSL_HAS_ECC */
#endif /* WITH_OPENSSL */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2197,8 +2197,8 @@
</span> #define SSHBUF_REFS_MAX 0x100000 /* Max child buffers */
#define SSHBUF_MAX_BIGNUM (16384 / 8) /* Max bignum *bytes* */
#define SSHBUF_MAX_ECPOINT ((528 * 2 / 8) + 1) /* Max EC point *bytes* */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshconnect.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshconnect.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -359,6 +359,30 @@ check_ifaddrs(const char *ifname, int af
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2240,8 +2240,8 @@
</span> /* Bind the socket to an alternative local IP address */
if (options.bind_address == NULL && options.bind_interface == NULL)
return sock;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshconnect2.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect2.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshconnect2.c 2019-10-17 01:16:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -88,6 +88,13 @@ extern char *server_version_string;
extern Options options;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2322,8 +2322,8 @@
</span> debug("Authentication succeeded (%s).", authctxt.method->name);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshd.c 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd.c 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd.c 2019-10-17 01:16:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd.c 2019-10-17 01:17:02.000000000 +0200
</span> @@ -957,6 +957,8 @@ listen_on_addrs(struct listenaddr *la)
int ret, listen_sock;
struct addrinfo *ai;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2425,9 +2425,9 @@
</span> myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
options.kex_algorithms);
myproposal[PROPOSAL_ENC_ALGS_CTOS] = compat_cipher_proposal(
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshd_config 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd_config 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,6 +108,19 @@ AuthorizedKeysFile .ssh/authorized_keys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd_config 2019-10-17 01:17:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd_config 2019-10-17 01:17:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,6 +111,19 @@ AcceptEnv LANG LC_*
</span> # override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2447,8 +2447,8 @@
</span> # Example of overriding settings on a per-user basis
#Match User anoncvs
# X11Forwarding no
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/version.h 2019-10-12 13:09:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/version.h 2019-10-12 13:09:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/version.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/version.h 2019-10-17 01:17:02.000000000 +0200
</span> @@ -3,4 +3,5 @@
#define SSH_VERSION "OpenSSH_8.1"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/series b/net/openssh/files/series
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bc7b76..69de532 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/series
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/series
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,4 +3,5 @@ pam.patch
</span> patch-sandbox-darwin.c-apple-sandbox-named-external.diff
patch-sshd.c-apple-sandbox-named-external.diff
0002-Apple-keychain-integration-other-changes.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+macports-config.patch
</span> openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/series-gsskex b/net/openssh/files/series-gsskex
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bc7b76..69de532 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/series-gsskex
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/series-gsskex
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,4 +3,5 @@ pam.patch
</span> patch-sandbox-darwin.c-apple-sandbox-named-external.diff
patch-sshd.c-apple-sandbox-named-external.diff
0002-Apple-keychain-integration-other-changes.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+macports-config.patch
</span> openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/series-hpn b/net/openssh/files/series-hpn
</span><span style='display:block; white-space:pre;color:#808080;'>index 05220f4..1df3fce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/series-hpn
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/series-hpn
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,5 +3,6 @@ pam.patch
</span> patch-sandbox-darwin.c-apple-sandbox-named-external.diff
patch-sshd.c-apple-sandbox-named-external.diff
0002-Apple-keychain-integration-other-changes.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+macports-config.patch
</span> openssh-8.1p1-hpnssh14v18.diff
openssh-8.1p1-hpnssh14v18-openssl-1.1.diff
</pre><pre style='margin:0'>
</pre>