===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/ssh/authfile.c	1999/12/06 19:11:15	1.11
+++ src/usr.bin/ssh/authfile.c	2000/04/04 21:37:27	1.12
@@ -15,7 +15,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: authfile.c,v 1.11 1999/12/06 19:11:15 deraadt Exp $");
+RCSID("$Id: authfile.c,v 1.12 2000/04/04 21:37:27 markus Exp $");
 
 #include <ssl/bn.h>
 #include "xmalloc.h"
@@ -101,7 +101,7 @@
 	/* Allocate space for the private part of the key in the buffer. */
 	buffer_append_space(&encrypted, &cp, buffer_len(&buffer));
 
-	cipher_set_key_string(&cipher, cipher_type, passphrase, 1);
+	cipher_set_key_string(&cipher, cipher_type, passphrase);
 	cipher_encrypt(&cipher, (unsigned char *) cp,
 		       (unsigned char *) buffer_ptr(&buffer),
 		       buffer_len(&buffer));
@@ -280,7 +280,7 @@
 		xfree(buffer_get_string(&buffer, NULL));
 
 	/* Check that it is a supported cipher. */
-	if (((cipher_mask() | SSH_CIPHER_NONE | SSH_AUTHFILE_CIPHER) &
+	if (((cipher_mask1() | SSH_CIPHER_NONE | SSH_AUTHFILE_CIPHER) &
 	     (1 << cipher_type)) == 0) {
 		debug("Unsupported cipher %.100s used in key file %.200s.",
 		      cipher_name(cipher_type), filename);
@@ -292,7 +292,7 @@
 	buffer_append_space(&decrypted, &cp, buffer_len(&buffer));
 
 	/* Rest of the buffer is encrypted.  Decrypt it using the passphrase. */
-	cipher_set_key_string(&cipher, cipher_type, passphrase, 0);
+	cipher_set_key_string(&cipher, cipher_type, passphrase);
 	cipher_decrypt(&cipher, (unsigned char *) cp,
 		       (unsigned char *) buffer_ptr(&buffer),
 		       buffer_len(&buffer));