diff options
| author | Damien Miller <djm@mindrot.org> | 1999-11-12 15:19:27 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-11-12 15:19:27 +1100 |
| commit | 6d7b2cd1a32efa2a40c97361065d357a2e60b716 (patch) | |
| tree | 9c34abc2723760ce00b6f3867d7e0cfbd6a7424e /auth-rsa.c | |
| parent | b5f8927a7e3f25cef4c66603a780176e1b9f6082 (diff) | |
| download | openssh-git-6d7b2cd1a32efa2a40c97361065d357a2e60b716.tar.gz | |
- Merged yet more changes from OpenBSD CVS
- [auth-rh-rsa.c auth-rhosts.c auth-rsa.c channels.c clientloop.c]
[ssh.c ssh.h sshconnect.c sshd.c]
make all access to options via 'extern Options options'
and 'extern ServerOptions options' respectively;
options are no longer passed as arguments:
* make options handling more consistent
* remove #include "readconf.h" from ssh.h
* readconf.h is only included if necessary
- [mpaux.c] clear temp buffer
- [servconf.c] print _all_ bad options found in configfile
Diffstat (limited to 'auth-rsa.c')
| -rw-r--r-- | auth-rsa.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -17,7 +17,7 @@ validity of the host key. #include "config.h" #include "includes.h" -RCSID("$Id: auth-rsa.c,v 1.4 1999/11/08 05:15:55 damien Exp $"); +RCSID("$Id: auth-rsa.c,v 1.5 1999/11/12 04:19:27 damien Exp $"); #include "rsa.h" #include "packet.h" @@ -25,6 +25,7 @@ RCSID("$Id: auth-rsa.c,v 1.4 1999/11/08 05:15:55 damien Exp $"); #include "ssh.h" #include "mpaux.h" #include "uidswap.h" +#include "servconf.h" #ifdef HAVE_OPENSSL #include <openssl/rsa.h> @@ -100,7 +101,6 @@ auth_rsa_challenge_dialog(unsigned int bits, BIGNUM *e, BIGNUM *n) len = BN_num_bytes(challenge); if (len <= 0 || len > 32) fatal("auth_rsa_challenge_dialog: bad challenge length %d", len); - memset(buf, 0, 32); BN_bn2bin(challenge, buf + 32 - len); MD5_Init(&md); @@ -136,8 +136,9 @@ auth_rsa_challenge_dialog(unsigned int bits, BIGNUM *e, BIGNUM *n) successful. This may exit if there is a serious protocol violation. */ int -auth_rsa(struct passwd *pw, BIGNUM *client_n, int strict_modes) +auth_rsa(struct passwd *pw, BIGNUM *client_n) { + extern ServerOptions options; char line[8192]; int authenticated; unsigned int bits; @@ -172,7 +173,7 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n, int strict_modes) return 0; } - if (strict_modes) { + if (options.strict_modes) { int fail=0; char buf[1024]; /* Check open file in order to avoid open/stat races */ |