summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h
index 87a9e5820..7bca3bcae 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.22 2007/06/07 19:37:34 pvalchev Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.23 2009/01/23 07:58:11 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -41,11 +41,12 @@
41#endif 41#endif
42 42
43#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" 43#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss"
44
44#define KEX_DEFAULT_ENCRYPT \ 45#define KEX_DEFAULT_ENCRYPT \
46 "aes128-ctr,aes192-ctr,aes256-ctr," \
47 "arcfour256,arcfour128," \
45 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ 48 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
46 "arcfour128,arcfour256,arcfour," \ 49 "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se"
47 "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \
48 "aes128-ctr,aes192-ctr,aes256-ctr"
49#define KEX_DEFAULT_MAC \ 50#define KEX_DEFAULT_MAC \
50 "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ 51 "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \
51 "hmac-ripemd160@openssh.com," \ 52 "hmac-ripemd160@openssh.com," \