diff options
author | mouring <mouring> | 2001-02-15 03:01:59 +0000 |
---|---|---|
committer | mouring <mouring> | 2001-02-15 03:01:59 +0000 |
commit | ea7e32e35b2d808cf84a3ac86afabe22dab2b106 (patch) | |
tree | 771ca2f4126277527fbb4a8044c2e1b867bef80a /readconf.h | |
parent | 96dc654c680a97c30ec413ce966f624457a00e59 (diff) | |
download | openssh-ea7e32e35b2d808cf84a3ac86afabe22dab2b106.tar.gz |
- 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 'readconf.h')
-rw-r--r-- | readconf.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -11,7 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: readconf.h,v 1.25 2001/01/22 23:06:39 markus Exp $"); */ +/* RCSID("$OpenBSD: readconf.h,v 1.26 2001/02/11 12:59:25 markus Exp $"); */ #ifndef READCONF_H #define READCONF_H @@ -68,6 +68,7 @@ typedef struct { * prompts. */ int cipher; /* Cipher to use. */ char *ciphers; /* SSH2 ciphers in order of preference. */ + char *macs; /* SSH2 macs in order of preference. */ int protocol; /* Protocol in order of preference. */ char *hostname; /* Real host to connect. */ char *host_key_alias; /* hostname alias for .ssh/known_hosts */ |