summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-06 01:05:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-06 01:05:23 +0000
commitec26fb166788728d7ccafe85730ccf04f3a4885b (patch)
tree8df50bff30cbb4b723c224a5ca4ae2a52c004292 /myproposal.h
parent35f1f4e2b833377b2a5e73d1c3f841c5e420cd29 (diff)
- deraadt@cvs.openbsd.org 2001/03/05 15:56:16
[myproposal.h ssh.1] switch to aes128-cbc/hmac-md5 by default in SSH2 -- faster; provos & markus ok
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h
index 03f76839b..4a9a36370 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.11 2001/02/11 12:59:24 markus Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.12 2001/03/05 15:56:16 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,12 +26,12 @@
26#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1" 26#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
27#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" 27#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss"
28#define KEX_DEFAULT_ENCRYPT \ 28#define KEX_DEFAULT_ENCRYPT \
29 "3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ 29 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
30 "aes128-cbc,aes192-cbc,aes256-cbc," \ 30 "aes192-cbc,aes256-cbc," \
31 "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \ 31 "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
32 "rijndael-cbc@lysator.liu.se" 32 "rijndael-cbc@lysator.liu.se"
33#define KEX_DEFAULT_MAC \ 33#define KEX_DEFAULT_MAC \
34 "hmac-sha1,hmac-md5,hmac-ripemd160," \ 34 "hmac-md5,hmac-sha1,hmac-ripemd160," \
35 "hmac-ripemd160@openssh.com," \ 35 "hmac-ripemd160@openssh.com," \
36 "hmac-sha1-96,hmac-md5-96" 36 "hmac-sha1-96,hmac-md5-96"
37#define KEX_DEFAULT_COMP "none,zlib" 37#define KEX_DEFAULT_COMP "none,zlib"