- updated

Changed files:
    openssh-blacklist.diff -> 1.3
    openssh-config.patch -> 1.7
    openssh-sigpipe.patch -> 1.11

diff --git a/openssh-blacklist.diff b/openssh-blacklist.diff
index 4aac1e36e374c0232d90a667eb69060520222a29..c162ebf3e1eb21fcf5436392c854f2a60f7f8dec 100644 (file)
--- a/openssh-blacklist.diff
+++ b/openssh-blacklist.diff
@@ -90,7 +90,7 @@ This patch is up to date with respect to Debian openssh 1:4.7p1-10.
        { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
        { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
 +      { "permitblacklistedkeys", sPermitBlacklistedKeys, SSHCFG_GLOBAL },
-       { "permitemptypasswords", sEmptyPasswd, SSHCFG_GLOBAL },
+       { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
        { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
        { "uselogin", sUseLogin, SSHCFG_GLOBAL },
 @@ -943,6 +947,10 @@
@@ -111,9 +111,9 @@ This patch is up to date with respect to Debian openssh 1:4.7p1-10.
        int     kbd_interactive_authentication; /* If true, permit */
        int     challenge_response_authentication;
 +      int     permit_blacklisted_keys;        /* If true, permit */
+       int     zero_knowledge_password_authentication;
+                                       /* If true, permit jpake auth */
        int     permit_empty_passwd;    /* If false, do not permit empty
-                                        * passwords. */
-       int     permit_user_env;        /* If true, read ~/.ssh/environment */
 --- openssh-4.7p1.orig/Makefile.in
 +++ openssh-4.7p1/Makefile.in
 @@ -60,7 +60,7 @@

diff --git a/openssh-config.patch b/openssh-config.patch
index 17325ce26753fedd192c2661dbb7b56e973cef5a..7638015d288ff3e3ab5dc9f825faa21511da0b8e 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -75,9 +75,9 @@
  #   CheckHostIP yes
  #   AddressFamily any
 @@ -42,3 +45,19 @@
- #   Tunnel no
  #   TunnelDevice any:any
  #   PermitLocalCommand no
+ #   VisualHostKey no
 +
 +Host *
 +      GSSAPIAuthentication yes

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 2f292bd8b944efd48887e7d2ef107c637dbd4cc0..8d38197be55c2541f392c8fd16472f3b6baf219c 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -37,8 +37,8 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
  .Nd OpenSSH SSH client (remote login program)
  .Sh SYNOPSIS
  .Nm ssh
--.Op Fl 1246AaCfgKkMNnqsTtVvXxY
-+.Op Fl 1246AaBCfgKkMNnqsTtVvXxY
+-.Op Fl 1246AaCfgKkMNnqsTtVvXxYy
++.Op Fl 1246AaBCfgKkMNnqsTtVvXxYy
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
  .Oo Fl D\ \&
@@ -69,8 +69,8 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
  usage(void)
  {
        fprintf(stderr,
--"usage: ssh [-1246AaCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
-+"usage: ssh [-1246AaBCfgKkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
+-"usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
++"usage: ssh [-1246AaBCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
  "           [-D [bind_address:]port] [-e escape_char] [-F configfile]\n"
  "           [-i identity_file] [-L [bind_address:]port:host:hostport]\n"
  "           [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
@@ -78,8 +78,8 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
  
   again:
        while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
--          "ACD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
-+          "ABCD:F:I:KL:MNO:PR:S:TVw:XY")) != -1) {
+-          "ACD:F:I:KL:MNO:PR:S:TVw:XYy")) != -1) {
++          "ABCD:F:I:KL:MNO:PR:S:TVw:XYy")) != -1) {
                switch (opt) {
                case '1':
                        options.protocol = SSH_PROTO_1;