RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[sshconnect1.c]
     Use & to test if bits are set, not &&; markus@ ok.
This commit is contained in:
Ben Lindstrom 2002-08-20 18:41:15 +00:00
parent 0deb5d958a
commit e143f61b6f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -17,6 +17,9 @@
[ssh-rsa.c] [ssh-rsa.c]
replace RSA_verify with our own version and avoid the OpenSSL ASN.1 parser replace RSA_verify with our own version and avoid the OpenSSL ASN.1 parser
for authentication; ok deraadt/djm 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 20020813
- (tim) [configure.ac] Display OpenSSL header/library version. - (tim) [configure.ac] Display OpenSSL header/library version.
@ -1514,4 +1517,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

4
sshconnect1.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #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/bn.h>
#include <openssl/md5.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 * load the private key. Try first with empty passphrase; if it
* fails, ask for a passphrase. * fails, ask for a passphrase.
*/ */
if (public->flags && KEY_FLAG_EXT) if (public->flags & KEY_FLAG_EXT)
private = public; private = public;
else else
private = key_load_private_type(KEY_RSA1, authfile, "", NULL); private = key_load_private_type(KEY_RSA1, authfile, "", NULL);