diff options
| author | jp161948 <none@none> | 2007-11-30 08:38:32 -0800 |
|---|---|---|
| committer | jp161948 <none@none> | 2007-11-30 08:38:32 -0800 |
| commit | 9a8058b57457911fab0e3b4b6f0a97740e7a816d (patch) | |
| tree | abc8710af81f76e7213e3c4ca6bedab695f049a3 /usr/src/cmd/ssh/sshd/auth-rsa.c | |
| parent | e46e4715a19570ec80958ef89a3f1232c476728a (diff) | |
| download | illumos-joyent-9a8058b57457911fab0e3b4b6f0a97740e7a816d.tar.gz | |
PSARC/2007/034 ssh/sshd resync with OpenSSH
5040151 ssh(1) and sshd(1M) should re-key periodically as per-recent recommendations
6492415 ignore UsePrivilegeSeparation keyword in SunSSH
6624784 a few typos in SunSSH source code or its documentation
6626371 cmd/ssh/libssh/common/xlist.c should be cstyle clean
6627880 memory leaks in SunSSH's GSS-API code
6627881 memory leaks in SunSSH's g11n code
6627884 memory leaks in SunSSH's alternative privilege separation code
6627890 memory leaks in cmd/ssh/sshd/auth2-pam.c
6628516 old OpenSSH privilege separation code is not needed in SunSSH
--HG--
rename : usr/src/cmd/ssh/include/monitor.h => deleted_files/usr/src/cmd/ssh/include/monitor.h
rename : usr/src/cmd/ssh/include/monitor_fdpass.h => deleted_files/usr/src/cmd/ssh/include/monitor_fdpass.h
rename : usr/src/cmd/ssh/include/monitor_mm.h => deleted_files/usr/src/cmd/ssh/include/monitor_mm.h
rename : usr/src/cmd/ssh/include/monitor_wrap.h => deleted_files/usr/src/cmd/ssh/include/monitor_wrap.h
rename : usr/src/cmd/ssh/libssh/common/monitor_fdpass.c => deleted_files/usr/src/cmd/ssh/libssh/common/monitor_fdpass.c
rename : usr/src/cmd/ssh/libssh/common/monitor_wrap.c => deleted_files/usr/src/cmd/ssh/libssh/common/monitor_wrap.c
rename : usr/src/cmd/ssh/sshd/monitor.c => deleted_files/usr/src/cmd/ssh/sshd/monitor.c
rename : usr/src/cmd/ssh/sshd/monitor_mm.c => deleted_files/usr/src/cmd/ssh/sshd/monitor_mm.c
Diffstat (limited to 'usr/src/cmd/ssh/sshd/auth-rsa.c')
| -rw-r--r-- | usr/src/cmd/ssh/sshd/auth-rsa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/cmd/ssh/sshd/auth-rsa.c b/usr/src/cmd/ssh/sshd/auth-rsa.c index a4896f20e1..3e0e6ea50d 100644 --- a/usr/src/cmd/ssh/sshd/auth-rsa.c +++ b/usr/src/cmd/ssh/sshd/auth-rsa.c @@ -34,7 +34,6 @@ RCSID("$OpenBSD: auth-rsa.c,v 1.56 2002/06/10 16:53:06 stevesk Exp $"); #include "servconf.h" #include "auth.h" #include "hostfile.h" -#include "monitor_wrap.h" #include "ssh.h" /* import */ @@ -124,7 +123,7 @@ auth_rsa_challenge_dialog(Key *key) if ((encrypted_challenge = BN_new()) == NULL) fatal("auth_rsa_challenge_dialog: BN_new() failed"); - challenge = PRIVSEP(auth_rsa_generate_challenge(key)); + challenge = auth_rsa_generate_challenge(key); /* Encrypt the challenge with the public key. */ rsa_public_encrypt(encrypted_challenge, challenge, key->rsa); @@ -142,7 +141,7 @@ auth_rsa_challenge_dialog(Key *key) response[i] = packet_get_char(); packet_check_eom(); - success = PRIVSEP(auth_rsa_verify_response(key, challenge, response)); + success = auth_rsa_verify_response(key, challenge, response); BN_clear_free(challenge); return (success); } @@ -295,7 +294,7 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n) if (pw == NULL) return 0; - if (!PRIVSEP(auth_rsa_key_allowed(pw, client_n, &key))) { + if (!auth_rsa_key_allowed(pw, client_n, &key)) { auth_clear_options(); return (0); } |