diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshconnect1.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -17,6 +17,9 @@ | |||
17 | [ssh-rsa.c] | 17 | [ssh-rsa.c] |
18 | replace RSA_verify with our own version and avoid the OpenSSL ASN.1 parser | 18 | replace RSA_verify with our own version and avoid the OpenSSL ASN.1 parser |
19 | for authentication; ok deraadt/djm | 19 | for authentication; ok deraadt/djm |
20 | - aaron@cvs.openbsd.org 2002/08/08 13:50:23 | ||
21 | [sshconnect1.c] | ||
22 | Use & to test if bits are set, not &&; markus@ ok. | ||
20 | 23 | ||
21 | 20020813 | 24 | 20020813 |
22 | - (tim) [configure.ac] Display OpenSSL header/library version. | 25 | - (tim) [configure.ac] Display OpenSSL header/library version. |
@@ -1514,4 +1517,4 @@ | |||
1514 | - (stevesk) entropy.c: typo in debug message | 1517 | - (stevesk) entropy.c: typo in debug message |
1515 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1518 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1516 | 1519 | ||
1517 | $Id: ChangeLog,v 1.2418 2002/08/20 18:40:03 mouring Exp $ | 1520 | $Id: ChangeLog,v 1.2419 2002/08/20 18:41:15 mouring Exp $ |
diff --git a/sshconnect1.c b/sshconnect1.c index e28b7fc72..2fc9a981a 100644 --- a/sshconnect1.c +++ b/sshconnect1.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect1.c,v 1.51 2002/05/23 19:24:30 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect1.c,v 1.52 2002/08/08 13:50:23 aaron Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/md5.h> | 19 | #include <openssl/md5.h> |
@@ -254,7 +254,7 @@ try_rsa_authentication(int idx) | |||
254 | * load the private key. Try first with empty passphrase; if it | 254 | * load the private key. Try first with empty passphrase; if it |
255 | * fails, ask for a passphrase. | 255 | * fails, ask for a passphrase. |
256 | */ | 256 | */ |
257 | if (public->flags && KEY_FLAG_EXT) | 257 | if (public->flags & KEY_FLAG_EXT) |
258 | private = public; | 258 | private = public; |
259 | else | 259 | else |
260 | private = key_load_private_type(KEY_RSA1, authfile, "", NULL); | 260 | private = key_load_private_type(KEY_RSA1, authfile, "", NULL); |