<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/8c4219338b6d41eda79cd95fb2f2d5974c937592">https://github.com/macports/macports-ports/commit/8c4219338b6d41eda79cd95fb2f2d5974c937592</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8c4219338b6d41eda79cd95fb2f2d5974c937592
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Thu Oct 17 00:53:22 2019 +0200

<span style='display:block; white-space:pre;color:#404040;'>    net/openssh: fix building on Darwin 15 - 19 / 10.11 - 10.15.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Turns out that we do indeed need some definitions from SecItemPriv.h for
</span><span style='display:block; white-space:pre;color:#404040;'>    newer OS X/macOS releases. Whoops.
</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/59349
</span>---
 ...-Apple-keychain-integration-other-changes.patch |  75 +++++++---
 ...ssh-8.1p1-gsskex-all-20141021-mp-20191015.patch | 158 ++++++++++-----------
 2 files changed, 132 insertions(+), 101 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch b/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b53b789..eac0a2a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
</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/keychain.m        2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.m   2019-10-17 00:34:43.000000000 +0200
</span> @@ -0,0 +1,241 @@
 +/*
 + * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,7 +243,7 @@
</span> + return ret;
 +}
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/keychain.h        2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.h   2019-10-17 00:34:43.000000000 +0200
</span> @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -282,7 +282,7 @@
</span> +char     *keychain_read_passphrase(const char *filename);
 +int   load_identities_from_keychain(int (^add_identity)(const char *identity));
 --- a/Makefile.in      2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.in       2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in  2019-10-17 00:34:43.000000000 +0200
</span> @@ -41,6 +41,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
  CC=@CC@
  LD=@LD@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,7 +353,7 @@
</span>  ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o sshsig.o
        $(LD) -o $@ ssh-keygen.o sshsig.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 --- a/audit-bsm.c      2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/audit-bsm.c       2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/audit-bsm.c  2019-10-17 00:34:43.000000000 +0200
</span> @@ -62,6 +62,15 @@
  #include <bsm/audit_record.h>
  #include <locale.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -389,7 +389,7 @@
</span>           info.ai_auid = the_authctxt->pw->pw_uid;
        else
 --- a/configure.ac     2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac      2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac 2019-10-17 00:34:43.000000000 +0200
</span> @@ -20,6 +20,7 @@ AC_LANG([C])
  
  AC_CONFIG_HEADER([config.h])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,7 +451,7 @@
</span>  dnl Add now.
  CFLAGS="$CFLAGS $werror_flags"
 --- a/groupaccess.c    2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/groupaccess.c     2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/groupaccess.c        2019-10-17 00:34:43.000000000 +0200
</span> @@ -39,6 +39,10 @@
  #include "match.h"
  #include "log.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,7 +491,7 @@
</span>   for (i = 0, j = 0; i < ngroups; i++)
                if ((gr = getgrgid(groups_bygid[i])) != NULL)
 --- a/readconf.c       2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.c        2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c   2019-10-17 00:34:43.000000000 +0200
</span> @@ -167,6 +167,9 @@ typedef enum {
        oHashKnownHosts,
        oTunnel, oTunnelDevice,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,7 +548,7 @@
</span>  
  struct fwdarg {
 --- a/readconf.h       2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.h        2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h   2019-10-17 00:34:43.000000000 +0200
</span> @@ -137,6 +137,9 @@ typedef struct {
        char    *local_command;
        int     permit_local_command;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -560,7 +560,7 @@
</span>  
        int     request_tty;
 --- a/session.c        2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/session.c 2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c    2019-10-17 00:34:43.000000000 +0200
</span> @@ -1185,6 +1185,21 @@ do_setup_env(struct ssh *ssh, Session *s
                child_set_env(&env, &envsize, "SSH_ORIGINAL_COMMAND",
                    original_command);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -584,7 +584,7 @@
</span>           /* dump the environment */
                fprintf(stderr, "Environment:\n");
 --- a/ssh-add.0        2019-10-09 02:39:14.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.0 2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.0    2019-10-17 00:34:43.000000000 +0200
