diff options
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h index d8cba1caf..cc94a8ed2 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.18 2005/07/25 11:59:39 markus Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.19 2006/03/07 09:07:40 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -23,9 +23,11 @@ | |||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 | */ | 25 | */ |
26 | #define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1," \ | 26 | #define KEX_DEFAULT_KEX \ |
27 | "diffie-hellman-group14-sha1," \ | 27 | "diffie-hellman-group-exchange-sha256," \ |
28 | "diffie-hellman-group1-sha1" | 28 | "diffie-hellman-group-exchange-sha1," \ |
29 | "diffie-hellman-group14-sha1," \ | ||
30 | "diffie-hellman-group1-sha1" | ||
29 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 31 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
30 | #define KEX_DEFAULT_ENCRYPT \ | 32 | #define KEX_DEFAULT_ENCRYPT \ |
31 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ | 33 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ |