summaryrefslogtreecommitdiffstats
path: root/servconf.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-07-10 06:21:53 +0000
committerDamien Miller <djm@mindrot.org>2015-07-15 15:38:02 +1000
commit3a1638dda19bbc73d0ae02b4c251ce08e564b4b9 (patch)
treee74e4219344349a4f9a4393aa4c2c6b7baecb127 /servconf.h
parent16db0a7ee9a87945cc594d13863cfcb86038db59 (diff)
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
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 606d80c9..f4137af7 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.119 2015/05/22 03:50:02 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.120 2015/07/10 06:21:53 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -102,6 +102,7 @@ typedef struct {
int hostbased_authentication; /* If true, permit ssh2 hostbased auth */
int hostbased_uses_name_from_packet_only; /* experimental */
char *hostbased_key_types; /* Key types allowed for hostbased */
+ char *hostkeyalgorithms; /* SSH2 server key types */
int rsa_authentication; /* If true, permit RSA authentication. */
int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */
char *pubkey_key_types; /* Key types allowed for public key */