1 files changed, 346 insertions, 105 deletions

diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch
index fd3b9b630..8e946aa88 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -1,4 +1,4 @@
-From 8c27af53099b50387dda97c0aae36194197186f6 Mon Sep 17 00:00:00 2001
+From eecddf8b72fcad83ccca43b1badb03782704f6b7 Mon Sep 17 00:00:00 2001
 From: Simon Wilkinson <simon@sxw.org.uk>
 Date: Sun, 9 Feb 2014 16:09:48 +0000
 Subject: GSSAPI key exchange support
@@ -17,26 +17,28 @@ have it merged into the main openssh package rather than having separate
 security history.
 
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242
-Last-Updated: 2016-03-21
+Last-Updated: 2016-08-07
 
 Patch-Name: gssapi.patch
 ---
  ChangeLog.gssapi | 113 +++++++++++++++++++
  Makefile.in      |   3 +-
  auth-krb5.c      |  17 ++-
- auth.c           |   3 +-
+ auth.c           |  96 +---------------
  auth2-gss.c      |  48 +++++++-
  auth2.c          |   2 +
+ canohost.c       |  93 +++++++++++++++
+ canohost.h       |   3 +
  clientloop.c     |  15 ++-
  config.h.in      |   6 +
  configure.ac     |  24 ++++
- gss-genr.c       | 275 ++++++++++++++++++++++++++++++++++++++++++++-
+ gss-genr.c       | 275 +++++++++++++++++++++++++++++++++++++++++++-
  gss-serv-krb5.c  |  85 ++++++++++++--
  gss-serv.c       | 185 +++++++++++++++++++++++++++---
- kex.c            |  16 +++
+ kex.c            |  19 ++++
  kex.h            |  14 +++
- kexgssc.c        | 336 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- kexgsss.c        | 294 ++++++++++++++++++++++++++++++++++++++++++++++++
+ kexgssc.c        | 338 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ kexgsss.c        | 295 ++++++++++++++++++++++++++++++++++++++++++++++++
  monitor.c        | 108 +++++++++++++++++-
  monitor.h        |   3 +
  monitor_wrap.c   |  47 +++++++-
@@ -48,13 +50,13 @@ Patch-Name: gssapi.patch
  ssh-gss.h        |  41 ++++++-
  ssh_config       |   2 +
  ssh_config.5     |  32 ++++++
- sshconnect2.c    | 120 +++++++++++++++++++-
+ sshconnect2.c    | 122 +++++++++++++++++++-
  sshd.c           | 110 ++++++++++++++++++
  sshd_config      |   2 +
  sshd_config.5    |  10 ++
  sshkey.c         |   3 +-
  sshkey.h         |   1 +
- 33 files changed, 1950 insertions(+), 46 deletions(-)
+ 35 files changed, 2054 insertions(+), 139 deletions(-)
  create mode 100644 ChangeLog.gssapi
  create mode 100644 kexgssc.c
  create mode 100644 kexgsss.c
@@ -179,7 +181,7 @@ index 0000000..f117a33
 +    (from jbasney AT ncsa.uiuc.edu)
 +    <gssapi-with-mic support is Bugzilla #1008>
 diff --git a/Makefile.in b/Makefile.in
-index d401787..0954c63 100644
+index 12991cd..51817df 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -92,6 +92,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
@@ -187,7 +189,7 @@ index d401787..0954c63 100644
         kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
         kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
 +       kexgssc.o \
-        platform-pledge.o
+        platform-pledge.o platform-tracing.o
  
  SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
 @@ -105,7 +106,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
@@ -200,10 +202,10 @@ index d401787..0954c63 100644
         sftp-server.o sftp-common.o \
         sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
 diff --git a/auth-krb5.c b/auth-krb5.c
-index d1c5a2f..f019fb1 100644
+index a5a81ed..38e7fee 100644
 --- a/auth-krb5.c
 +++ b/auth-krb5.c
-@@ -183,8 +183,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
+@@ -182,8 +182,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
  
         len = strlen(authctxt->krb5_ticket_file) + 6;
         authctxt->krb5_ccname = xmalloc(len);
@@ -217,7 +219,7 @@ index d1c5a2f..f019fb1 100644
  
  #ifdef USE_PAM
         if (options.use_pam)
-@@ -241,15 +246,22 @@ krb5_cleanup_proc(Authctxt *authctxt)
+@@ -240,15 +245,22 @@ krb5_cleanup_proc(Authctxt *authctxt)
  #ifndef HEIMDAL
  krb5_error_code
  ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
@@ -242,7 +244,7 @@ index d1c5a2f..f019fb1 100644
         old_umask = umask(0177);
         tmpfd = mkstemp(ccname + strlen("FILE:"));
         oerrno = errno;
-@@ -266,6 +278,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
+@@ -265,6 +277,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
                 return oerrno;
         }
         close(tmpfd);
@@ -251,10 +253,10 @@ index d1c5a2f..f019fb1 100644
         return (krb5_cc_resolve(ctx, ccname, ccache));
  }
 diff --git a/auth.c b/auth.c
-index 214c2c7..bd6a026 100644
+index 24527dd..f56dcc6 100644
 --- a/auth.c
 +++ b/auth.c
