===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/cipher.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- src/usr.bin/ssh/cipher.c	2000/03/28 20:24:49	1.21
+++ src/usr.bin/ssh/cipher.c	2000/04/04 21:37:27	1.22
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: cipher.c,v 1.21 2000/03/28 20:24:49 markus Exp $");
+RCSID("$Id: cipher.c,v 1.22 2000/04/04 21:37:27 markus Exp $");
 
 #include "ssh.h"
 #include "cipher.h"
@@ -131,17 +131,28 @@
  */
 
 unsigned int 
-cipher_mask()
+cipher_mask1()
 {
 	unsigned int mask = 0;
 	mask |= 1 << SSH_CIPHER_3DES;		/* Mandatory */
 	mask |= 1 << SSH_CIPHER_BLOWFISH;
+	return mask;
+}
+unsigned int 
+cipher_mask2()
+{
+	unsigned int mask = 0;
 	mask |= 1 << SSH_CIPHER_BLOWFISH_CBC;
 	mask |= 1 << SSH_CIPHER_3DES_CBC;
 	mask |= 1 << SSH_CIPHER_ARCFOUR;
 	mask |= 1 << SSH_CIPHER_CAST128_CBC;
 	return mask;
 }
+unsigned int 
+cipher_mask()
+{
+	return cipher_mask1() | cipher_mask2();
+}
 
 /* Returns the name of the cipher. */
 
@@ -176,8 +187,7 @@
  */
 
 void 
-cipher_set_key_string(CipherContext *context, int cipher,
-		      const char *passphrase, int for_encryption)
+cipher_set_key_string(CipherContext *context, int cipher, const char *passphrase)
 {
 	MD5_CTX md;
 	unsigned char digest[16];
@@ -186,7 +196,7 @@
 	MD5_Update(&md, (const unsigned char *) passphrase, strlen(passphrase));
 	MD5_Final(digest, &md);
 
-	cipher_set_key(context, cipher, digest, 16, for_encryption);
+	cipher_set_key(context, cipher, digest, 16);
 
 	memset(digest, 0, sizeof(digest));
 	memset(&md, 0, sizeof(md));
@@ -195,8 +205,8 @@
 /* Selects the cipher to use and sets the key. */
 
 void 
-cipher_set_key(CipherContext *context, int cipher,
-	       const unsigned char *key, int keylen, int for_encryption)
+cipher_set_key(CipherContext *context, int cipher, const unsigned char *key,
+    int keylen)
 {
 	unsigned char padded[32];