- aaron@cvs.openbsd.org 2002/08/08 13:50:23

     [sshconnect1.c]
     Use & to test if bits are set, not &&; markus@ ok.

diff --git a/ChangeLog b/ChangeLog
index 318ce975e027cdf3e0e5f96e3af4be8b28159e90..75e3da9f97eb5c7fb9609017e7b17c4188feac8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
      [ssh-rsa.c]
      replace RSA_verify with our own version and avoid the OpenSSL ASN.1 parser
      for authentication; ok deraadt/djm
+   - aaron@cvs.openbsd.org 2002/08/08 13:50:23
+     [sshconnect1.c]
+     Use & to test if bits are set, not &&; markus@ ok.
 
 20020813
  - (tim) [configure.ac] Display OpenSSL header/library version.

diff --git a/sshconnect1.c b/sshconnect1.c
index e28b7fc72160264b72adaf364f3c42e9ce0e7955..2fc9a981afca2b830e5f1c41f46f11f1c29b61a5 100644 (file)
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.51 2002/05/23 19:24:30 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.52 2002/08/08 13:50:23 aaron Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -254,7 +254,7 @@ try_rsa_authentication(int idx)
         * load the private key.  Try first with empty passphrase; if it
         * fails, ask for a passphrase.
         */
-       if (public->flags && KEY_FLAG_EXT)
+       if (public->flags & KEY_FLAG_EXT)
                private = public;
        else
                private = key_load_private_type(KEY_RSA1, authfile, "", NULL);