-@@ -354,7 +354,8 @@ auth_root_allowed(const char *method)
+@@ -363,7 +363,8 @@ auth_root_allowed(const char *method)
         case PERMIT_NO_PASSWD:
                 if (strcmp(method, "publickey") == 0 ||
                     strcmp(method, "hostbased") == 0 ||
@@ -264,6 +266,106 @@ index 214c2c7..bd6a026 100644
                         return 1;
                 break;
         case PERMIT_FORCED_ONLY:
+@@ -786,99 +787,6 @@ fakepw(void)
+ }
+ 
+ /*
+- * Returns the remote DNS hostname as a string. The returned string must not
+- * be freed. NB. this will usually trigger a DNS query the first time it is
+- * called.
+- * This function does additional checks on the hostname to mitigate some
+- * attacks on legacy rhosts-style authentication.
+- * XXX is RhostsRSAAuthentication vulnerable to these?
+- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
+- */
+-
+-static char *
+-remote_hostname(struct ssh *ssh)
+-{
+-       struct sockaddr_storage from;
+-       socklen_t fromlen;
+-       struct addrinfo hints, *ai, *aitop;
+-       char name[NI_MAXHOST], ntop2[NI_MAXHOST];
+-       const char *ntop = ssh_remote_ipaddr(ssh);
+-
+-       /* Get IP address of client. */
+-       fromlen = sizeof(from);
+-       memset(&from, 0, sizeof(from));
+-       if (getpeername(ssh_packet_get_connection_in(ssh),
+-           (struct sockaddr *)&from, &fromlen) < 0) {
+-               debug("getpeername failed: %.100s", strerror(errno));
+-               return strdup(ntop);
+-       }
+-
+-       ipv64_normalise_mapped(&from, &fromlen);
+-       if (from.ss_family == AF_INET6)
+-               fromlen = sizeof(struct sockaddr_in6);
+-
+-       debug3("Trying to reverse map address %.100s.", ntop);
+-       /* Map the IP address to a host name. */
+-       if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
+-           NULL, 0, NI_NAMEREQD) != 0) {
+-               /* Host name not found.  Use ip address. */
+-               return strdup(ntop);
+-       }
+-
+-       /*
+-        * if reverse lookup result looks like a numeric hostname,
+-        * someone is trying to trick us by PTR record like following:
+-        *      1.1.1.10.in-addr.arpa.  IN PTR  2.3.4.5
+-        */
+-       memset(&hints, 0, sizeof(hints));
+-       hints.ai_socktype = SOCK_DGRAM; /*dummy*/
+-       hints.ai_flags = AI_NUMERICHOST;
+-       if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
+-               logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
+-                   name, ntop);
+-               freeaddrinfo(ai);
+-               return strdup(ntop);
+-       }
+-
+-       /* Names are stored in lowercase. */
+-       lowercase(name);
+-
+-       /*
+-        * Map it back to an IP address and check that the given
+-        * address actually is an address of this host.  This is
+-        * necessary because anyone with access to a name server can
+-        * define arbitrary names for an IP address. Mapping from
+-        * name to IP address can be trusted better (but can still be
+-        * fooled if the intruder has access to the name server of
+-        * the domain).
+-        */
+-       memset(&hints, 0, sizeof(hints));
+-       hints.ai_family = from.ss_family;
+-       hints.ai_socktype = SOCK_STREAM;
+-       if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
+-               logit("reverse mapping checking getaddrinfo for %.700s "
+-                   "[%s] failed.", name, ntop);
+-               return strdup(ntop);
+-       }
+-       /* Look for the address from the list of addresses. */
+-       for (ai = aitop; ai; ai = ai->ai_next) {
+-               if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
+-                   sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
+-                   (strcmp(ntop, ntop2) == 0))
+-                               break;
+-       }
+-       freeaddrinfo(aitop);
+-       /* If we reached the end of the list, the address was not there. */
+-       if (ai == NULL) {
+-               /* Address not found for the host name. */
+-               logit("Address %.100s maps to %.600s, but this does not "
+-                   "map back to the address.", ntop, name);
+-               return strdup(ntop);
+-       }
+-       return strdup(name);
+-}
+-
+-/*
+  * Return the canonical name of the host in the other side of the current
+  * connection.  The host name is cached, so it is efficient to call this
+  * several times.
 diff --git a/auth2-gss.c b/auth2-gss.c
 index 1ca8357..3b5036d 100644
 --- a/auth2-gss.c
@@ -352,7 +454,7 @@ index 1ca8357..3b5036d 100644
         "gssapi-with-mic",
         userauth_gssapi,
 diff --git a/auth2.c b/auth2.c
-index 7177962..3f49bdc 100644
+index 9108b86..ce0d376 100644
 --- a/auth2.c
 +++ b/auth2.c
 @@ -70,6 +70,7 @@ extern Authmethod method_passwd;
@@ -371,8 +473,126 @@ index 7177962..3f49bdc 100644
         &method_gssapi,
  #endif
         &method_passwd,
+diff --git a/canohost.c b/canohost.c
+index f71a085..404731d 100644
+--- a/canohost.c
++++ b/canohost.c
+@@ -35,6 +35,99 @@
+ #include "canohost.h"
+ #include "misc.h"
+ 
++/*
++ * Returns the remote DNS hostname as a string. The returned string must not
++ * be freed. NB. this will usually trigger a DNS query the first time it is
++ * called.
++ * This function does additional checks on the hostname to mitigate some
++ * attacks on legacy rhosts-style authentication.
++ * XXX is RhostsRSAAuthentication vulnerable to these?
++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
++ */
++
++char *
++remote_hostname(struct ssh *ssh)
++{
++       struct sockaddr_storage from;
++       socklen_t fromlen;
++       struct addrinfo hints, *ai, *aitop;
++       char name[NI_MAXHOST], ntop2[NI_MAXHOST];
++       const char *ntop = ssh_remote_ipaddr(ssh);
++
++       /* Get IP address of client. */
++       fromlen = sizeof(from);
++       memset(&from, 0, sizeof(from));
++       if (getpeername(ssh_packet_get_connection_in(ssh),
++           (struct sockaddr *)&from, &fromlen) < 0) {
++               debug("getpeername failed: %.100s", strerror(errno));
++               return strdup(ntop);
++       }
++
++       ipv64_normalise_mapped(&from, &fromlen);
++       if (from.ss_family == AF_INET6)
++               fromlen = sizeof(struct sockaddr_in6);
++
++       debug3("Trying to reverse map address %.100s.", ntop);
++       /* Map the IP address to a host name. */
++       if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
++           NULL, 0, NI_NAMEREQD) != 0) {
++               /* Host name not found.  Use ip address. */
++               return strdup(ntop);
++       }
++
++       /*
++        * if reverse lookup result looks like a numeric hostname,
++        * someone is trying to trick us by PTR record like following:
++        *      1.1.1.10.in-addr.arpa.  IN PTR  2.3.4.5
++        */
++       memset(&hints, 0, sizeof(hints));
++       hints.ai_socktype = SOCK_DGRAM; /*dummy*/
++       hints.ai_flags = AI_NUMERICHOST;
++       if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
++               logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
++                   name, ntop);
++               freeaddrinfo(ai);
++               return strdup(ntop);
++       }
++
++       /* Names are stored in lowercase. */
++       lowercase(name);
++
++       /*
++        * Map it back to an IP address and check that the given
++        * address actually is an address of this host.  This is
++        * necessary because anyone with access to a name server can
++        * define arbitrary names for an IP address. Mapping from
++        * name to IP address can be trusted better (but can still be
++        * fooled if the intruder has access to the name server of
++        * the domain).
++        */
++       memset(&hints, 0, sizeof(hints));
++       hints.ai_family = from.ss_family;
++       hints.ai_socktype = SOCK_STREAM;
++       if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
++               logit("reverse mapping checking getaddrinfo for %.700s "
++                   "[%s] failed.", name, ntop);
++               return strdup(ntop);
++       }
++       /* Look for the address from the list of addresses. */
++       for (ai = aitop; ai; ai = ai->ai_next) {
++               if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
++                   sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
++                   (strcmp(ntop, ntop2) == 0))
++                               break;
++       }
++       freeaddrinfo(aitop);
++       /* If we reached the end of the list, the address was not there. */
++       if (ai == NULL) {
++               /* Address not found for the host name. */
++               logit("Address %.100s maps to %.600s, but this does not "
++                   "map back to the address.", ntop, name);
++               return strdup(ntop);
++       }
++       return strdup(name);
++}
++
+ void
+ ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
+ {
+diff --git a/canohost.h b/canohost.h
+index 26d6285..0cadc9f 100644
+--- a/canohost.h
++++ b/canohost.h
+@@ -15,6 +15,9 @@
+ #ifndef _CANOHOST_H
+ #define _CANOHOST_H
+ 
++struct ssh;
++
++char           *remote_hostname(struct ssh *);
+ char           *get_peer_ipaddr(int);
+ int             get_peer_port(int);
+ char           *get_local_ipaddr(int);
 diff --git a/clientloop.c b/clientloop.c
-index 9820455..1567e4a 100644
+index 2c44f5d..421241f 100644
 --- a/clientloop.c
 +++ b/clientloop.c
 @@ -114,6 +114,10 @@
@@ -386,7 +606,7 @@ index 9820455..1567e4a 100644
  /* import options */
  extern Options options;
  
-@@ -1662,9 +1666,18 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
+@@ -1666,9 +1670,18 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                         break;
  
                 /* Do channel operations unless rekeying in progress. */
@@ -407,10 +627,10 @@ index 9820455..1567e4a 100644
                 client_process_net_input(readset);
  
 diff --git a/config.h.in b/config.h.in
-index 89bf1b0..621c139 100644
+index 39d018f..d7caf9a 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -1641,6 +1641,9 @@
+@@ -1668,6 +1668,9 @@
  /* Use btmp to log bad logins */
  #undef USE_BTMP
  
@@ -420,7 +640,7 @@ index 89bf1b0..621c139 100644
  /* Use libedit for sftp */
  #undef USE_LIBEDIT
  
-@@ -1656,6 +1659,9 @@
+@@ -1683,6 +1686,9 @@
  /* Use PIPES instead of a socketpair() */
  #undef USE_PIPES
  
@@ -431,7 +651,7 @@ index 89bf1b0..621c139 100644
  #undef USE_SOLARIS_PRIVS
  
 diff --git a/configure.ac b/configure.ac
-index 7258cc0..5f1ff74 100644
+index 373d21b..894ec3b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -632,6 +632,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
@@ -463,7 +683,7 @@ index 7258cc0..5f1ff74 100644
 +               [AC_MSG_RESULT([no])]
 +       )
         m4_pattern_allow([AU_IPv])
