summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--myproposal.h9
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d7de3dd9..adb1e3817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,10 @@
73 - djm@cvs.openbsd.org 2009/01/22 10:09:16 73 - djm@cvs.openbsd.org 2009/01/22 10:09:16
74 [auth-options.c] 74 [auth-options.c]
75 another chunk of a2port() diff that got away. wtfdjm?? 75 another chunk of a2port() diff that got away. wtfdjm??
76 - djm@cvs.openbsd.org 2009/01/23 07:58:11
77 [myproposal.h]
78 prefer CTR modes and revised arcfour (i.e w/ discard) modes to CBC
79 modes; ok markus@
76 80
7720090107 8120090107
78 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. 82 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5082,5 +5086,5 @@
5082 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5086 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5083 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5087 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5084 5088
5085$Id: ChangeLog,v 1.5176 2009/01/28 05:33:01 djm Exp $ 5089$Id: ChangeLog,v 1.5177 2009/01/28 05:33:31 djm Exp $
5086 5090
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," \