upstream commit

Turn off DSA by default; add HostKeyAlgorithms to the
 server and PubkeyAcceptedKeyTypes to the client side, so it still can be
 tested or turned back on; feedback and ok djm@

Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21

1 files changed, 3 insertions, 2 deletions

diff --git a/readconf.h b/readconf.h
index 576b9e352..bb2d55283 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.109 2015/02/16 22:13:32 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.110 2015/07/10 06:21:53 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -150,7 +150,8 @@ typedef struct {
 
         int      update_hostkeys; /* one of SSH_UPDATE_HOSTKEYS_* */
 
-        char    *hostbased_key_types;
+        char   *hostbased_key_types;
+        char   *pubkey_key_types;
 
         char    *ignored_unknown; /* Pattern list of unknown tokens to ignore */
 }       Options;