diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 04:01:59 +0100 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 04:01:59 +0100 |
| commit | 06b33aa0e83163f3dcd679317afec1ee95910512 (patch) | |
| tree | eae5cbd1cd71619bdd1e5d4a28e6bb96057f4479 /myproposal.h | |
| parent | - markus@cvs.openbsd.org 2001/02/12 12:45:06 (diff) | |
| download | openssh-06b33aa0e83163f3dcd679317afec1ee95910512.tar.xz openssh-06b33aa0e83163f3dcd679317afec1ee95910512.zip | |
- markus@cvs.openbsd.org 2001/02/11 12:59:25
[Makefile.in sshd.8 sshconnect2.c readconf.h readconf.c packet.c
sshd.c ssh.c ssh.1 servconf.h servconf.c myproposal.h kex.h kex.c]
1) clean up the MAC support for SSH-2
2) allow you to specify the MAC with 'ssh -m'
3) or the 'MACs' keyword in ssh(d)_config
4) add hmac-{md5,sha1}-96
ok stevesk@, provos@
Diffstat (limited to 'myproposal.h')
| -rw-r--r-- | myproposal.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h index 9dfecdafc..03f76839b 100644 --- a/myproposal.h +++ b/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.10 2001/01/29 01:58:17 niklas Exp $ */ +/* $OpenBSD: myproposal.h,v 1.11 2001/02/11 12:59:24 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -30,7 +30,10 @@ "aes128-cbc,aes192-cbc,aes256-cbc," \ "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \ "rijndael-cbc@lysator.liu.se" -#define KEX_DEFAULT_MAC "hmac-sha1,hmac-md5,hmac-ripemd160@openssh.com" +#define KEX_DEFAULT_MAC \ + "hmac-sha1,hmac-md5,hmac-ripemd160," \ + "hmac-ripemd160@openssh.com," \ + "hmac-sha1-96,hmac-md5-96" #define KEX_DEFAULT_COMP "none,zlib" #define KEX_DEFAULT_LANG "" |