summaryrefslogtreecommitdiff
path: root/myproposal.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 /myproposal.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 'myproposal.h')
-rw-r--r--myproposal.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h
index 371f27ca..46e5b988 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.46 2015/07/03 03:47:00 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.47 2015/07/10 06:21:53 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -99,11 +99,9 @@
HOSTKEY_ECDSA_CERT_METHODS \
"ssh-ed25519-cert-v01@openssh.com," \
"ssh-rsa-cert-v01@openssh.com," \
- "ssh-dss-cert-v01@openssh.com," \
HOSTKEY_ECDSA_METHODS \
"ssh-ed25519," \
- "ssh-rsa," \
- "ssh-dss"
+ "ssh-rsa" \
/* the actual algorithms */