better way to deal with authfile cipher; dugsong@

2 files changed, 4 insertions, 6 deletions

diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index ac2aa0fc9e4..a3dfbf126a3 100644
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/authfile.c
@@ -15,7 +15,7 @@ for reading the passphrase from the user.
 */
 
 #include "includes.h"
-RCSID("$Id: authfile.c,v 1.5 1999/09/30 16:55:06 deraadt Exp $");
+RCSID("$Id: authfile.c,v 1.6 1999/09/30 18:28:35 provos Exp $");
 
 #include <ssl/bn.h>
 #include "xmalloc.h"
@@ -267,8 +267,8 @@ load_private_key(const char *filename, const char *passphrase,
     xfree(buffer_get_string(&buffer, NULL));
 
   /* Check that it is a supported cipher. */
-  if (cipher_type != SSH_CIPHER_NONE && 
-     (cipher_mask() & (1 << cipher_type)) == 0)
+  if (((cipher_mask() | SSH_CIPHER_NONE | SSH_AUTHFILE_CIPHER) &
+	(1 << cipher_type)) == 0)
     {
       debug("Unsupported cipher %.100s used in key file %.200s.",
 	    cipher_name(cipher_type), filename);
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 6f12dd311d3..9e799919c95 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -18,7 +18,7 @@ Modified to work with SSL by Niels Provos <provos@citi.umich.edu> in Canada.
 */
 
 #include "includes.h"
-RCSID("$Id: ssh.c,v 1.19 1999/09/30 14:05:41 provos Exp $");
+RCSID("$Id: ssh.c,v 1.20 1999/09/30 18:28:36 provos Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -81,8 +81,6 @@ uid_t original_real_uid;
 void
 usage()
 {
-  int i;
-  
   fprintf(stderr, "Usage: %s [options] host [command]\n", av0);
   fprintf(stderr, "Options:\n");
   fprintf(stderr, "  -l user     Log in using this user name.\n");