</span> @@ -4,7 +4,7 @@ NAME
       ssh-add M-bM-^@M-^S adds private key identities to the authentication agent
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -616,7 +616,7 @@
</span>               plain private keys only and skip certificates.
  
 --- a/ssh-add.1        2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.1 2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.1    2019-10-17 00:34:43.000000000 +0200
</span> @@ -43,7 +43,7 @@
  .Nd adds private key identities to the authentication agent
  .Sh SYNOPSIS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -648,7 +648,7 @@
</span>  When loading keys into or deleting keys from the agent, process plain private
  keys only and skip certificates.
 --- a/ssh-add.c        2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.c 2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.c    2019-10-17 00:34:43.000000000 +0200
</span> @@ -67,6 +67,11 @@
  #include "ssherr.h"
  #include "digest.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -725,7 +725,7 @@
</span>  
  int
 --- a/ssh-agent.c      2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.c       2019-10-16 10:34:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.c  2019-10-17 00:34:44.000000000 +0200
</span> @@ -70,6 +70,10 @@
  #include <time.h>
  #include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -877,7 +877,7 @@
</span>           parent_alive_interval = 10;
        idtab_init();
 --- a/sshconnect2.c    2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect2.c     2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c        2019-10-17 00:34:44.000000000 +0200
</span> @@ -73,6 +73,11 @@
  #include "ssherr.h"
  #include "utf8.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -919,7 +919,7 @@
