=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/packet.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- src/usr.bin/ssh/packet.c 1999/11/02 19:42:36 1.10 +++ src/usr.bin/ssh/packet.c 1999/11/15 21:38:54 1.11 @@ -15,7 +15,7 @@ */ #include "includes.h" -RCSID("$Id: packet.c,v 1.10 1999/11/02 19:42:36 markus Exp $"); +RCSID("$Id: packet.c,v 1.11 1999/11/15 21:38:54 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -236,30 +236,11 @@ void packet_set_encryption_key(const unsigned char *key, unsigned int keylen, - int cipher, int is_client) + int cipher) { - cipher_type = cipher; - if (cipher == SSH_CIPHER_RC4) - { - if (is_client) - { /* In client: use first half for receiving, second for sending. */ - cipher_set_key(&receive_context, cipher, key, keylen / 2, 0); - cipher_set_key(&send_context, cipher, key + keylen / 2, - keylen / 2, 1); - } - else - { /* In server: use first half for sending, second for receiving. */ - cipher_set_key(&receive_context, cipher, key + keylen / 2, - keylen / 2, 0); - cipher_set_key(&send_context, cipher, key, keylen / 2, 1); - } - } - else - { - /* All other ciphers use the same key in both directions for now. */ - cipher_set_key(&receive_context, cipher, key, keylen, 0); - cipher_set_key(&send_context, cipher, key, keylen, 1); - } + /* All other ciphers use the same key in both directions for now. */ + cipher_set_key(&receive_context, cipher, key, keylen, 0); + cipher_set_key(&send_context, cipher, key, keylen, 1); } /* Starts constructing a packet to send. */