summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:34:35 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:34:35 +1100
commit914bef437e7b80da027116e140e41746dafc45ee (patch)
treea9fc11fcb1e528940191b12511b888f5ca46edcd /myproposal.h
parent49d795c647fb4c0d2dcbb3a5fcfe109984cdac15 (diff)
- markus@cvs.openbsd.org 2002/01/21 22:30:12
[cipher.c compat.c myproposal.h] remove "rijndael-*", just use "aes-" since this how rijndael is called in the drafts; ok stevesk@
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h
index 4a9a36370..1caf04a4e 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.12 2001/03/05 15:56:16 deraadt Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.13 2002/01/21 22:30:12 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -27,9 +27,7 @@
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 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ 29 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
30 "aes192-cbc,aes256-cbc," \ 30 "aes192-cbc,aes256-cbc"
31 "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
32 "rijndael-cbc@lysator.liu.se"
33#define KEX_DEFAULT_MAC \ 31#define KEX_DEFAULT_MAC \
34 "hmac-md5,hmac-sha1,hmac-ripemd160," \ 32 "hmac-md5,hmac-sha1,hmac-ripemd160," \
35 "hmac-ripemd160@openssh.com," \ 33 "hmac-ripemd160@openssh.com," \