</span>               !(id->key && id->isprivate))
                        maybe_add_key_to_agent(id->filename, private, comment,
 --- a/ssh-agent.0      2019-10-09 02:39:14.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.0       2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.0  2019-10-17 00:34:44.000000000 +0200
</span> @@ -7,6 +7,7 @@ SYNOPSIS
       ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]
                 [-P pkcs11_whitelist] [-t life] [command [arg ...]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -939,7 +939,7 @@
</span>       agent.  When the command dies, so does the agent.
  
 --- a/ssh-agent.1      2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.1       2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.1  2019-10-17 00:34:44.000000000 +0200
</span> @@ -52,6 +52,8 @@
  .Nm ssh-agent
  .Op Fl c | s
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -961,8 +961,8 @@
</span>  .Pp
  If a command line is given, this is executed as a subprocess of the agent.
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/SecItemPriv-shim.h        2019-10-16 10:32:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/SecItemPriv-shim.h   2019-10-17 00:41:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,83 @@
</span> +/*
 + * Copyright (c) 2006-2013 Apple Inc. All Rights Reserved.
 + *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1008,10 +1008,41 @@
</span> +    We cannot, however, make sure that the declarations in here are actually
 +    defined in the Security Framework binaries/libraries themselves, so
 +    building this part, especially on older systems, might still fail.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    Luckily, we currently don't need anything out of that private header file,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    so Apple using it to build their keychain integration looks more like an
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    error than actual intent.
</span> +    ====== MACPORTS NOTICE ======
 +*/
 +
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _SECURITY_SECITEMPRIV_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _SECURITY_SECITEMPRIV_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CoreFoundation/CFDictionary.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CoreFoundation/CFData.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CoreFoundation/CFError.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Security/SecBase.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <xpc/xpc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Security/SecTask.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++__BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    @enum Attribute Key Constants (Private)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    @discussion Predefined item attribute keys used to get or set values in a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        dictionary. Not all attributes apply to each item class. The table
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        below lists the currently defined attributes for each item class:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        @constant kSecAttrNoLegacy Specifies a dictionary key whose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        value is a CFBooleanRef indicating that the query must be run on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        syncable backend even for non syncable items.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ((defined (MAC_OS_X_VERSION_10_11)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const CFStringRef kSecAttrNoLegacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    __OSX_AVAILABLE(10.11) __IOS_AVAILABLE(9.3) __TVOS_AVAILABLE(9.3) __WATCHOS_AVAILABLE(2.3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ((defined (MAC_OS_X_VERSION_10_11)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11)) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++__END_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* !_SECURITY_SECITEMPRIV_H_ */
</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 e65a990..9a883e1 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-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ChangeLog.gssapi     2019-10-17 00:58:02.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-16 06:22:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.in  2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.in  2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in  2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth-krb5.c  2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth-krb5.c  2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth-krb5.c  2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth2-gss.c  2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth2-gss.c  2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth2-gss.c  2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth2.c      2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth2.c      2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth2.c      2019-10-17 00:58:02.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-16 06:22:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/clientloop.c 2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/clientloop.c 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/clientloop.c 2019-10-17 00:58:02.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-09 02:39:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/config.h.in  2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/config.h.in  2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/config.h.in  2019-10-17 00:58:02.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-16 06:22:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac 2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac 2019-10-17 00:58:02.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;'>@@ -477,10 +477,10 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> +         [AC_MSG_RESULT([no])]
 +      )
        m4_pattern_allow([AU_IPv])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        AC_CHECK_DECL([AU_IPv4], [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gss-genr.c   2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gss-genr.c   2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_CHECK_DECL([AU_IPv4],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       AC_DEFINE([LASTLOG_WRITE_PUTUTXLINE], [1],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gss-genr.c   2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gss-genr.c   2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gss-serv-krb5.c      2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gss-serv-krb5.c      2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gss-serv-krb5.c      2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gss-serv.c   2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/gss-serv.c   2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/gss-serv.c   2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kex.c        2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kex.c        2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kex.c        2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kex.h        2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kex.h        2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kex.h        2019-10-17 00:58:02.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-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexgssc.c    2019-10-17 00:58:02.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-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexgsss.c    2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor.c    2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor.c    2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor.c    2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor.h    2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor.h    2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor.h    2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor_wrap.c       2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor_wrap.c       2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor_wrap.c       2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/monitor_wrap.h       2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/monitor_wrap.h       2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/monitor_wrap.h       2019-10-17 00:58:02.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-16 06:22:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.c   2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.c   2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c   2019-10-17 00:58:02.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-16 06:22:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.h   2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.h   2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h   2019-10-17 00:58:02.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-16 06:22:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/servconf.c   2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/servconf.c   2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/servconf.c   2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/servconf.h   2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/servconf.h   2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/servconf.h   2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-gss.h    2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-gss.h    2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-gss.h    2019-10-17 00:58:02.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,8 +2969,8 @@ 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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh_config   2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_config   2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_config   2019-10-17 00:58:02.000000000 +0200
</span> @@ -24,6 +24,8 @@
  #   HostbasedAuthentication no
  #   GSSAPIAuthentication no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2980,8 +2980,8 @@ 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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh_config.5 2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_config.5 2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_config.5 2019-10-17 00:58:02.000000000 +0200
</span> @@ -1,4 +1,4 @@
 -.\"
 +kex-gss\n.\"
<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-16 06:22:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect2.c        2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshconnect2.c        2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c        2019-10-17 00:58:02.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-16 06:22:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd.c       2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd.c       2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd.c       2019-10-17 00:58:02.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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd_config  2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd_config  2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd_config  2019-10-17 00:58:02.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,8 +3463,8 @@ 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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshd_config.5        2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshd_config.5        2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshd_config.5        2019-10-17 00:58:02.000000000 +0200
</span> @@ -650,6 +650,11 @@ The default is
  Specifies whether user authentication based on GSSAPI is allowed.
  The default is
<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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshkey.c     2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshkey.c     2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshkey.c     2019-10-17 00:58: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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshkey.h     2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshkey.h     2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshkey.h     2019-10-17 00:58: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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth.c       2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth.c       2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth.c       2019-10-17 00:58: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-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth-compat.c        2019-10-17 00:58: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-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth-compat.h        2019-10-17 00:58: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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth.h       2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth.h       2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth.h       2019-10-17 00:58: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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kexdh.c      2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kexdh.c      2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexdh.c      2019-10-17 00:58: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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/kexgen.c     2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/kexgen.c     2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/kexgen.c     2019-10-17 00:58: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-16 06:22:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/session.c    2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/session.c    2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c    2019-10-17 00:58: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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh.1        2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh.1        2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh.1        2019-10-17 00:58: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-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh.c        2019-10-16 06:45:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh.c        2019-10-17 00:56:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh.c        2019-10-17 00:58:02.000000000 +0200
</span> @@ -736,6 +736,8 @@ main(int ac, char **av)
                                cp = mac_alg_list('\n');
                        else if (strcmp(optarg, "kex") == 0)
</pre><pre style='margin:0'>

</pre>