-        AC_CHECK_DECL([AU_IPv4], [], 
+        AC_CHECK_DECL([AU_IPv4], [],
             AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
 diff --git a/gss-genr.c b/gss-genr.c
 index d617d60..b4eca3f 100644
@@ -1214,10 +1434,10 @@ index 53993d6..2f6baf7 100644
  
  #endif
 diff --git a/kex.c b/kex.c
-index d371f47..913e923 100644
+index 50c7a0f..c17d652 100644
 --- a/kex.c
 +++ b/kex.c
-@@ -54,6 +54,10 @@
+@@ -55,6 +55,10 @@
  #include "sshbuf.h"
  #include "digest.h"
  
@@ -1228,7 +1448,7 @@ index d371f47..913e923 100644
  #if OPENSSL_VERSION_NUMBER >= 0x00907000L
  # if defined(HAVE_EVP_SHA256)
  # define evp_ssh_sha256 EVP_sha256
-@@ -109,6 +113,14 @@ static const struct kexalg kexalgs[] = {
+@@ -113,6 +117,14 @@ static const struct kexalg kexalgs[] = {
  #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
         { NULL, -1, -1, -1},
  };
@@ -1243,7 +1463,7 @@ index d371f47..913e923 100644
  
  char *
  kex_alg_list(char sep)
-@@ -141,6 +153,10 @@ kex_alg_by_name(const char *name)
+@@ -145,6 +157,10 @@ kex_alg_by_name(const char *name)
                 if (strcmp(k->name, name) == 0)
                         return k;
         }
@@ -1254,11 +1474,21 @@ index d371f47..913e923 100644
         return NULL;
  }
  
+@@ -587,6 +603,9 @@ kex_free(struct kex *kex)
+        sshbuf_free(kex->peer);
+        sshbuf_free(kex->my);
+        free(kex->session_id);
++#ifdef GSSAPI
++       free(kex->gss_host);
++#endif /* GSSAPI */
+        free(kex->client_version_string);
+        free(kex->server_version_string);
+        free(kex->failed_choice);
 diff --git a/kex.h b/kex.h
-index 1c58966..123ef83 100644
+index c351955..8ed459a 100644
 --- a/kex.h
 +++ b/kex.h
-@@ -92,6 +92,9 @@ enum kex_exchange {
+@@ -98,6 +98,9 @@ enum kex_exchange {
         KEX_DH_GEX_SHA256,
         KEX_ECDH_SHA2,
         KEX_C25519_SHA256,
@@ -1268,7 +1498,7 @@ index 1c58966..123ef83 100644
         KEX_MAX
  };
  
-@@ -140,6 +143,12 @@ struct kex {
+@@ -146,6 +149,12 @@ struct kex {
         u_int   flags;
         int     hash_alg;
         int     ec_nid;
@@ -1281,7 +1511,7 @@ index 1c58966..123ef83 100644
         char    *client_version_string;
         char    *server_version_string;
         char    *failed_choice;
-@@ -190,6 +199,11 @@ int         kexecdh_server(struct ssh *);
+@@ -196,6 +205,11 @@ int         kexecdh_server(struct ssh *);
  int     kexc25519_client(struct ssh *);
  int     kexc25519_server(struct ssh *);
  
@@ -1290,15 +1520,15 @@ index 1c58966..123ef83 100644
 +int     kexgss_server(struct ssh *);
 +#endif
 +
- int     kex_dh_hash(const char *, const char *,
+ int     kex_dh_hash(int, const char *, const char *,
      const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
      const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
 diff --git a/kexgssc.c b/kexgssc.c
 new file mode 100644
-index 0000000..a49bac2
+index 0000000..10447f2
 --- /dev/null
 +++ b/kexgssc.c
-@@ -0,0 +1,336 @@
+@@ -0,0 +1,338 @@
 +/*
 + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
 + *
@@ -1570,7 +1800,9 @@ index 0000000..a49bac2
 +       switch (ssh->kex->kex_type) {
 +       case KEX_GSS_GRP1_SHA1:
 +       case KEX_GSS_GRP14_SHA1:
-+               kex_dh_hash( ssh->kex->client_version_string, 
++               kex_dh_hash(
++                   ssh->kex->hash_alg,
++                   ssh->kex->client_version_string,
 +                   ssh->kex->server_version_string,
 +                   buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
 +                   buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
@@ -1637,10 +1869,10 @@ index 0000000..a49bac2
 +#endif /* GSSAPI */
 diff --git a/kexgsss.c b/kexgsss.c
 new file mode 100644
-index 0000000..dd8ba1d
+index 0000000..38ca082
 --- /dev/null
 +++ b/kexgsss.c
-@@ -0,0 +1,294 @@
+@@ -0,0 +1,295 @@
 +/*
 + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
 + *
@@ -1861,6 +2093,7 @@ index 0000000..dd8ba1d
 +       case KEX_GSS_GRP1_SHA1:
 +       case KEX_GSS_GRP14_SHA1:
 +               kex_dh_hash(
++                   ssh->kex->hash_alg,
 +                   ssh->kex->client_version_string, ssh->kex->server_version_string,
 +                   buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
 +                   buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
@@ -1936,10 +2169,10 @@ index 0000000..dd8ba1d
 +}
 +#endif /* GSSAPI */
 diff --git a/monitor.c b/monitor.c
-index ac7dd30..6c82023 100644
+index cb57bd0..05bb48a 100644
 --- a/monitor.c
 +++ b/monitor.c
-@@ -156,6 +156,8 @@ int mm_answer_gss_setup_ctx(int, Buffer *);
+@@ -158,6 +158,8 @@ int mm_answer_gss_setup_ctx(int, Buffer *);
  int mm_answer_gss_accept_ctx(int, Buffer *);
  int mm_answer_gss_userok(int, Buffer *);
  int mm_answer_gss_checkmic(int, Buffer *);
@@ -1948,7 +2181,7 @@ index ac7dd30..6c82023 100644
  #endif
  
  #ifdef SSH_AUDIT_EVENTS
-@@ -233,11 +235,18 @@ struct mon_table mon_dispatch_proto20[] = {
+@@ -235,11 +237,18 @@ struct mon_table mon_dispatch_proto20[] = {
      {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx},
      {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok},
      {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic},
@@ -1967,7 +2200,7 @@ index ac7dd30..6c82023 100644
  #ifdef WITH_OPENSSL
      {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
  #endif
-@@ -352,6 +361,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
+@@ -354,6 +363,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
                 /* Permit requests for moduli and signatures */
                 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
                 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
@@ -1978,7 +2211,7 @@ index ac7dd30..6c82023 100644
         } else {
                 mon_dispatch = mon_dispatch_proto15;
  
-@@ -460,6 +473,10 @@ monitor_child_postauth(struct monitor *pmonitor)
+@@ -462,6 +475,10 @@ monitor_child_postauth(struct monitor *pmonitor)
                 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
                 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
                 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
@@ -1989,7 +2222,7 @@ index ac7dd30..6c82023 100644
         } else {
                 mon_dispatch = mon_dispatch_postauth15;
                 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
-@@ -1861,6 +1878,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
+@@ -1876,6 +1893,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
  # endif
  #endif /* WITH_OPENSSL */
                 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
@@ -2003,7 +2236,7 @@ index ac7dd30..6c82023 100644
                 kex->load_host_public_key=&get_hostkey_public_by_type;
                 kex->load_host_private_key=&get_hostkey_private_by_type;
                 kex->host_key_index=&get_hostkey_index;
-@@ -1960,6 +1984,9 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
+@@ -1975,6 +1999,9 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
         OM_uint32 major;
         u_int len;
  
@@ -2013,7 +2246,7 @@ index ac7dd30..6c82023 100644
         goid.elements = buffer_get_string(m, &len);
         goid.length = len;
  
-@@ -1987,6 +2014,9 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
+@@ -2002,6 +2029,9 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
         OM_uint32 flags = 0; /* GSI needs this */
         u_int len;
  
@@ -2023,7 +2256,7 @@ index ac7dd30..6c82023 100644
         in.value = buffer_get_string(m, &len);
         in.length = len;
         major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);
-@@ -2004,6 +2034,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
+@@ -2019,6 +2049,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
                 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
                 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
                 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
@@ -2031,7 +2264,7 @@ index ac7dd30..6c82023 100644
         }
         return (0);
  }
-@@ -2015,6 +2046,9 @@ mm_answer_gss_checkmic(int sock, Buffer *m)
+@@ -2030,6 +2061,9 @@ mm_answer_gss_checkmic(int sock, Buffer *m)
         OM_uint32 ret;
         u_int len;
  
@@ -2041,7 +2274,7 @@ index ac7dd30..6c82023 100644
         gssbuf.value = buffer_get_string(m, &len);
         gssbuf.length = len;
         mic.value = buffer_get_string(m, &len);
-@@ -2041,7 +2075,11 @@ mm_answer_gss_userok(int sock, Buffer *m)
+@@ -2056,7 +2090,11 @@ mm_answer_gss_userok(int sock, Buffer *m)
  {
         int authenticated;
  
@@ -2054,7 +2287,7 @@ index ac7dd30..6c82023 100644
  
         buffer_clear(m);
         buffer_put_int(m, authenticated);
-@@ -2054,5 +2092,73 @@ mm_answer_gss_userok(int sock, Buffer *m)
+@@ -2069,5 +2107,73 @@ mm_answer_gss_userok(int sock, Buffer *m)
         /* Monitor loop will terminate if authenticated */
         return (authenticated);
  }
@@ -2143,10 +2376,10 @@ index 93b8b66..bc50ade 100644
  
  struct mm_master;
 diff --git a/monitor_wrap.c b/monitor_wrap.c
-index c5db6df..74fbd2e 100644
+index 99dc13b..5a9f1b5 100644
 --- a/monitor_wrap.c
 +++ b/monitor_wrap.c
-@@ -1068,7 +1068,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
+@@ -1073,7 +1073,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
  }
  
  int
@@ -2155,7 +2388,7 @@ index c5db6df..74fbd2e 100644
  {
         Buffer m;
         int authenticated = 0;
-@@ -1085,5 +1085,50 @@ mm_ssh_gssapi_userok(char *user)
+@@ -1090,5 +1090,50 @@ mm_ssh_gssapi_userok(char *user)
         debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
         return (authenticated);
  }
@@ -2207,10 +2440,10 @@ index c5db6df..74fbd2e 100644
  #endif /* GSSAPI */
  
 diff --git a/monitor_wrap.h b/monitor_wrap.h
-index eb820ae..403f8d0 100644
+index 9fd02b3..b5414c2 100644
 --- a/monitor_wrap.h
 +++ b/monitor_wrap.h
-@@ -58,8 +58,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *);
+@@ -60,8 +60,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *);
  OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
  OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
     gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
@@ -2223,10 +2456,10 @@ index eb820ae..403f8d0 100644
  
  #ifdef USE_PAM
 diff --git a/readconf.c b/readconf.c
-index 69d4553..d2a3d4b 100644
+index c177202..e019195 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -148,6 +148,8 @@ typedef enum {
+@@ -160,6 +160,8 @@ typedef enum {
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
@@ -2235,7 +2468,7 @@ index 69d4553..d2a3d4b 100644
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oControlPersist,
         oHashKnownHosts,
-@@ -193,10 +195,19 @@ static struct {
+@@ -205,10 +207,19 @@ static struct {
         { "afstokenpassing", oUnsupported },
  #if defined(GSSAPI)
         { "gssapiauthentication", oGssAuthentication },
@@ -2255,7 +2488,7 @@ index 69d4553..d2a3d4b 100644
  #endif
         { "fallbacktorsh", oDeprecated },
         { "usersh", oDeprecated },
-@@ -926,10 +937,30 @@ parse_time:
+@@ -962,10 +973,30 @@ parse_time:
                 intptr = &options->gss_authentication;
                 goto parse_flag;
  
@@ -2286,7 +2519,7 @@ index 69d4553..d2a3d4b 100644
         case oBatchMode:
                 intptr = &options->batch_mode;
                 goto parse_flag;
-@@ -1648,7 +1679,12 @@ initialize_options(Options * options)
+@@ -1777,7 +1808,12 @@ initialize_options(Options * options)
         options->pubkey_authentication = -1;
         options->challenge_response_authentication = -1;
         options->gss_authentication = -1;
@@ -2299,7 +2532,7 @@ index 69d4553..d2a3d4b 100644
         options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;
         options->kbd_interactive_devices = NULL;
-@@ -1777,8 +1813,14 @@ fill_default_options(Options * options)
+@@ -1921,8 +1957,14 @@ fill_default_options(Options * options)
                 options->challenge_response_authentication = 1;
         if (options->gss_authentication == -1)
                 options->gss_authentication = 0;
@@ -2315,7 +2548,7 @@ index 69d4553..d2a3d4b 100644
                 options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)
 diff --git a/readconf.h b/readconf.h
-index c84d068..37a0555 100644
+index cef55f7..fd3d7c7 100644
 --- a/readconf.h
 +++ b/readconf.h
 @@ -45,7 +45,12 @@ typedef struct {
@@ -2332,7 +2565,7 @@ index c84d068..37a0555 100644
                                                  * authentication. */
         int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
 diff --git a/servconf.c b/servconf.c
-index b19d30e..b8af6dd 100644
+index 873b0d0..9b06281 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -117,8 +117,10 @@ initialize_server_options(ServerOptions *options)
@@ -2362,7 +2595,7 @@ index b19d30e..b8af6dd 100644
         if (options->password_authentication == -1)
                 options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)
-@@ -419,6 +425,7 @@ typedef enum {
+@@ -427,6 +433,7 @@ typedef enum {
         sHostKeyAlgorithms,
         sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
         sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
@@ -2370,7 +2603,7 @@ index b19d30e..b8af6dd 100644
         sAcceptEnv, sPermitTunnel,
         sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation, sAllowAgentForwarding,
-@@ -492,12 +499,20 @@ static struct {
+@@ -500,12 +507,20 @@ static struct {
  #ifdef GSSAPI
         { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
         { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
@@ -2391,7 +2624,7 @@ index b19d30e..b8af6dd 100644
         { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
         { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
-@@ -1242,6 +1257,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1251,6 +1266,10 @@ process_server_config_line(ServerOptions *options, char *line,
                 intptr = &options->gss_authentication;
                 goto parse_flag;
  
@@ -2402,7 +2635,7 @@ index b19d30e..b8af6dd 100644
         case sGssCleanupCreds:
                 intptr = &options->gss_cleanup_creds;
                 goto parse_flag;
-@@ -1250,6 +1269,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1259,6 +1278,10 @@ process_server_config_line(ServerOptions *options, char *line,
                 intptr = &options->gss_strict_acceptor;
                 goto parse_flag;
  
@@ -2413,7 +2646,7 @@ index b19d30e..b8af6dd 100644
         case sPasswordAuthentication:
                 intptr = &options->password_authentication;
                 goto parse_flag;
-@@ -2265,7 +2288,10 @@ dump_config(ServerOptions *o)
+@@ -2308,7 +2331,10 @@ dump_config(ServerOptions *o)
  #endif
  #ifdef GSSAPI
         dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
@@ -2556,7 +2789,7 @@ index 90fb63f..4e879cd 100644
  #   CheckHostIP yes
  #   AddressFamily any
 diff --git a/ssh_config.5 b/ssh_config.5
-index caf13a6..9060d5b 100644
+index 7630e7b..707d0e1 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -826,10 +826,42 @@ The default is
@@ -2603,10 +2836,10 @@ index caf13a6..9060d5b 100644
  Indicates that
  .Xr ssh 1
 diff --git a/sshconnect2.c b/sshconnect2.c
-index f79c96b..b452eae 100644
+index fae8b0f..34b9d30 100644
 --- a/sshconnect2.c
 +++ b/sshconnect2.c
-@@ -161,6 +161,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
+@@ -162,6 +162,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
         struct kex *kex;
         int r;
  
@@ -2618,7 +2851,7 @@ index f79c96b..b452eae 100644
         xxx_host = host;
         xxx_hostaddr = hostaddr;
  
-@@ -195,6 +200,33 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
+@@ -192,6 +197,36 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
                     order_hostkeyalgs(host, hostaddr, port));
         }
  
@@ -2628,12 +2861,15 @@ index f79c96b..b452eae 100644
 +                * client to the key exchange algorithm proposal */
 +               orig = myproposal[PROPOSAL_KEX_ALGS];
 +
-+               if (options.gss_trust_dns)
-+                       gss_host = (char *)get_canonical_hostname(1);
++               if (options.gss_server_identity)
++                       gss_host = xstrdup(options.gss_server_identity);
++               else if (options.gss_trust_dns)
++                       gss_host = remote_hostname(active_state);
 +               else
-+                       gss_host = host;
++                       gss_host = xstrdup(host);
 +
-+               gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity);
++               gss = ssh_gssapi_client_mechanisms(gss_host,
++                   options.gss_client_identity);
 +               if (gss) {
 +                       debug("Offering GSSAPI proposal: %s", gss);
 +                       xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
@@ -2652,7 +2888,7 @@ index f79c96b..b452eae 100644
         if (options.rekey_limit || options.rekey_interval)
                 packet_set_rekey_limits((u_int32_t)options.rekey_limit,
                     (time_t)options.rekey_interval);
-@@ -213,10 +245,30 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
+@@ -213,10 +248,26 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
  # endif
  #endif
         kex->kex[KEX_C25519_SHA256] = kexc25519_client;
@@ -2672,18 +2908,14 @@ index f79c96b..b452eae 100644
 +               kex->gss_deleg_creds = options.gss_deleg_creds;
 +               kex->gss_trust_dns = options.gss_trust_dns;
 +               kex->gss_client = options.gss_client_identity;
-+               if (options.gss_server_identity) {
-+                       kex->gss_host = options.gss_server_identity;
-+               } else {
-+                       kex->gss_host = gss_host;
-+        }
++               kex->gss_host = gss_host;
 +       }
 +#endif
 +
         dispatch_run(DISPATCH_BLOCK, &kex->done, active_state);
  
         /* remove ext-info from the KEX proposals for rekeying */
-@@ -311,6 +363,7 @@ int input_gssapi_token(int type, u_int32_t, void *);
+@@ -311,6 +362,7 @@ int input_gssapi_token(int type, u_int32_t, void *);
  int    input_gssapi_hash(int type, u_int32_t, void *);
  int    input_gssapi_error(int, u_int32_t, void *);
  int    input_gssapi_errtok(int, u_int32_t, void *);
@@ -2691,7 +2923,7 @@ index f79c96b..b452eae 100644
  #endif
  
  void   userauth(Authctxt *, char *);
-@@ -326,6 +379,11 @@ static char *authmethods_get(void);
+@@ -326,6 +378,11 @@ static char *authmethods_get(void);
  
  Authmethod authmethods[] = {
  #ifdef GSSAPI
@@ -2703,18 +2935,18 @@ index f79c96b..b452eae 100644
         {"gssapi-with-mic",
                 userauth_gssapi,
                 NULL,
-@@ -656,19 +714,31 @@ userauth_gssapi(Authctxt *authctxt)
+@@ -650,25 +707,40 @@ userauth_gssapi(Authctxt *authctxt)
         static u_int mech = 0;
         OM_uint32 min;
         int ok = 0;
-+       const char *gss_host;
++       char *gss_host;
 +
 +       if (options.gss_server_identity)
-+               gss_host = options.gss_server_identity;
++               gss_host = xstrdup(options.gss_server_identity);
 +       else if (options.gss_trust_dns)
-+               gss_host = get_canonical_hostname(1);
++               gss_host = remote_hostname(active_state);
 +       else
-+               gss_host = authctxt->host;
++               gss_host = xstrdup(authctxt->host);
  
         /* Try one GSSAPI method at a time, rather than sending them all at
          * once. */
@@ -2723,6 +2955,7 @@ index f79c96b..b452eae 100644
 -               gss_indicate_mechs(&min, &gss_supported);
 +               if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) {
 +                       gss_supported = NULL;
++                       free(gss_host);
 +                       return 0;
 +               }
  
@@ -2737,7 +2970,15 @@ index f79c96b..b452eae 100644
                         ok = 1; /* Mechanism works */
                 } else {
                         mech++;
-@@ -765,8 +835,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt)
+                }
+        }
+ 
++       free(gss_host);
++
+        if (!ok)
+                return 0;
+ 
+@@ -759,8 +831,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt)
  {
         Authctxt *authctxt = ctxt;
         Gssctxt *gssctxt;
@@ -2748,7 +2989,7 @@ index f79c96b..b452eae 100644
  
         if (authctxt == NULL)
                 fatal("input_gssapi_response: no authentication context");
-@@ -879,6 +949,48 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt)
+@@ -873,6 +945,48 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt)
         free(lang);
         return 0;
  }
@@ -2798,7 +3039,7 @@ index f79c96b..b452eae 100644
  
  int
 diff --git a/sshd.c b/sshd.c
-index 430569c..5cd9129 100644
+index 799c771..ebb88c7 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -125,6 +125,10 @@
@@ -2812,7 +3053,7 @@ index 430569c..5cd9129 100644
  #ifndef O_NOCTTY
  #define O_NOCTTY       0
  #endif
-@@ -1833,10 +1837,13 @@ main(int ac, char **av)
+@@ -1892,10 +1896,13 @@ main(int ac, char **av)
                 logit("Disabling protocol version 1. Could not load host key");
                 options.protocol &= ~SSH_PROTO_1;
         }
@@ -2826,8 +3067,8 @@ index 430569c..5cd9129 100644
         if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
                 logit("sshd: no hostkeys available -- exiting.");
                 exit(1);
-@@ -2151,6 +2158,60 @@ main(int ac, char **av)
-            remote_ip, remote_port, laddr,  get_local_port());
+@@ -2207,6 +2214,60 @@ main(int ac, char **av)
+            remote_ip, remote_port, laddr,  ssh_local_port(ssh));
         free(laddr);
  
 +#ifdef USE_SECURITY_SESSION_API
@@ -2887,7 +3128,7 @@ index 430569c..5cd9129 100644
         /*
          * We don't want to listen forever unless the other side
          * successfully authenticates itself.  So we set up an alarm which is
-@@ -2571,6 +2632,48 @@ do_ssh2_kex(void)
+@@ -2631,6 +2692,48 @@ do_ssh2_kex(void)
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
             list_hostkey_types());
  
@@ -2936,7 +3177,7 @@ index 430569c..5cd9129 100644
         /* start key exchange */
         if ((r = kex_setup(active_state, myproposal)) != 0)
                 fatal("kex_setup: %s", ssh_err(r));
-@@ -2585,6 +2688,13 @@ do_ssh2_kex(void)
+@@ -2648,6 +2751,13 @@ do_ssh2_kex(void)
  # endif
  #endif
         kex->kex[KEX_C25519_SHA256] = kexc25519_server;
@@ -2951,10 +3192,10 @@ index 430569c..5cd9129 100644
         kex->client_version_string=client_version_string;
         kex->server_version_string=server_version_string;
 diff --git a/sshd_config b/sshd_config
-index a848d73..f103298 100644
+index 75ae8e7..3fe3e01 100644
 --- a/sshd_config
 +++ b/sshd_config
-@@ -84,6 +84,8 @@ AuthorizedKeysFile    .ssh/authorized_keys
+@@ -83,6 +83,8 @@ AuthorizedKeysFile    .ssh/authorized_keys
  # GSSAPI options
  #GSSAPIAuthentication no
  #GSSAPICleanupCredentials yes
@@ -2964,10 +3205,10 @@ index a848d73..f103298 100644
  # Set this to 'yes' to enable PAM authentication, account processing,
  # and session processing. If this is enabled, PAM authentication will
 diff --git a/sshd_config.5 b/sshd_config.5
-index a37a3ac..c6d6858 100644
+index 1bc26ec..3b4cba9 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -623,6 +623,11 @@ The default is
+@@ -632,6 +632,11 @@ The default is
  Specifies whether user authentication based on GSSAPI is allowed.
  The default is
  .Dq no .
@@ -2979,7 +3220,7 @@ index a37a3ac..c6d6858 100644
  .It Cm GSSAPICleanupCredentials
  Specifies whether to automatically destroy the user's credentials cache
  on logout.
-@@ -643,6 +648,11 @@ machine's default store.
+@@ -652,6 +657,11 @@ machine's default store.
  This facility is provided to assist with operation on multi homed machines.
  The default is
  .Dq yes .
@@ -2992,7 +3233,7 @@ index a37a3ac..c6d6858 100644
  Specifies the key types that will be accepted for hostbased authentication
  as a comma-separated pattern list.
 diff --git a/sshkey.c b/sshkey.c
-index 87b093e..e595b11 100644
+index c9f04cd..558bbbe 100644
 --- a/sshkey.c
 +++ b/sshkey.c
 @@ -115,6 +115,7 @@ static const struct keytype keytypes[] = {
@@ -3013,7 +3254,7 @@ index 87b093e..e595b11 100644
                 if ((certs_only && !kt->cert) || (plain_only && kt->cert))
                         continue;
 diff --git a/sshkey.h b/sshkey.h
-index a20a14f..2259cbb 100644
+index 8c3d866..e0caa37 100644
 --- a/sshkey.h
 +++ b/sshkey.h
 @@ -62,6 +62,7 @@ enum sshkey_types {