summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-11-29 17:18:35 +0000
committerColin Watson <cjwatson@debian.org>2015-11-29 17:32:50 +0000
commit0b372585c0026f78676f1414510ec9f87a383803 (patch)
treea3fa6b329a8a5e9841b526f30332d21fc110118a /myproposal.h
parent24ffa45372888d206f21e1864e3911024c6d5e62 (diff)
parent6d0faf6dc76ac8cc73d6f8e478db7c97f7013a2d (diff)
New upstream release (7.0p1).
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/myproposal.h b/myproposal.h
index 84b63bcd5..46e5b988d 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.44 2015/05/27 23:51:10 dtucker Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.47 2015/07/10 06:21:53 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -93,20 +93,15 @@
93 93
94#define KEX_CLIENT_KEX KEX_COMMON_KEX \ 94#define KEX_CLIENT_KEX KEX_COMMON_KEX \
95 "diffie-hellman-group-exchange-sha1," \ 95 "diffie-hellman-group-exchange-sha1," \
96 "diffie-hellman-group14-sha1," \ 96 "diffie-hellman-group14-sha1"
97 "diffie-hellman-group1-sha1"
98 97
99#define KEX_DEFAULT_PK_ALG \ 98#define KEX_DEFAULT_PK_ALG \
100 HOSTKEY_ECDSA_CERT_METHODS \ 99 HOSTKEY_ECDSA_CERT_METHODS \
101 "ssh-ed25519-cert-v01@openssh.com," \ 100 "ssh-ed25519-cert-v01@openssh.com," \
102 "ssh-rsa-cert-v01@openssh.com," \ 101 "ssh-rsa-cert-v01@openssh.com," \
103 "ssh-dss-cert-v01@openssh.com," \
104 "ssh-rsa-cert-v00@openssh.com," \
105 "ssh-dss-cert-v00@openssh.com," \
106 HOSTKEY_ECDSA_METHODS \ 102 HOSTKEY_ECDSA_METHODS \
107 "ssh-ed25519," \ 103 "ssh-ed25519," \
108 "ssh-rsa," \ 104 "ssh-rsa" \
109 "ssh-dss"
110 105
111/* the actual algorithms */ 106/* the actual algorithms */
112 107