diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-08-20 18:41:15 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-08-20 18:41:15 +0000 |
| commit | e143f61b6f8875fd91efbfa609a0ef57c55af087 (patch) | |
| tree | 5bdaa8a0e0c5e6c0cf763d92c58ea3879153d14d | |
| parent | 0deb5d958a6bd93fc3a021adb946e19cde4fd4bd (diff) | |
- aaron@cvs.openbsd.org 2002/08/08 13:50:23
[sshconnect1.c]
Use & to test if bits are set, not &&; markus@ ok.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sshconnect1.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -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. @@ -1514,4 +1517,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2418 2002/08/20 18:40:03 mouring Exp $ +$Id: ChangeLog,v 1.2419 2002/08/20 18:41:15 mouring Exp $ diff --git a/sshconnect1.c b/sshconnect1.c index e28b7fc7..2fc9a981 100644 --- 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); |