1 files changed, 12 insertions, 12 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 1bfc9c798..55d07e0d6 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -26,7 +26,7 @@ Index: b/readconf.c
         oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -246,6 +247,8 @@
+@@ -248,6 +249,8 @@
  #else
         { "zeroknowledgepasswordauthentication", oUnsupported },
  #endif
@@ -35,7 +35,7 @@ Index: b/readconf.c
  
         { NULL, oBadOption }
  };
-@@ -845,6 +848,8 @@
+@@ -847,6 +850,8 @@
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -44,7 +44,7 @@ Index: b/readconf.c
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -1233,8 +1238,13 @@
+@@ -1235,8 +1240,13 @@
                 options->rekey_limit = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
@@ -78,7 +78,7 @@ Index: b/ssh_config.5
  The argument must be
  .Dq yes
  or
-@@ -946,8 +950,15 @@
+@@ -967,8 +971,15 @@
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -92,10 +92,10 @@ Index: b/ssh_config.5
 +and
 +.Cm SetupTimeOut
 +are Debian-specific compatibility aliases for this option.
- .It Cm SmartcardDevice
- Specifies which smartcard device to use.
- The argument to this keyword is the device
-@@ -993,6 +1004,12 @@
+ .It Cm StrictHostKeyChecking
+ If this flag is set to
+ .Dq yes ,
+@@ -1007,6 +1018,12 @@
  other side.
  If they are sent, death of the connection or crash of one
  of the machines will be properly noticed.
@@ -112,13 +112,13 @@ Index: b/sshd_config.5
 ===================================================================
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -919,6 +919,9 @@
+@@ -936,6 +936,9 @@
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Dq no .
 +.Pp
 +This option was formerly called
 +.Cm KeepAlive .
- .It Cm UseDNS
- Specifies whether
- .Xr sshd 8
+ .It Cm TrustedUserCAKeys
+ Specifies a file containing public keys of certificate authorities that are
+ trusted to sign user certificates for authentication.