tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) OpenBSD CVS sync: 

- markus@cvs.openbsd.org  2000/09/17 09:38:59
     [sshconnect2.c sshd.c]
     fix DEBUG_KEXDH
   - markus@cvs.openbsd.org  2000/09/17 09:52:51
     [sshconnect.c]
     yes no; ok niels@
   - markus@cvs.openbsd.org  2000/09/21 04:55:11
     [sshd.8]
     typo
   - markus@cvs.openbsd.org  2000/09/21 05:03:54
     [serverloop.c]
     typo
   - markus@cvs.openbsd.org  2000/09/21 05:11:42
     scp.c
     utime() to utimes(); mouring@pconline.com
   - markus@cvs.openbsd.org  2000/09/21 05:25:08
     sshconnect2.c
     change login logic in ssh2, allows plugin of other auth methods
   - markus@cvs.openbsd.org  2000/09/21 05:25:35
     [auth2.c channels.c channels.h clientloop.c dispatch.c dispatch.h]
     [serverloop.c]
     add context to dispatch_run
   - markus@cvs.openbsd.org  2000/09/21 05:07:52
     authfd.c authfd.h ssh-agent.c
     bug compat for old ssh.com software
This commit is contained in:
Damien Miller 2000-09-23 17:15:56 +11:00
parent f056e23dd6
commit 62cee00753
16 changed files with 454 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -8,6 +8,32 @@
- (djm) NeXT patch from Ben Lindstrom <mouring@pconline.com> - (djm) NeXT patch from Ben Lindstrom <mouring@pconline.com>
- (djm) Use printf %lld instead of %qd in sftp-server.c. Fix from - (djm) Use printf %lld instead of %qd in sftp-server.c. Fix from
Michael Stone <mstone@cs.loyola.edu> Michael Stone <mstone@cs.loyola.edu>
- (djm) OpenBSD CVS sync:
- markus@cvs.openbsd.org 2000/09/17 09:38:59
[sshconnect2.c sshd.c]
fix DEBUG_KEXDH
- markus@cvs.openbsd.org 2000/09/17 09:52:51
[sshconnect.c]
yes no; ok niels@
- markus@cvs.openbsd.org 2000/09/21 04:55:11
[sshd.8]
typo
- markus@cvs.openbsd.org 2000/09/21 05:03:54
[serverloop.c]
typo
- markus@cvs.openbsd.org 2000/09/21 05:11:42
scp.c
utime() to utimes(); mouring@pconline.com
- markus@cvs.openbsd.org 2000/09/21 05:25:08
sshconnect2.c
change login logic in ssh2, allows plugin of other auth methods
- markus@cvs.openbsd.org 2000/09/21 05:25:35
[auth2.c channels.c channels.h clientloop.c dispatch.c dispatch.h]
[serverloop.c]
add context to dispatch_run
- markus@cvs.openbsd.org 2000/09/21 05:07:52
authfd.c authfd.h ssh-agent.c
bug compat for old ssh.com software
20000920 20000920
- (djm) Fix bad path substitution. Report from Andrew Miner - (djm) Fix bad path substitution. Report from Andrew Miner

