summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-07-03 03:43:18 +0000
committerDamien Miller <djm@mindrot.org>2015-07-15 15:35:09 +1000
commitc28fc62d789d860c75e23a9fa9fb250eb2beca57 (patch)
tree9b540db8aed167256bb61cd9df90dbedb31cc79d /sshd.c
parent564d63e1b4a9637a209d42a9d49646781fc9caef (diff)
upstream commit
delete support for legacy v00 certificates; "sure" markus@ dtucker@ Upstream-ID: b5b9bb5f9202d09e88f912989d74928601b6636f
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sshd.c b/sshd.c
index 6f8c6f2b1..15af4e8e5 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.450 2015/05/24 23:39:16 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.451 2015/07/03 03:43:18 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -815,8 +815,6 @@ list_hostkey_types(void)
815 if (key == NULL) 815 if (key == NULL)
816 continue; 816 continue;
817 switch (key->type) { 817 switch (key->type) {
818 case KEY_RSA_CERT_V00:
819 case KEY_DSA_CERT_V00:
820 case KEY_RSA_CERT: 818 case KEY_RSA_CERT:
821 case KEY_DSA_CERT: 819 case KEY_DSA_CERT:
822 case KEY_ECDSA_CERT: 820 case KEY_ECDSA_CERT:
@@ -843,8 +841,6 @@ get_hostkey_by_type(int type, int nid, int need_private, struct ssh *ssh)
843 841
844 for (i = 0; i < options.num_host_key_files; i++) { 842 for (i = 0; i < options.num_host_key_files; i++) {
845 switch (type) { 843 switch (type) {
846 case KEY_RSA_CERT_V00:
847 case KEY_DSA_CERT_V00:
848 case KEY_RSA_CERT: 844 case KEY_RSA_CERT:
849 case KEY_DSA_CERT: 845 case KEY_DSA_CERT:
850 case KEY_ECDSA_CERT: 846 case KEY_ECDSA_CERT: