diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:01:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:01:59 +0000 |
commit | 06b33aa0e83163f3dcd679317afec1ee95910512 (patch) | |
tree | eae5cbd1cd71619bdd1e5d4a28e6bb96057f4479 /kex.h | |
parent | 4272ed803ff309f1fdb9c149b9cf083769f53744 (diff) |
- 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 'kex.h')
-rw-r--r-- | kex.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.13 2001/02/04 15:32:24 stevesk Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.14 2001/02/11 12:59:24 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -26,9 +26,11 @@ | |||
26 | #ifndef KEX_H | 26 | #ifndef KEX_H |
27 | #define KEX_H | 27 | #define KEX_H |
28 | 28 | ||
29 | #include <openssl/evp.h> | ||
30 | #include "buffer.h" | ||
31 | |||
29 | #define KEX_DH1 "diffie-hellman-group1-sha1" | 32 | #define KEX_DH1 "diffie-hellman-group1-sha1" |
30 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" | 33 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" |
31 | #define KEX_DSS "ssh-dss" | ||
32 | 34 | ||
33 | enum kex_init_proposals { | 35 | enum kex_init_proposals { |
34 | PROPOSAL_KEX_ALGS, | 36 | PROPOSAL_KEX_ALGS, |