16
auth2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth2.c,v 1.14 2000/09/07 20:27:49 deraadt Exp $"); RCSID("$OpenBSD: auth2.c,v 1.15 2000/09/21 11:25:32 markus Exp $");
#include <openssl/dsa.h> #include <openssl/dsa.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
@ -64,9 +64,9 @@ extern int session_id2_len;
/* protocol */ /* protocol */
void input_service_request(int type, int plen); void input_service_request(int type, int plen, void *ctxt);
void input_userauth_request(int type, int plen); void input_userauth_request(int type, int plen, void *ctxt);
void protocol_error(int type, int plen); void protocol_error(int type, int plen, void *ctxt);
/* auth */ /* auth */
int ssh2_auth_none(struct passwd *pw); int ssh2_auth_none(struct passwd *pw);
@ -104,12 +104,12 @@ do_authentication2()
dispatch_init(&protocol_error); dispatch_init(&protocol_error);
dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);
dispatch_run(DISPATCH_BLOCK, &userauth_success); dispatch_run(DISPATCH_BLOCK, &userauth_success, NULL);
do_authenticated2(); do_authenticated2();
} }
void void
protocol_error(int type, int plen) protocol_error(int type, int plen, void *ctxt)
{ {
log("auth: protocol error: type %d plen %d", type, plen); log("auth: protocol error: type %d plen %d", type, plen);
packet_start(SSH2_MSG_UNIMPLEMENTED); packet_start(SSH2_MSG_UNIMPLEMENTED);
@ -119,7 +119,7 @@ protocol_error(int type, int plen)
} }
void void
input_service_request(int type, int plen) input_service_request(int type, int plen, void *ctxt)
{ {
unsigned int len; unsigned int len;
int accept = 0; int accept = 0;
@ -148,7 +148,7 @@ input_service_request(int type, int plen)
} }
void void
input_userauth_request(int type, int plen) input_userauth_request(int type, int plen, void *ctxt)
{ {
static void (*authlog) (const char *fmt,...) = verbose; static void (*authlog) (const char *fmt,...) = verbose;
static int attempt = 0; static int attempt = 0;

11
authfd.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: authfd.c,v 1.27 2000/09/07 20:27:49 deraadt Exp $"); RCSID("$OpenBSD: authfd.c,v 1.28 2000/09/21 11:07:50 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "rsa.h" #include "rsa.h"
@ -51,6 +51,7 @@ RCSID("$OpenBSD: authfd.c,v 1.27 2000/09/07 20:27:49 deraadt Exp $");
#include "authfd.h" #include "authfd.h"
#include "kex.h" #include "kex.h"
#include "dsa.h" #include "dsa.h"
#include "compat.h"
/* helper */ /* helper */
int decode_reply(int type); int decode_reply(int type);
@ -364,20 +365,24 @@ ssh_agent_sign(AuthenticationConnection *auth,
unsigned char **sigp, int *lenp, unsigned char **sigp, int *lenp,
unsigned char *data, int datalen) unsigned char *data, int datalen)
{ {
extern int datafellows;
Buffer msg; Buffer msg;
unsigned char *blob; unsigned char *blob;
unsigned int blen; unsigned int blen;
int type; int type, flags = 0;
int ret = -1; int ret = -1;
if (dsa_make_key_blob(key, &blob, &blen) == 0) if (dsa_make_key_blob(key, &blob, &blen) == 0)
return -1; return -1;
if (datafellows & SSH_BUG_SIGBLOB)
flags = SSH_AGENT_OLD_SIGNATURE;
buffer_init(&msg); buffer_init(&msg);
buffer_put_char(&msg, SSH2_AGENTC_SIGN_REQUEST); buffer_put_char(&msg, SSH2_AGENTC_SIGN_REQUEST);
buffer_put_string(&msg, blob, blen); buffer_put_string(&msg, blob, blen);
buffer_put_string(&msg, data, datalen); buffer_put_string(&msg, data, datalen);
buffer_put_int(&msg, 0); /* flags, unused */ buffer_put_int(&msg, flags);
xfree(blob); xfree(blob);
if (ssh_request_reply(auth, &msg, &msg) == 0) { if (ssh_request_reply(auth, &msg, &msg) == 0) {

5
authfd.h
View File

@ -11,7 +11,7 @@
* called by a name other than "ssh" or "Secure Shell". * called by a name other than "ssh" or "Secure Shell".
*/ */
/* RCSID("$OpenBSD: authfd.h,v 1.11 2000/09/07 20:27:49 deraadt Exp $"); */ /* RCSID("$OpenBSD: authfd.h,v 1.12 2000/09/21 11:07:51 markus Exp $"); */
#ifndef AUTHFD_H #ifndef AUTHFD_H
#define AUTHFD_H #define AUTHFD_H
@ -37,6 +37,9 @@
#define SSH2_AGENTC_REMOVE_IDENTITY 18 #define SSH2_AGENTC_REMOVE_IDENTITY 18
#define SSH2_AGENTC_REMOVE_ALL_IDENTITIES 19 #define SSH2_AGENTC_REMOVE_ALL_IDENTITIES 19
#define SSH_AGENT_OLD_SIGNATURE 0x01
typedef struct { typedef struct {
int fd; int fd;
Buffer identities; Buffer identities;

28
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.68 2000/09/07 20:40:29 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.69 2000/09/21 11:25:33 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "packet.h" #include "packet.h"
@ -998,7 +998,7 @@ channel_output_poll()
*/ */
void void
channel_input_data(int type, int plen) channel_input_data(int type, int plen, void *ctxt)
{ {
int id; int id;
char *data; char *data;
@ -1043,7 +1043,7 @@ channel_input_data(int type, int plen)
xfree(data); xfree(data);
} }
void void
channel_input_extended_data(int type, int plen) channel_input_extended_data(int type, int plen, void *ctxt)
{ {
int id; int id;
int tcode; int tcode;
@ -1113,7 +1113,7 @@ channel_not_very_much_buffered_data()
} }
void void
channel_input_ieof(int type, int plen) channel_input_ieof(int type, int plen, void *ctxt)
{ {
int id; int id;
Channel *c; Channel *c;
@ -1128,7 +1128,7 @@ channel_input_ieof(int type, int plen)
} }
void void
channel_input_close(int type, int plen) channel_input_close(int type, int plen, void *ctxt)
{ {
int id; int id;
Channel *c; Channel *c;
@ -1167,7 +1167,7 @@ channel_input_close(int type, int plen)
/* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */ /* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */
void void
channel_input_oclose(int type, int plen) channel_input_oclose(int type, int plen, void *ctxt)
{ {
int id = packet_get_int(); int id = packet_get_int();
Channel *c = channel_lookup(id); Channel *c = channel_lookup(id);
@ -1178,7 +1178,7 @@ channel_input_oclose(int type, int plen)
} }
void void
channel_input_close_confirmation(int type, int plen) channel_input_close_confirmation(int type, int plen, void *ctxt)
{ {
int id = packet_get_int(); int id = packet_get_int();
Channel *c = channel_lookup(id); Channel *c = channel_lookup(id);
@ -1194,7 +1194,7 @@ channel_input_close_confirmation(int type, int plen)
} }
void void
channel_input_open_confirmation(int type, int plen) channel_input_open_confirmation(int type, int plen, void *ctxt)
{ {
int id, remote_id; int id, remote_id;
Channel *c; Channel *c;
@ -1228,7 +1228,7 @@ channel_input_open_confirmation(int type, int plen)
} }
void void
channel_input_open_failure(int type, int plen) channel_input_open_failure(int type, int plen, void *ctxt)
{ {
int id; int id;
Channel *c; Channel *c;
@ -1256,7 +1256,7 @@ channel_input_open_failure(int type, int plen)
} }
void void
channel_input_channel_request(int type, int plen) channel_input_channel_request(int type, int plen, void *ctxt)
{ {
int id; int id;
Channel *c; Channel *c;
@ -1281,7 +1281,7 @@ debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event);
} }
void void
channel_input_window_adjust(int type, int plen) channel_input_window_adjust(int type, int plen, void *ctxt)
{ {
Channel *c; Channel *c;
int id, adjust; int id, adjust;
@ -1659,7 +1659,7 @@ channel_connect_to(const char *host, u_short host_port)
*/ */
void void
channel_input_port_open(int type, int plen) channel_input_port_open(int type, int plen, void *ctxt)
{ {
u_short host_port; u_short host_port;
char *host, *originator_string; char *host, *originator_string;
@ -2000,7 +2000,7 @@ x11_connect_display(void)
*/ */
void void
x11_input_open(int type, int plen) x11_input_open(int type, int plen, void *ctxt)
{ {
int remote_channel, sock = 0, newch; int remote_channel, sock = 0, newch;
char *remote_host; char *remote_host;
@ -2215,7 +2215,7 @@ auth_input_request_forwarding(struct passwd * pw)
/* This is called to process an SSH_SMSG_AGENT_OPEN message. */ /* This is called to process an SSH_SMSG_AGENT_OPEN message. */
void void
auth_input_open_request(int type, int plen) auth_input_open_request(int type, int plen, void *ctxt)
{ {
int remch, sock, newch; int remch, sock, newch;
char *dummyname; char *dummyname;

30
channels.h
View File

@ -32,7 +32,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* RCSID("$OpenBSD: channels.h,v 1.19 2000/09/07 21:13:37 markus Exp $"); */ /* RCSID("$OpenBSD: channels.h,v 1.20 2000/09/21 11:25:33 markus Exp $"); */
#ifndef CHANNELS_H #ifndef CHANNELS_H
#define CHANNELS_H #define CHANNELS_H
@ -131,18 +131,18 @@ int
channel_new(char *ctype, int type, int rfd, int wfd, int efd, channel_new(char *ctype, int type, int rfd, int wfd, int efd,
int window, int maxpack, int extended_usage, char *remote_name); int window, int maxpack, int extended_usage, char *remote_name);
void channel_input_channel_request(int type, int plen); void channel_input_channel_request(int type, int plen, void *ctxt);
void channel_input_close(int type, int plen); void channel_input_close(int type, int plen, void *ctxt);
void channel_input_close_confirmation(int type, int plen); void channel_input_close_confirmation(int type, int plen, void *ctxt);
void channel_input_data(int type, int plen); void channel_input_data(int type, int plen, void *ctxt);
void channel_input_extended_data(int type, int plen); void channel_input_extended_data(int type, int plen, void *ctxt);
void channel_input_ieof(int type, int plen); void channel_input_ieof(int type, int plen, void *ctxt);
void channel_input_oclose(int type, int plen); void channel_input_oclose(int type, int plen, void *ctxt);
void channel_input_open_confirmation(int type, int plen); void channel_input_open_confirmation(int type, int plen, void *ctxt);
void channel_input_open_failure(int type, int plen); void channel_input_open_failure(int type, int plen, void *ctxt);
void channel_input_port_open(int type, int plen); void channel_input_port_open(int type, int plen, void *ctxt);
void channel_input_window_adjust(int type, int plen); void channel_input_window_adjust(int type, int plen, void *ctxt);
void channel_input_open(int type, int plen); void channel_input_open(int type, int plen, void *ctxt);
/* Sets specific protocol options. */ /* Sets specific protocol options. */
void channel_set_options(int hostname_in_open); void channel_set_options(int hostname_in_open);
@ -246,7 +246,7 @@ char *x11_create_display_inet(int screen, int x11_display_offset);
* the remote channel number. We should do whatever we want, and respond * the remote channel number. We should do whatever we want, and respond
* with either SSH_MSG_OPEN_CONFIRMATION or SSH_MSG_OPEN_FAILURE. * with either SSH_MSG_OPEN_CONFIRMATION or SSH_MSG_OPEN_FAILURE.
*/ */
void x11_input_open(int type, int plen); void x11_input_open(int type, int plen, void *ctxt);
/* /*
* Requests forwarding of X11 connections. This should be called on the * Requests forwarding of X11 connections. This should be called on the
@ -279,7 +279,7 @@ char *auth_get_socket_name(void);
int auth_input_request_forwarding(struct passwd * pw); int auth_input_request_forwarding(struct passwd * pw);
/* This is called to process an SSH_SMSG_AGENT_OPEN message. */ /* This is called to process an SSH_SMSG_AGENT_OPEN message. */
void auth_input_open_request(int type, int plen); void auth_input_open_request(int type, int plen, void *ctxt);
/* XXX */ /* XXX */
int channel_connect_to(const char *host, u_short host_port); int channel_connect_to(const char *host, u_short host_port);

12
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.35 2000/09/14 20:25:14 markus Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.36 2000/09/21 11:25:33 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
@ -771,7 +771,7 @@ client_process_output(fd_set * writeset)
void void
client_process_buffered_input_packets() client_process_buffered_input_packets()
{ {
dispatch_run(DISPATCH_NONBLOCK, &quit_pending); dispatch_run(DISPATCH_NONBLOCK, &quit_pending, NULL);
} }
/* scan buf[] for '~' before sending data to the peer */ /* scan buf[] for '~' before sending data to the peer */
@ -978,7 +978,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
/*********/ /*********/
void void
client_input_stdout_data(int type, int plen) client_input_stdout_data(int type, int plen, void *ctxt)
{ {
unsigned int data_len; unsigned int data_len;
char *data = packet_get_string(&data_len); char *data = packet_get_string(&data_len);
@ -989,7 +989,7 @@ client_input_stdout_data(int type, int plen)
xfree(data); xfree(data);
} }
void void
client_input_stderr_data(int type, int plen) client_input_stderr_data(int type, int plen, void *ctxt)
{ {
unsigned int data_len; unsigned int data_len;
char *data = packet_get_string(&data_len); char *data = packet_get_string(&data_len);
@ -1000,7 +1000,7 @@ client_input_stderr_data(int type, int plen)
xfree(data); xfree(data);
} }
void void
client_input_exit_status(int type, int plen) client_input_exit_status(int type, int plen, void *ctxt)
{ {
packet_integrity_check(plen, 4, type); packet_integrity_check(plen, 4, type);
exit_status = packet_get_int(); exit_status = packet_get_int();
@ -1018,7 +1018,7 @@ client_input_exit_status(int type, int plen)
/* XXXX move to generic input handler */ /* XXXX move to generic input handler */
void void
client_input_channel_open(int type, int plen) client_input_channel_open(int type, int plen, void *ctxt)
{ {
Channel *c = NULL; Channel *c = NULL;
char *ctype; char *ctype;

8
dispatch.c
View File

@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: dispatch.c,v 1.4 2000/09/07 20:27:51 deraadt Exp $"); RCSID("$OpenBSD: dispatch.c,v 1.5 2000/09/21 11:25:34 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "dispatch.h" #include "dispatch.h"
#include "packet.h" #include "packet.h"
@ -33,7 +33,7 @@ RCSID("$OpenBSD: dispatch.c,v 1.4 2000/09/07 20:27:51 deraadt Exp $");
dispatch_fn *dispatch[DISPATCH_MAX]; dispatch_fn *dispatch[DISPATCH_MAX];
void void
dispatch_protocol_error(int type, int plen) dispatch_protocol_error(int type, int plen, void *ctxt)
{ {
error("Hm, dispatch protocol error: type %d plen %d", type, plen); error("Hm, dispatch protocol error: type %d plen %d", type, plen);
} }
@ -50,7 +50,7 @@ dispatch_set(int type, dispatch_fn *fn)
dispatch[type] = fn; dispatch[type] = fn;
} }
void void
dispatch_run(int mode, int *done) dispatch_run(int mode, int *done, void *ctxt)
{ {
for (;;) { for (;;) {
int plen; int plen;
@ -64,7 +64,7 @@ dispatch_run(int mode, int *done)
return; return;
} }
if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL) if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL)
(*dispatch[type])(type, plen); (*dispatch[type])(type, plen, ctxt);
else else
packet_disconnect("protocol error: rcvd type %d", type); packet_disconnect("protocol error: rcvd type %d", type);
if (done != NULL && *done) if (done != NULL && *done)

6
dispatch.h
View File

@ -26,9 +26,9 @@ enum {
DISPATCH_NONBLOCK DISPATCH_NONBLOCK
}; };
typedef void dispatch_fn(int type, int plen); typedef void dispatch_fn(int type, int plen, void *ctxt);
void dispatch_init(dispatch_fn *dflt); void dispatch_init(dispatch_fn *dflt);
void dispatch_set(int type, dispatch_fn *fn); void dispatch_set(int type, dispatch_fn *fn);
void dispatch_run(int mode, int *done); void dispatch_run(int mode, int *done, void *ctxt);
void dispatch_protocol_error(int type, int plen); void dispatch_protocol_error(int type, int plen, void *ctxt);

15
scp.c
View File

@ -75,11 +75,10 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: scp.c,v 1.39 2000/09/07 20:53:00 markus Exp $"); RCSID("$OpenBSD: scp.c,v 1.40 2000/09/21 11:11:42 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "xmalloc.h" #include "xmalloc.h"
#include <utime.h>
#define _PATH_CP "cp" #define _PATH_CP "cp"
@ -711,8 +710,8 @@ sink(argc, argv)
off_t size; off_t size;
int setimes, targisdir, wrerrno = 0; int setimes, targisdir, wrerrno = 0;
char ch, *cp, *np, *targ, *why, *vect[1], buf[2048]; char ch, *cp, *np, *targ, *why, *vect[1], buf[2048];
struct utimbuf ut;
int dummy_usec; int dummy_usec;
struct timeval tv[2];
#define SCREWUP(str) { why = str; goto screwup; } #define SCREWUP(str) { why = str; goto screwup; }
@ -766,16 +765,18 @@ sink(argc, argv)
if (*cp == 'T') { if (*cp == 'T') {
setimes++; setimes++;
cp++; cp++;
getnum(ut.modtime); getnum(tv[1].tv_sec);
if (*cp++ != ' ') if (*cp++ != ' ')
SCREWUP("mtime.sec not delimited"); SCREWUP("mtime.sec not delimited");
getnum(dummy_usec); getnum(dummy_usec);
tv[1].tv_usec = 0;
if (*cp++ != ' ') if (*cp++ != ' ')
SCREWUP("mtime.usec not delimited"); SCREWUP("mtime.usec not delimited");
getnum(ut.actime); getnum(tv[0].tv_sec);
if (*cp++ != ' ') if (*cp++ != ' ')
SCREWUP("atime.sec not delimited"); SCREWUP("atime.sec not delimited");
getnum(dummy_usec); getnum(dummy_usec);
tv[0].tv_usec = 0;
if (*cp++ != '\0') if (*cp++ != '\0')
SCREWUP("atime.usec not delimited"); SCREWUP("atime.usec not delimited");
(void) atomicio(write, remout, "", 1); (void) atomicio(write, remout, "", 1);
@ -843,7 +844,7 @@ sink(argc, argv)
sink(1, vect); sink(1, vect);
if (setimes) { if (setimes) {
setimes = 0; setimes = 0;
if (utime(np, &ut) < 0) if (utimes(np, tv) < 0)
run_err("%s: set times: %s", run_err("%s: set times: %s",
np, strerror(errno)); np, strerror(errno));
} }
@ -930,7 +931,7 @@ bad: run_err("%s: %s", np, strerror(errno));
(void) response(); (void) response();
if (setimes && wrerr == NO) { if (setimes && wrerr == NO) {
setimes = 0; setimes = 0;
if (utime(np, &ut) < 0) { if (utimes(np, tv) < 0) {
run_err("%s: set times: %s", run_err("%s: set times: %s",
np, strerror(errno)); np, strerror(errno));
wrerr = DISPLAYED; wrerr = DISPLAYED;

12
serverloop.c
View File

@ -389,7 +389,7 @@ drain_output()
void void
process_buffered_input_packets() process_buffered_input_packets()
{ {
dispatch_run(DISPATCH_NONBLOCK, NULL); dispatch_run(DISPATCH_NONBLOCK, NULL, NULL);
} }
/* /*
@ -689,7 +689,7 @@ server_loop2(void)
} }
void void
server_input_stdin_data(int type, int plen) server_input_stdin_data(int type, int plen, void *ctxt)
{ {
char *data; char *data;
unsigned int data_len; unsigned int data_len;
@ -706,7 +706,7 @@ server_input_stdin_data(int type, int plen)
} }
void void
server_input_eof(int type, int plen) server_input_eof(int type, int plen, void *ctxt)
{ {
/* /*
* Eof from the client. The stdin descriptor to the * Eof from the client. The stdin descriptor to the
@ -719,7 +719,7 @@ server_input_eof(int type, int plen)
} }
void void
server_input_window_size(int type, int plen) server_input_window_size(int type, int plen, void *ctxt)
{ {
int row = packet_get_int(); int row = packet_get_int();
int col = packet_get_int(); int col = packet_get_int();
@ -765,7 +765,7 @@ input_direct_tcpip(void)
} }
void void
server_input_channel_open(int type, int plen) server_input_channel_open(int type, int plen, void *ctxt)
{ {
Channel *c = NULL; Channel *c = NULL;
char *ctype; char *ctype;
@ -780,7 +780,7 @@ server_input_channel_open(int type, int plen)
rwindow = packet_get_int(); rwindow = packet_get_int();
rmaxpack = packet_get_int(); rmaxpack = packet_get_int();
debug("channel_input_open: ctype %s rchan %d win %d max %d", debug("server_input_channel_open: ctype %s rchan %d win %d max %d",
ctype, rchan, rwindow, rmaxpack); ctype, rchan, rwindow, rmaxpack);
if (strcmp(ctype, "session") == 0) { if (strcmp(ctype, "session") == 0) {

11
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.36 2000/09/15 07:13:49 deraadt Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.37 2000/09/21 11:07:51 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-agent.c,v 1.36 2000/09/15 07:13:49 deraadt Exp $"); RCSID("$OpenBSD: ssh-agent.c,v 1.37 2000/09/21 11:07:51 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "rsa.h" #include "rsa.h"
@ -56,6 +56,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.36 2000/09/15 07:13:49 deraadt Exp $");
#include "authfd.h" #include "authfd.h"
#include "dsa.h" #include "dsa.h"
#include "kex.h" #include "kex.h"
#include "compat.h"
typedef struct { typedef struct {
int fd; int fd;
@ -237,6 +238,7 @@ process_sign_request2(SocketEntry *e)
Key *key, *private; Key *key, *private;
unsigned char *blob, *data, *signature = NULL; unsigned char *blob, *data, *signature = NULL;
unsigned int blen, dlen, slen = 0; unsigned int blen, dlen, slen = 0;
int flags;
Buffer msg; Buffer msg;
int ok = -1; int ok = -1;
@ -244,7 +246,10 @@ process_sign_request2(SocketEntry *e)
blob = buffer_get_string(&e->input, &blen); blob = buffer_get_string(&e->input, &blen);
data = buffer_get_string(&e->input, &dlen); data = buffer_get_string(&e->input, &dlen);
buffer_get_int(&e->input); /* flags, unused */
flags = buffer_get_int(&e->input);
if (flags & SSH_AGENT_OLD_SIGNATURE)
datafellows = SSH_BUG_SIGBLOB;
key = dsa_key_from_blob(blob, blen); key = dsa_key_from_blob(blob, blen);
if (key != NULL) { if (key != NULL) {

6
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.78 2000/09/07 20:27:54 deraadt Exp $"); RCSID("$OpenBSD: sshconnect.c,v 1.79 2000/09/17 15:52:51 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>
@ -444,8 +444,10 @@ read_yes_or_no(const char *prompt, int defval)
retval = defval; retval = defval;
if (strcmp(buf, "yes") == 0) if (strcmp(buf, "yes") == 0)
retval = 1; retval = 1;
if (strcmp(buf, "no") == 0) else if (strcmp(buf, "no") == 0)
retval = 0; retval = 0;
else
fprintf(stderr, "Please type 'yes' or 'no'.\n");
if (retval != -1) { if (retval != -1) {
if (f != stdin) if (f != stdin)

464
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.18 2000/09/07 20:27:55 deraadt Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.20 2000/09/21 11:25:07 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
@ -49,6 +49,7 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.18 2000/09/07 20:27:55 deraadt Exp $");
#include "dsa.h" #include "dsa.h"
#include "sshconnect.h" #include "sshconnect.h"
#include "authfile.h" #include "authfile.h"
#include "dispatch.h"
#include "authfd.h" #include "authfd.h"
/* import */ /* import */
@ -67,6 +68,9 @@ void
ssh_kex_dh(Kex *kex, char *host, struct sockaddr *hostaddr, ssh_kex_dh(Kex *kex, char *host, struct sockaddr *hostaddr,
Buffer *client_kexinit, Buffer *server_kexinit) Buffer *client_kexinit, Buffer *server_kexinit)
{ {
#ifdef DEBUG_KEXDH
int i;
#endif
int plen, dlen; int plen, dlen;
unsigned int klen, kout; unsigned int klen, kout;
char *signature = NULL; char *signature = NULL;
@ -90,11 +94,11 @@ ssh_kex_dh(Kex *kex, char *host, struct sockaddr *hostaddr,
#ifdef DEBUG_KEXDH #ifdef DEBUG_KEXDH
fprintf(stderr, "\np= "); fprintf(stderr, "\np= ");
bignum_print(dh->p); BN_print_fp(stderr, dh->p);
fprintf(stderr, "\ng= "); fprintf(stderr, "\ng= ");
bignum_print(dh->g); BN_print_fp(stderr, dh->g);
fprintf(stderr, "\npub= "); fprintf(stderr, "\npub= ");
bignum_print(dh->pub_key); BN_print_fp(stderr, dh->pub_key);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
DHparams_print_fp(stderr, dh); DHparams_print_fp(stderr, dh);
#endif #endif
@ -122,7 +126,7 @@ ssh_kex_dh(Kex *kex, char *host, struct sockaddr *hostaddr,
#ifdef DEBUG_KEXDH #ifdef DEBUG_KEXDH
fprintf(stderr, "\ndh_server_pub= "); fprintf(stderr, "\ndh_server_pub= ");
bignum_print(dh_server_pub); BN_print_fp(stderr, dh_server_pub);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
debug("bits %d", BN_num_bits(dh_server_pub)); debug("bits %d", BN_num_bits(dh_server_pub));
#endif #endif
@ -253,8 +257,156 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
/* /*
* Authenticate user * Authenticate user
*/ */
typedef struct Authctxt Authctxt;
typedef struct Authmethod Authmethod;
typedef int sign_cb_fn(
Authctxt *authctxt, Key *key,
unsigned char **sigp, int *lenp, unsigned char *data, int datalen);
struct Authctxt {
const char *server_user;
const char *host;
const char *service;
AuthenticationConnection *agent;
int success;
Authmethod *method;
};
struct Authmethod {
char *name; /* string to compare against server's list */
int (*userauth)(Authctxt *authctxt);
int *enabled; /* flag in option struct that enables method */
int *batch_flag; /* flag in option struct that disables method */
};
void input_userauth_success(int type, int plen, void *ctxt);
void input_userauth_failure(int type, int plen, void *ctxt);
void input_userauth_error(int type, int plen, void *ctxt);
int userauth_pubkey(Authctxt *authctxt);
int userauth_passwd(Authctxt *authctxt);
void authmethod_clear();
Authmethod *authmethod_get(char *auth_list);
Authmethod authmethods[] = {
{"publickey",
userauth_pubkey,
&options.dsa_authentication,
NULL},
{"password",
userauth_passwd,
&options.password_authentication,
&options.batch_mode},
{NULL, NULL, NULL, NULL}
};
void
ssh_userauth2(const char *server_user, char *host)
{
Authctxt authctxt;
int type;
int plen;
debug("send SSH2_MSG_SERVICE_REQUEST");
packet_start(SSH2_MSG_SERVICE_REQUEST);
packet_put_cstring("ssh-userauth");
packet_send();
packet_write_wait();
type = packet_read(&plen);
if (type != SSH2_MSG_SERVICE_ACCEPT) {
fatal("denied SSH2_MSG_SERVICE_ACCEPT: %d", type);
}
if (packet_remaining() > 0) {
char *reply = packet_get_string(&plen);
debug("service_accept: %s", reply);
xfree(reply);
packet_done();
} else {
debug("buggy server: service_accept w/o service");
}
packet_done();
debug("got SSH2_MSG_SERVICE_ACCEPT");
/* setup authentication context */
authctxt.agent = ssh_get_authentication_connection();
authctxt.server_user = server_user;
authctxt.host = host;
authctxt.service = "ssh-connection"; /* service name */
authctxt.success = 0;
authctxt.method = NULL;
/* initial userauth request */
packet_start(SSH2_MSG_USERAUTH_REQUEST);
packet_put_cstring(authctxt.server_user);
packet_put_cstring(authctxt.service);
packet_put_cstring("none");
packet_send();
packet_write_wait();
authmethod_clear();
dispatch_init(&input_userauth_error);
dispatch_set(SSH2_MSG_USERAUTH_SUCCESS, &input_userauth_success);
dispatch_set(SSH2_MSG_USERAUTH_FAILURE, &input_userauth_failure);
dispatch_run(DISPATCH_BLOCK, &authctxt.success, &authctxt); /* loop until success */
if (authctxt.agent != NULL)
ssh_close_authentication_connection(authctxt.agent);
debug("ssh-userauth2 successfull");
}
void
input_userauth_error(int type, int plen, void *ctxt)
{
fatal("input_userauth_error: bad message during authentication");
}
void
input_userauth_success(int type, int plen, void *ctxt)
{
Authctxt *authctxt = ctxt;
if (authctxt == NULL)
fatal("input_userauth_success: no authentication context");
authctxt->success = 1; /* break out */
}
void
input_userauth_failure(int type, int plen, void *ctxt)
{
Authmethod *method = NULL;
Authctxt *authctxt = ctxt;
char *authlist = NULL;
int partial;
int dlen;
if (authctxt == NULL)
fatal("input_userauth_failure: no authentication context");
authlist = packet_get_string(&dlen);
partial = packet_get_char();
packet_done();
if (partial != 0)
debug("partial success");
debug("authentications that can continue: %s", authlist);
for (;;) {
/* try old method or get next method */
method = authmethod_get(authlist);
if (method == NULL)
fatal("Unable to find an authentication method");
if (method->userauth(authctxt) != 0) {
debug2("we sent a packet, wait for reply");
break;
} else {
debug2("we did not send a packet, disable method");
method->enabled = NULL;
}
}
xfree(authlist);
}
int int
ssh2_try_passwd(const char *server_user, const char *host, const char *service) userauth_passwd(Authctxt *authctxt)
{ {
static int attempt = 0; static int attempt = 0;
char prompt[80]; char prompt[80];
@ -267,11 +419,11 @@ ssh2_try_passwd(const char *server_user, const char *host, const char *service)
error("Permission denied, please try again."); error("Permission denied, please try again.");
snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ", snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ",
server_user, host); authctxt->server_user, authctxt->host);
password = read_passphrase(prompt, 0); password = read_passphrase(prompt, 0);
packet_start(SSH2_MSG_USERAUTH_REQUEST); packet_start(SSH2_MSG_USERAUTH_REQUEST);
packet_put_cstring(server_user); packet_put_cstring(authctxt->server_user);
packet_put_cstring(service); packet_put_cstring(authctxt->service);
packet_put_cstring("password"); packet_put_cstring("password");
packet_put_char(0); packet_put_char(0);
packet_put_cstring(password); packet_put_cstring(password);
@ -282,14 +434,8 @@ ssh2_try_passwd(const char *server_user, const char *host, const char *service)
return 1; return 1;
} }
typedef int sign_fn(
Key *key,
unsigned char **sigp, int *lenp,
unsigned char *data, int datalen);
int int
ssh2_sign_and_send_pubkey(Key *k, sign_fn *do_sign, sign_and_send_pubkey(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback)
const char *server_user, const char *host, const char *service)
{ {
Buffer b; Buffer b;
unsigned char *blob, *signature; unsigned char *blob, *signature;
@ -309,18 +455,18 @@ ssh2_sign_and_send_pubkey(Key *k, sign_fn *do_sign,
skip = session_id2_len; skip = session_id2_len;
} }
buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
buffer_put_cstring(&b, server_user); buffer_put_cstring(&b, authctxt->server_user);
buffer_put_cstring(&b, buffer_put_cstring(&b,
datafellows & SSH_BUG_PUBKEYAUTH ? datafellows & SSH_BUG_PUBKEYAUTH ?
"ssh-userauth" : "ssh-userauth" :
service); authctxt->service);
buffer_put_cstring(&b, "publickey"); buffer_put_cstring(&b, "publickey");
buffer_put_char(&b, 1); buffer_put_char(&b, 1);
buffer_put_cstring(&b, KEX_DSS); buffer_put_cstring(&b, KEX_DSS);
buffer_put_string(&b, blob, bloblen); buffer_put_string(&b, blob, bloblen);
/* generate signature */ /* generate signature */
ret = do_sign(k, &signature, &slen, buffer_ptr(&b), buffer_len(&b)); ret = (*sign_callback)(authctxt, k, &signature, &slen, buffer_ptr(&b), buffer_len(&b));
if (ret == -1) { if (ret == -1) {
xfree(blob); xfree(blob);
buffer_free(&b); buffer_free(&b);
@ -333,8 +479,8 @@ ssh2_sign_and_send_pubkey(Key *k, sign_fn *do_sign,
buffer_clear(&b); buffer_clear(&b);
buffer_append(&b, session_id2, session_id2_len); buffer_append(&b, session_id2, session_id2_len);
buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
buffer_put_cstring(&b, server_user); buffer_put_cstring(&b, authctxt->server_user);
buffer_put_cstring(&b, service); buffer_put_cstring(&b, authctxt->service);
buffer_put_cstring(&b, "publickey"); buffer_put_cstring(&b, "publickey");
buffer_put_char(&b, 1); buffer_put_char(&b, 1);
buffer_put_cstring(&b, KEX_DSS); buffer_put_cstring(&b, KEX_DSS);
@ -347,7 +493,7 @@ ssh2_sign_and_send_pubkey(Key *k, sign_fn *do_sign,
/* skip session id and packet type */ /* skip session id and packet type */
if (buffer_len(&b) < skip + 1) if (buffer_len(&b) < skip + 1)
fatal("ssh2_try_pubkey: internal error"); fatal("userauth_pubkey: internal error");
buffer_consume(&b, skip + 1); buffer_consume(&b, skip + 1);
/* put remaining data from buffer into packet */ /* put remaining data from buffer into packet */
@ -362,12 +508,18 @@ ssh2_sign_and_send_pubkey(Key *k, sign_fn *do_sign,
return 1; return 1;
} }
/* sign callback */
int dsa_sign_cb(Authctxt *authctxt, Key *key, unsigned char **sigp, int *lenp,
unsigned char *data, int datalen)
{
return dsa_sign(key, sigp, lenp, data, datalen);
}
int int
ssh2_try_pubkey(char *filename, userauth_pubkey_identity(Authctxt *authctxt, char *filename)
const char *server_user, const char *host, const char *service)
{ {
Key *k; Key *k;
int ret = 0; int i, ret, try_next;
struct stat st; struct stat st;
if (stat(filename, &st) != 0) { if (stat(filename, &st) != 0) {
@ -384,37 +536,40 @@ ssh2_try_pubkey(char *filename,
snprintf(prompt, sizeof prompt, snprintf(prompt, sizeof prompt,
"Enter passphrase for DSA key '%.100s': ", "Enter passphrase for DSA key '%.100s': ",
filename); filename);
passphrase = read_passphrase(prompt, 0); for (i = 0; i < options.number_of_password_prompts; i++) {
success = load_private_key(filename, passphrase, k, NULL); passphrase = read_passphrase(prompt, 0);
memset(passphrase, 0, strlen(passphrase)); if (strcmp(passphrase, "") != 0) {
xfree(passphrase); success = load_private_key(filename, passphrase, k, NULL);
try_next = 0;
} else {
debug2("no passphrase given, try next key");
try_next = 1;
}
memset(passphrase, 0, strlen(passphrase));
xfree(passphrase);
if (success || try_next)
break;
debug2("bad passphrase given, try again...");
}
if (!success) { if (!success) {
key_free(k); key_free(k);
return 0; return 0;
} }
} }
ret = ssh2_sign_and_send_pubkey(k, dsa_sign, server_user, host, service); ret = sign_and_send_pubkey(authctxt, k, dsa_sign_cb);
key_free(k); key_free(k);
return ret; return ret;
} }
int agent_sign( /* sign callback */
Key *key, int agent_sign_cb(Authctxt *authctxt, Key *key, unsigned char **sigp, int *lenp,
unsigned char **sigp, int *lenp,
unsigned char *data, int datalen) unsigned char *data, int datalen)
{ {
int ret = -1; return ssh_agent_sign(authctxt->agent, key, sigp, lenp, data, datalen);
AuthenticationConnection *ac = ssh_get_authentication_connection();
if (ac != NULL) {
ret = ssh_agent_sign(ac, key, sigp, lenp, data, datalen);
ssh_close_authentication_connection(ac);
}
return ret;
} }
int int
ssh2_try_agent(AuthenticationConnection *ac, userauth_pubkey_agent(Authctxt *authctxt)
const char *server_user, const char *host, const char *service)
{ {
static int called = 0; static int called = 0;
char *comment; char *comment;
@ -422,104 +577,151 @@ ssh2_try_agent(AuthenticationConnection *ac,
int ret; int ret;
if (called == 0) { if (called == 0) {
k = ssh_get_first_identity(ac, &comment, 2); k = ssh_get_first_identity(authctxt->agent, &comment, 2);
called ++; called = 1;
} else { } else {
k = ssh_get_next_identity(ac, &comment, 2); k = ssh_get_next_identity(authctxt->agent, &comment, 2);
} }
if (k == NULL) if (k == NULL) {
debug2("no more DSA keys from agent");
return 0; return 0;
}
debug("trying DSA agent key %s", comment); debug("trying DSA agent key %s", comment);
xfree(comment); xfree(comment);
ret = ssh2_sign_and_send_pubkey(k, agent_sign, server_user, host, service); ret = sign_and_send_pubkey(authctxt, k, agent_sign_cb);
key_free(k); key_free(k);
return ret; return ret;
} }
void int
ssh_userauth2(const char *server_user, char *host) userauth_pubkey(Authctxt *authctxt)
{ {
AuthenticationConnection *ac = ssh_get_authentication_connection(); static int idx = 0;
int type; int sent = 0;
int plen;
int sent;
unsigned int dlen;
int partial;
int i = 0;
char *auths;
char *service = "ssh-connection"; /* service name */
debug("send SSH2_MSG_SERVICE_REQUEST"); if (authctxt->agent != NULL)
packet_start(SSH2_MSG_SERVICE_REQUEST); sent = userauth_pubkey_agent(authctxt);
packet_put_cstring("ssh-userauth"); while (sent == 0 && idx < options.num_identity_files2)
packet_send(); sent = userauth_pubkey_identity(authctxt, options.identity_files2[idx++]);
packet_write_wait(); return sent;
}
type = packet_read(&plen);
if (type != SSH2_MSG_SERVICE_ACCEPT) {
fatal("denied SSH2_MSG_SERVICE_ACCEPT: %d", type); /* find auth method */
}
if (packet_remaining() > 0) { #define DELIM ","
char *reply = packet_get_string(&plen);
debug("service_accept: %s", reply); static char *def_authlist = "publickey,password";
xfree(reply); static char *authlist_current = NULL; /* clean copy used for comparison */
} else { static char *authname_current = NULL; /* last used auth method */
/* payload empty for ssh-2.0.13 ?? */ static char *authlist_working = NULL; /* copy that gets modified by strtok_r() */
debug("buggy server: service_accept w/o service"); static char *authlist_state = NULL; /* state variable for strtok_r() */
}
packet_done(); /*
debug("got SSH2_MSG_SERVICE_ACCEPT"); * Before starting to use a new authentication method list sent by the
* server, reset internal variables. This should also be called when
/* INITIAL request for auth */ * finished processing server list to free resources.
packet_start(SSH2_MSG_USERAUTH_REQUEST); */
packet_put_cstring(server_user); void
packet_put_cstring(service); authmethod_clear()
packet_put_cstring("none"); {
packet_send(); if (authlist_current != NULL) {
packet_write_wait(); xfree(authlist_current);
authlist_current = NULL;
for (;;) { }
sent = 0; if (authlist_working != NULL) {
type = packet_read(&plen); xfree(authlist_working);
if (type == SSH2_MSG_USERAUTH_SUCCESS) authlist_working = NULL;
break; }
if (type != SSH2_MSG_USERAUTH_FAILURE) if (authname_current != NULL) {
fatal("access denied: %d", type); xfree(authname_current);
/* SSH2_MSG_USERAUTH_FAILURE means: try again */ authlist_state = NULL;
auths = packet_get_string(&dlen); }
debug("authentications that can continue: %s", auths); if (authlist_state != NULL)
partial = packet_get_char(); authlist_state = NULL;
packet_done(); return;
if (partial) }
debug("partial success");
if (options.dsa_authentication && /*
strstr(auths, "publickey") != NULL) { * given auth method name, if configurable options permit this method fill
if (ac != NULL) * in auth_ident field and return true, otherwise return false.
sent = ssh2_try_agent(ac, */
server_user, host, service); int
if (!sent) { authmethod_is_enabled(Authmethod *method)
while (i < options.num_identity_files2) { {
sent = ssh2_try_pubkey( if (method == NULL)
options.identity_files2[i++], return 0;
server_user, host, service); /* return false if options indicate this method is disabled */
if (sent) if (method->enabled == NULL || *method->enabled == 0)
break; return 0;
} /* return false if batch mode is enabled but method needs interactive mode */
} if (method->batch_flag != NULL && *method->batch_flag != 0)
} return 0;
if (!sent) { return 1;
if (options.password_authentication && }
!options.batch_mode &&
strstr(auths, "password") != NULL) { Authmethod *
sent = ssh2_try_passwd(server_user, host, service); authmethod_lookup(const char *name)
} {
} Authmethod *method = NULL;
if (!sent) if (name != NULL)
fatal("Permission denied (%s).", auths); for (method = authmethods; method->name != NULL; method++)
xfree(auths); if (strcmp(name, method->name) == 0)
} return method;
if (ac != NULL) debug2("Unrecognized authentication method name: %s", name ? name : "NULL");
ssh_close_authentication_connection(ac); return NULL;
packet_done(); }
debug("ssh-userauth2 successfull");
/*
* Given the authentication method list sent by the server, return the
* next method we should try. If the server initially sends a nil list,
* use a built-in default list. If the server sends a nil list after
* previously sending a valid list, continue using the list originally
* sent.
*/
Authmethod *
authmethod_get(char *authlist)
{
char *name = NULL;
Authmethod *method = NULL;
/* Use a suitable default if we're passed a nil list. */
if (authlist == NULL || strlen(authlist) == 0)
authlist = def_authlist;
if (authlist_current == NULL || strcmp(authlist, authlist_current) != 0) {
/* start over if passed a different list */
authmethod_clear();
authlist_current = xstrdup(authlist);
authlist_working = xstrdup(authlist);
name = strtok_r(authlist_working, DELIM, &authlist_state);
} else {
/*
* try to use previously used authentication method
* or continue to use previously passed list
*/
name = (authname_current != NULL) ?
authname_current : strtok_r(NULL, DELIM, &authlist_state);
}
while (name != NULL) {
method = authmethod_lookup(name);
if (method != NULL && authmethod_is_enabled(method))
break;
name = strtok_r(NULL, DELIM, &authlist_state);
}
if (authname_current != NULL)
xfree(authname_current);
if (name != NULL) {
debug("next auth method to try is %s", name);
authname_current = xstrdup(name);
return method;
} else {
debug("no more auth methods to try");
authname_current = NULL;
return NULL;
}
} }

3
sshd.8
View File

@ -432,8 +432,7 @@ Default is
If set then if password authentication through Kerberos fails then If set then if password authentication through Kerberos fails then
the password will be validated via any additional local mechanism the password will be validated via any additional local mechanism
such as such as
.Pa /etc/passwd .Pa /etc/passwd .
or SecurID.
Default is Default is
.Dq yes . .Dq yes .
.It Cm KerberosTgtPassing .It Cm KerberosTgtPassing

11
sshd.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.127 2000/09/12 20:53:10 markus Exp $"); RCSID("$OpenBSD: sshd.c,v 1.128 2000/09/17 15:38:59 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
@ -1336,7 +1336,7 @@ do_ssh2_kex()
#ifdef DEBUG_KEXDH #ifdef DEBUG_KEXDH
fprintf(stderr, "\ndh_client_pub= "); fprintf(stderr, "\ndh_client_pub= ");
bignum_print(dh_client_pub); BN_print_fp(stderr, dh_client_pub);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
debug("bits %d", BN_num_bits(dh_client_pub)); debug("bits %d", BN_num_bits(dh_client_pub));
#endif #endif
@ -1346,12 +1346,13 @@ do_ssh2_kex()
#ifdef DEBUG_KEXDH #ifdef DEBUG_KEXDH
fprintf(stderr, "\np= "); fprintf(stderr, "\np= ");
bignum_print(dh->p); BN_print_fp(stderr, dh->p);
fprintf(stderr, "\ng= "); fprintf(stderr, "\ng= ");
bignum_print(dh->g); bn_print(dh->g);
fprintf(stderr, "\npub= "); fprintf(stderr, "\npub= ");
bignum_print(dh->pub_key); BN_print_fp(stderr, dh->pub_key);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
DHparams_print_fp(stderr, dh);
#endif #endif
if (!dh_pub_is_valid(dh, dh_client_pub)) if (!dh_pub_is_valid(dh, dh_client_pub))
packet_disconnect("bad client public DH value"); packet_disconnect("bad client public DH value");