summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/packet.c b/packet.c
index 39629a5ef..b11519e74 100644
--- a/packet.c
+++ b/packet.c
@@ -17,7 +17,18 @@
17 */ 17 */
18 18
19#include "includes.h" 19#include "includes.h"
20RCSID("$Id: packet.c,v 1.15 2000/04/04 04:57:08 damien Exp $"); 20RCSID("$Id: packet.c,v 1.16 2000/04/06 02:32:40 damien Exp $");
21
22#ifdef HAVE_OPENSSL
23# include <openssl/bn.h>
24# include <openssl/dh.h>
25# include <openssl/hmac.h>
26#endif /* HAVE_OPENSSL */
27#ifdef HAVE_SSL
28# include <ssl/bn.h>
29# include <ssl/dh.h>
30# include <ssl/hmac.h>
31#endif /* HAVE_SSL */
21 32
22#include "xmalloc.h" 33#include "xmalloc.h"
23#include "buffer.h" 34#include "buffer.h"
@@ -35,17 +46,6 @@ RCSID("$Id: packet.c,v 1.15 2000/04/04 04:57:08 damien Exp $");
35#include "compat.h" 46#include "compat.h"
36#include "ssh2.h" 47#include "ssh2.h"
37 48
38#ifdef HAVE_OPENSSL
39# include <openssl/bn.h>
40# include <openssl/dh.h>
41# include <openssl/hmac.h>
42#endif /* HAVE_OPENSSL */
43#ifdef HAVE_SSL
44# include <ssl/bn.h>
45# include <ssl/dh.h>
46# include <ssl/hmac.h>
47#endif /* HAVE_SSL */
48
49#include "buffer.h" 49#include "buffer.h"
50#include "kex.h" 50#include "kex.h"
51#include "hmac.h" 51#include "hmac.h"
@@ -152,8 +152,8 @@ packet_set_connection(int fd_in, int fd_out)
152 connection_in = fd_in; 152 connection_in = fd_in;
153 connection_out = fd_out; 153 connection_out = fd_out;
154 cipher_type = SSH_CIPHER_NONE; 154 cipher_type = SSH_CIPHER_NONE;
155 cipher_set_key(&send_context, SSH_CIPHER_NONE, (unsigned char *) "", 0, 1); 155 cipher_set_key(&send_context, SSH_CIPHER_NONE, (unsigned char *) "", 0);
156 cipher_set_key(&receive_context, SSH_CIPHER_NONE, (unsigned char *) "", 0, 0); 156 cipher_set_key(&receive_context, SSH_CIPHER_NONE, (unsigned char *) "", 0);
157 if (!initialized) { 157 if (!initialized) {
158 initialized = 1; 158 initialized = 1;
159 buffer_init(&input); 159 buffer_init(&input);
@@ -352,8 +352,8 @@ packet_set_encryption_key(const unsigned char *key, unsigned int keylen,
352 fatal("keylen too small: %d", keylen); 352 fatal("keylen too small: %d", keylen);
353 353
354 /* All other ciphers use the same key in both directions for now. */ 354 /* All other ciphers use the same key in both directions for now. */
355 cipher_set_key(&receive_context, cipher, key, keylen, 0); 355 cipher_set_key(&receive_context, cipher, key, keylen);
356 cipher_set_key(&send_context, cipher, key, keylen, 1); 356 cipher_set_key(&send_context, cipher, key, keylen);
357} 357}
358 358
359/* Starts constructing a packet to send. */ 359/* Starts constructing a packet to send. */