summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-18 20:53:59 +1000
committerDamien Miller <djm@mindrot.org>2003-05-18 20:53:59 +1000
commitf5399c24dc53a9afebf089a013a0359e7c775a90 (patch)
treec9aba4bc854b0fb83abad0ac93d54022d9d194f4 /myproposal.h
parenta9825785e864fa795d4b39d99d14bc6f9995a7dc (diff)
- markus@cvs.openbsd.org 2003/05/17 04:27:52
[cipher.c cipher-ctr.c myproposal.h] experimental support for aes-ctr modes from http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt ok djm@
Diffstat (limited to 'myproposal.h')
-rw-r--r--myproposal.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h
index 62f5cfb65..8b431d9d2 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.14 2002/04/03 09:26:11 markus Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.15 2003/05/17 04:27:52 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,7 +27,8 @@
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,rijndael-cbc@lysator.liu.se" 30 "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \
31 "aes128-ctr,aes192-ctr,aes256-ctr"
31#define KEX_DEFAULT_MAC \ 32#define KEX_DEFAULT_MAC \
32 "hmac-md5,hmac-sha1,hmac-ripemd160," \ 33 "hmac-md5,hmac-sha1,hmac-ripemd160," \
33 "hmac-ripemd160@openssh.com," \ 34 "hmac-ripemd160@openssh.com," \