1 From 58d5723e03a5a582c2d1486719f9753aa969b244 Mon Sep 17 00:00:00 2001
   2 From: Alex Wilson <alex.wilson@joyent.com>
   3 Date: Wed, 19 Aug 2015 11:35:32 -0700
   4 Subject: [PATCH 28/36] Re-enable DSA keys for pk auth
   5 
   6 ---
   7  myproposal.h  | 4 +++-
   8  ssh_config.4  | 3 ++-
   9  sshd_config.4 | 3 ++-
  10  3 files changed, 7 insertions(+), 3 deletions(-)
  11 
  12 diff --git a/myproposal.h b/myproposal.h
  13 index 46e5b98..5041361 100644
  14 --- a/myproposal.h
  15 +++ b/myproposal.h
  16 @@ -99,9 +99,11 @@
  17         HOSTKEY_ECDSA_CERT_METHODS \
  18         "ssh-ed25519-cert-v01@openssh.com," \
  19         "ssh-rsa-cert-v01@openssh.com," \
  20 +       "ssh-dss-cert-v01@openssh.com," \
  21         HOSTKEY_ECDSA_METHODS \
  22         "ssh-ed25519," \
  23 -       "ssh-rsa" \
  24 +       "ssh-rsa," \
  25 +       "ssh-dss" \
  26  
  27  /* the actual algorithms */
  28  
  29 diff --git a/ssh_config.4 b/ssh_config.4
  30 index 016adda..1d26140 100644
  31 --- a/ssh_config.4
  32 +++ b/ssh_config.4
  33 @@ -1264,8 +1264,9 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com,
  34  ecdsa-sha2-nistp521-cert-v01@openssh.com,
  35  ssh-ed25519-cert-v01@openssh.com,
  36  ssh-rsa-cert-v01@openssh.com,
  37 +ssh-dss-cert-v01@openssh.com,
  38  ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
  39 -ssh-ed25519,ssh-rsa
  40 +ssh-ed25519,ssh-rsa,ssh-dss
  41  .Ed
  42  .Pp
  43  The
  44 diff --git a/sshd_config.4 b/sshd_config.4
  45 index bd70a68..0c07fd1 100644
  46 --- a/sshd_config.4
  47 +++ b/sshd_config.4
  48 @@ -1366,8 +1366,9 @@ ecdsa-sha2-nistp384-cert-v01@openssh.com,
  49  ecdsa-sha2-nistp521-cert-v01@openssh.com,
  50  ssh-ed25519-cert-v01@openssh.com,
  51  ssh-rsa-cert-v01@openssh.com,
  52 +ssh-dss-cert-v01@openssh.com,
  53  ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
  54 -ssh-ed25519,ssh-rsa
  55 +ssh-ed25519,ssh-rsa,ssh-dss
  56  .Ed
  57  .Pp
  58  The
  59 -- 
  60 2.5.4 (Apple Git-61)
  61