mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-23 18:23:25 +08:00
- markus@cvs.openbsd.org 2001/12/28 15:06:00
[auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c dispatch.h kex.c kex.h serverloop.c ssh.c sshconnect2.c]
remove plen from the dispatch fn. it's no longer used.
This commit is contained in:
Damien Miller
parent
dff5099f13
commit
630d6f4479
@ -71,6 +71,10 @@
|
||||
[packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c]
|
||||
[sshconnect2.c sshd.c]
|
||||
packet_read* no longer return the packet length, since it's not used.
|
||||
- markus@cvs.openbsd.org 2001/12/28 15:06:00
|
||||
[auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c]
|
||||
[dispatch.h kex.c kex.h serverloop.c ssh.c sshconnect2.c]
|
||||
remove plen from the dispatch fn. it's no longer used.
|
||||
|
||||
|
||||
20020121
|
||||
@ -7219,4 +7223,4 @@
|
||||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- Released 1.0pre1
|
||||
|
||||
$Id: ChangeLog,v 1.1743 2002/01/22 12:16:32 djm Exp $
|
||||
$Id: ChangeLog,v 1.1744 2002/01/22 12:17:30 djm Exp $
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: auth2-chall.c,v 1.12 2001/12/28 12:14:27 markus Exp $");
|
||||
RCSID("$OpenBSD: auth2-chall.c,v 1.13 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include "ssh2.h"
|
||||
#include "auth.h"
|
||||
@ -35,7 +35,7 @@ RCSID("$OpenBSD: auth2-chall.c,v 1.12 2001/12/28 12:14:27 markus Exp $");
|
||||
|
||||
static int auth2_challenge_start(Authctxt *);
|
||||
static int send_userauth_info_request(Authctxt *);
|
||||
static void input_userauth_info_response(int, int, u_int32_t, void *);
|
||||
static void input_userauth_info_response(int, u_int32_t, void *);
|
||||
|
||||
#ifdef BSD_AUTH
|
||||
extern KbdintDevice bsdauth_device;
|
||||
@ -234,7 +234,7 @@ send_userauth_info_request(Authctxt *authctxt)
|
||||
}
|
||||
|
||||
static void
|
||||
input_userauth_info_response(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Authctxt *authctxt = ctxt;
|
||||
KbdintAuthctxt *kbdintctxt;
|
||||
|
||||
16
auth2.c
16
auth2.c
@ -23,7 +23,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: auth2.c,v 1.79 2001/12/28 12:14:27 markus Exp $");
|
||||
RCSID("$OpenBSD: auth2.c,v 1.80 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include <openssl/evp.h>
|
||||
|
||||
@ -69,9 +69,9 @@ struct Authmethod {
|
||||
|
||||
/* protocol */
|
||||
|
||||
static void input_service_request(int, int, u_int32_t, void *);
|
||||
static void input_userauth_request(int, int, u_int32_t, void *);
|
||||
static void protocol_error(int, int, u_int32_t, void *);
|
||||
static void input_service_request(int, u_int32_t, void *);
|
||||
static void input_userauth_request(int, u_int32_t, void *);
|
||||
static void protocol_error(int, u_int32_t, void *);
|
||||
|
||||
/* helper */
|
||||
static Authmethod *authmethod_lookup(const char *);
|
||||
@ -130,9 +130,9 @@ do_authentication2(void)
|
||||
}
|
||||
|
||||
static void
|
||||
protocol_error(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
protocol_error(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
log("auth: protocol error: type %d plen %d", type, plen);
|
||||
log("auth: protocol error: type %d", type);
|
||||
packet_start(SSH2_MSG_UNIMPLEMENTED);
|
||||
packet_put_int(seq);
|
||||
packet_send();
|
||||
@ -140,7 +140,7 @@ protocol_error(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
static void
|
||||
input_service_request(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_service_request(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Authctxt *authctxt = ctxt;
|
||||
u_int len;
|
||||
@ -173,7 +173,7 @@ input_service_request(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
static void
|
||||
input_userauth_request(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_request(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Authctxt *authctxt = ctxt;
|
||||
Authmethod *m = NULL;
|
||||
|
||||
32
channels.c
32
channels.c
@ -39,7 +39,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: channels.c,v 1.153 2001/12/28 14:50:54 markus Exp $");
|
||||
RCSID("$OpenBSD: channels.c,v 1.154 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include "ssh.h"
|
||||
#include "ssh1.h"
|
||||
@ -1710,7 +1710,7 @@ channel_output_poll(void)
|
||||
/* -- protocol input */
|
||||
|
||||
void
|
||||
channel_input_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_data(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id;
|
||||
char *data;
|
||||
@ -1754,7 +1754,7 @@ channel_input_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_extended_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_extended_data(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id;
|
||||
int tcode;
|
||||
@ -1794,7 +1794,7 @@ channel_input_extended_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_ieof(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_ieof(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id;
|
||||
Channel *c;
|
||||
@ -1815,7 +1815,7 @@ channel_input_ieof(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_close(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_close(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id;
|
||||
Channel *c;
|
||||
@ -1853,7 +1853,7 @@ channel_input_close(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
|
||||
/* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */
|
||||
void
|
||||
channel_input_oclose(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_oclose(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id = packet_get_int();
|
||||
Channel *c = channel_lookup(id);
|
||||
@ -1865,7 +1865,7 @@ channel_input_oclose(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_close_confirmation(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_close_confirmation(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id = packet_get_int();
|
||||
Channel *c = channel_lookup(id);
|
||||
@ -1881,7 +1881,7 @@ channel_input_close_confirmation(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_open_confirmation(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id, remote_id;
|
||||
Channel *c;
|
||||
@ -1928,7 +1928,7 @@ reason2txt(int reason)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_open_failure(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_open_failure(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id, reason;
|
||||
char *msg = NULL, *lang = NULL;
|
||||
@ -1959,7 +1959,7 @@ channel_input_open_failure(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_channel_request(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_channel_request(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id;
|
||||
Channel *c;
|
||||
@ -1984,7 +1984,7 @@ channel_input_channel_request(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_window_adjust(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_window_adjust(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Channel *c;
|
||||
int id, adjust;
|
||||
@ -2008,7 +2008,7 @@ channel_input_window_adjust(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
void
|
||||
channel_input_port_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
channel_input_port_open(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Channel *c = NULL;
|
||||
u_short host_port;
|
||||
@ -2615,7 +2615,7 @@ x11_connect_display(void)
|
||||
*/
|
||||
|
||||
void
|
||||
x11_input_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
x11_input_open(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Channel *c = NULL;
|
||||
int remote_id, sock = 0;
|
||||
@ -2662,7 +2662,7 @@ x11_input_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
|
||||
/* dummy protocol handler that denies SSH-1 requests (agent/x11) */
|
||||
void
|
||||
deny_input_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
deny_input_open(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int rchan = packet_get_int();
|
||||
switch (type) {
|
||||
@ -2673,7 +2673,7 @@ deny_input_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
error("Warning: ssh server tried X11 forwarding.");
|
||||
break;
|
||||
default:
|
||||
error("deny_input_open: type %d plen %d", type, plen);
|
||||
error("deny_input_open: type %d", type);
|
||||
break;
|
||||
}
|
||||
error("Warning: this is probably a break in attempt by a malicious server.");
|
||||
@ -2873,7 +2873,7 @@ auth_input_request_forwarding(struct passwd * pw)
|
||||
/* This is called to process an SSH_SMSG_AGENT_OPEN message. */
|
||||
|
||||
void
|
||||
auth_input_open_request(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
auth_input_open_request(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Channel *c = NULL;
|
||||
int remote_id, sock;
|
||||
|
||||
30
channels.h
30
channels.h
@ -32,7 +32,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
/* RCSID("$OpenBSD: channels.h,v 1.55 2001/12/20 22:50:24 djm Exp $"); */
|
||||
/* RCSID("$OpenBSD: channels.h,v 1.56 2001/12/28 15:06:00 markus Exp $"); */
|
||||
|
||||
#ifndef CHANNEL_H
|
||||
#define CHANNEL_H
|
||||
@ -157,17 +157,17 @@ int channel_close_fd(int *);
|
||||
|
||||
/* protocol handler */
|
||||
|
||||
void channel_input_channel_request(int, int, u_int32_t, void *);
|
||||
void channel_input_close(int, int, u_int32_t, void *);
|
||||
void channel_input_close_confirmation(int, int, u_int32_t, void *);
|
||||
void channel_input_data(int, int, u_int32_t, void *);
|
||||
void channel_input_extended_data(int, int, u_int32_t, void *);
|
||||
void channel_input_ieof(int, int, u_int32_t, void *);
|
||||
void channel_input_oclose(int, int, u_int32_t, void *);
|
||||
void channel_input_open_confirmation(int, int, u_int32_t, void *);
|
||||
void channel_input_open_failure(int, int, u_int32_t, void *);
|
||||
void channel_input_port_open(int, int, u_int32_t, void *);
|
||||
void channel_input_window_adjust(int, int, u_int32_t, void *);
|
||||
void channel_input_channel_request(int, u_int32_t, void *);
|
||||
void channel_input_close(int, u_int32_t, void *);
|
||||
void channel_input_close_confirmation(int, u_int32_t, void *);
|
||||
void channel_input_data(int, u_int32_t, void *);
|
||||
void channel_input_extended_data(int, u_int32_t, void *);
|
||||
void channel_input_ieof(int, u_int32_t, void *);
|
||||
void channel_input_oclose(int, u_int32_t, void *);
|
||||
void channel_input_open_confirmation(int, u_int32_t, void *);
|
||||
void channel_input_open_failure(int, u_int32_t, void *);
|
||||
void channel_input_port_open(int, u_int32_t, void *);
|
||||
void channel_input_window_adjust(int, u_int32_t, void *);
|
||||
|
||||
/* file descriptor handling (read/write) */
|
||||
|
||||
@ -199,9 +199,9 @@ channel_request_forwarding(const char *, u_short, const char *, u_short, int,
|
||||
|
||||
int x11_connect_display(void);
|
||||
int x11_create_display_inet(int, int, int);
|
||||
void x11_input_open(int, int, u_int32_t, void *);
|
||||
void x11_input_open(int, u_int32_t, void *);
|
||||
void x11_request_forwarding_with_spoofing(int, const char *, const char *);
|
||||
void deny_input_open(int, int, u_int32_t, void *);
|
||||
void deny_input_open(int, u_int32_t, void *);
|
||||
|
||||
/* agent forwarding */
|
||||
|
||||
@ -209,7 +209,7 @@ void auth_request_forwarding(void);
|
||||
char *auth_get_socket_name(void);
|
||||
void auth_sock_cleanup_proc(void *);
|
||||
int auth_input_request_forwarding(struct passwd *);
|
||||
void auth_input_open_request(int, int, u_int32_t, void *);
|
||||
void auth_input_open_request(int, u_int32_t, void *);
|
||||
|
||||
/* channel close */
|
||||
|
||||
|
||||
12
clientloop.c
12
clientloop.c
@ -59,7 +59,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: clientloop.c,v 1.93 2001/12/28 12:14:27 markus Exp $");
|
||||
RCSID("$OpenBSD: clientloop.c,v 1.94 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include "ssh.h"
|
||||
#include "ssh1.h"
|
||||
@ -1008,7 +1008,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
|
||||
/*********/
|
||||
|
||||
static void
|
||||
client_input_stdout_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
client_input_stdout_data(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
u_int data_len;
|
||||
char *data = packet_get_string(&data_len);
|
||||
@ -1018,7 +1018,7 @@ client_input_stdout_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
xfree(data);
|
||||
}
|
||||
static void
|
||||
client_input_stderr_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
client_input_stderr_data(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
u_int data_len;
|
||||
char *data = packet_get_string(&data_len);
|
||||
@ -1028,7 +1028,7 @@ client_input_stderr_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
xfree(data);
|
||||
}
|
||||
static void
|
||||
client_input_exit_status(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
client_input_exit_status(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
exit_status = packet_get_int();
|
||||
packet_check_eom();
|
||||
@ -1149,7 +1149,7 @@ client_request_agent(const char *request_type, int rchan)
|
||||
|
||||
/* XXXX move to generic input handler */
|
||||
static void
|
||||
client_input_channel_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
client_input_channel_open(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Channel *c = NULL;
|
||||
char *ctype;
|
||||
@ -1201,7 +1201,7 @@ client_input_channel_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
xfree(ctype);
|
||||
}
|
||||
static void
|
||||
client_input_channel_req(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
client_input_channel_req(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Channel *c = NULL;
|
||||
int id, reply, success = 0;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: dispatch.c,v 1.13 2001/12/28 14:50:54 markus Exp $");
|
||||
RCSID("$OpenBSD: dispatch.c,v 1.14 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include "ssh1.h"
|
||||
#include "ssh2.h"
|
||||
@ -37,10 +37,9 @@ RCSID("$OpenBSD: dispatch.c,v 1.13 2001/12/28 14:50:54 markus Exp $");
|
||||
dispatch_fn *dispatch[DISPATCH_MAX];
|
||||
|
||||
void
|
||||
dispatch_protocol_error(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
fatal("dispatch_protocol_error: type %d seq %u plen %d", type,
|
||||
seq, plen);
|
||||
fatal("dispatch_protocol_error: type %d seq %u", type, seq);
|
||||
}
|
||||
void
|
||||
dispatch_init(dispatch_fn *dflt)
|
||||
@ -69,7 +68,7 @@ dispatch_run(int mode, int *done, void *ctxt)
|
||||
return;
|
||||
}
|
||||
if (type > 0 && type < DISPATCH_MAX && dispatch[type] != NULL)
|
||||
(*dispatch[type])(type, 1234, seqnr, ctxt);
|
||||
(*dispatch[type])(type, seqnr, ctxt);
|
||||
else
|
||||
packet_disconnect("protocol error: rcvd type %d", type);
|
||||
if (done != NULL && *done)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: dispatch.h,v 1.7 2001/12/20 22:50:24 djm Exp $ */
|
||||
/* $OpenBSD: dispatch.h,v 1.8 2001/12/28 15:06:00 markus Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
||||
@ -28,9 +28,9 @@ enum {
|
||||
DISPATCH_NONBLOCK
|
||||
};
|
||||
|
||||
typedef void dispatch_fn(int, int, u_int32_t, void *);
|
||||
typedef void dispatch_fn(int, u_int32_t, void *);
|
||||
|
||||
void dispatch_init(dispatch_fn *);
|
||||
void dispatch_set(int, dispatch_fn *);
|
||||
void dispatch_run(int, int *, void *);
|
||||
void dispatch_protocol_error(int, int, u_int32_t, void *);
|
||||
void dispatch_protocol_error(int, u_int32_t, void *);
|
||||
|
||||
8
kex.c
8
kex.c
@ -23,7 +23,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: kex.c,v 1.40 2001/12/28 14:50:54 markus Exp $");
|
||||
RCSID("$OpenBSD: kex.c,v 1.41 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
|
||||
@ -107,9 +107,9 @@ kex_prop_free(char **proposal)
|
||||
}
|
||||
|
||||
static void
|
||||
kex_protocol_error(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
kex_protocol_error(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
error("Hm, kex protocol error: type %d plen %d", type, plen);
|
||||
error("Hm, kex protocol error: type %d seq %u", type, seq);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -164,7 +164,7 @@ kex_send_kexinit(Kex *kex)
|
||||
}
|
||||
|
||||
void
|
||||
kex_input_kexinit(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
char *ptr;
|
||||
int dlen;
|
||||
|
||||
4
kex.h
4
kex.h
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: kex.h,v 1.27 2001/12/20 22:50:24 djm Exp $ */
|
||||
/* $OpenBSD: kex.h,v 1.28 2001/12/28 15:06:00 markus Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
||||
@ -115,7 +115,7 @@ Kex *kex_setup(char *[PROPOSAL_MAX]);
|
||||
void kex_finish(Kex *);
|
||||
|
||||
void kex_send_kexinit(Kex *);
|
||||
void kex_input_kexinit(int, int, u_int32_t, void *);
|
||||
void kex_input_kexinit(int, u_int32_t, void *);
|
||||
void kex_derive_keys(Kex *, u_char *, BIGNUM *);
|
||||
|
||||
void kexdh(Kex *);
|
||||
|
||||
14
serverloop.c
14
serverloop.c
@ -35,7 +35,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: serverloop.c,v 1.92 2001/12/28 14:50:54 markus Exp $");
|
||||
RCSID("$OpenBSD: serverloop.c,v 1.93 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include "xmalloc.h"
|
||||
#include "packet.h"
|
||||
@ -782,7 +782,7 @@ server_loop2(Authctxt *authctxt)
|
||||
}
|
||||
|
||||
static void
|
||||
server_input_channel_failure(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
server_input_channel_failure(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
debug("Got CHANNEL_FAILURE for keepalive");
|
||||
/*
|
||||
@ -795,7 +795,7 @@ server_input_channel_failure(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
|
||||
|
||||
static void
|
||||
server_input_stdin_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
server_input_stdin_data(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
char *data;
|
||||
u_int data_len;
|
||||
@ -812,7 +812,7 @@ server_input_stdin_data(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
static void
|
||||
server_input_eof(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
server_input_eof(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
/*
|
||||
* Eof from the client. The stdin descriptor to the
|
||||
@ -825,7 +825,7 @@ server_input_eof(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
static void
|
||||
server_input_window_size(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
server_input_window_size(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int row = packet_get_int();
|
||||
int col = packet_get_int();
|
||||
@ -903,7 +903,7 @@ server_request_session(char *ctype)
|
||||
}
|
||||
|
||||
static void
|
||||
server_input_channel_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
server_input_channel_open(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Channel *c = NULL;
|
||||
char *ctype;
|
||||
@ -953,7 +953,7 @@ server_input_channel_open(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
}
|
||||
|
||||
static void
|
||||
server_input_global_request(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
server_input_global_request(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
char *rtype;
|
||||
int want_reply;
|
||||
|
||||
4
ssh.c
4
ssh.c
@ -39,7 +39,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: ssh.c,v 1.156 2001/12/28 14:50:54 markus Exp $");
|
||||
RCSID("$OpenBSD: ssh.c,v 1.157 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/err.h>
|
||||
@ -1014,7 +1014,7 @@ ssh_session(void)
|
||||
}
|
||||
|
||||
static void
|
||||
client_subsystem_reply(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
client_subsystem_reply(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
int id, len;
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: sshconnect2.c,v 1.91 2001/12/28 14:50:54 markus Exp $");
|
||||
RCSID("$OpenBSD: sshconnect2.c,v 1.92 2001/12/28 15:06:00 markus Exp $");
|
||||
|
||||
#include <openssl/bn.h>
|
||||
#include <openssl/md5.h>
|
||||
@ -174,12 +174,12 @@ struct Authmethod {
|
||||
int *batch_flag; /* flag in option struct that disables method */
|
||||
};
|
||||
|
||||
void input_userauth_success(int, int, u_int32_t, void *);
|
||||
void input_userauth_failure(int, int, u_int32_t, void *);
|
||||
void input_userauth_banner(int, int, u_int32_t, void *);
|
||||
void input_userauth_error(int, int, u_int32_t, void *);
|
||||
void input_userauth_info_req(int, int, u_int32_t, void *);
|
||||
void input_userauth_pk_ok(int, int, u_int32_t, void *);
|
||||
void input_userauth_success(int, u_int32_t, void *);
|
||||
void input_userauth_failure(int, u_int32_t, void *);
|
||||
void input_userauth_banner(int, u_int32_t, void *);
|
||||
void input_userauth_error(int, u_int32_t, void *);
|
||||
void input_userauth_info_req(int, u_int32_t, void *);
|
||||
void input_userauth_pk_ok(int, u_int32_t, void *);
|
||||
|
||||
int userauth_none(Authctxt *);
|
||||
int userauth_pubkey(Authctxt *);
|
||||
@ -307,13 +307,13 @@ userauth(Authctxt *authctxt, char *authlist)
|
||||
}
|
||||
}
|
||||
void
|
||||
input_userauth_error(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_error(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
fatal("input_userauth_error: bad message during authentication: "
|
||||
"type %d", type);
|
||||
}
|
||||
void
|
||||
input_userauth_banner(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_banner(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
char *msg, *lang;
|
||||
debug3("input_userauth_banner");
|
||||
@ -324,7 +324,7 @@ input_userauth_banner(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
xfree(lang);
|
||||
}
|
||||
void
|
||||
input_userauth_success(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_success(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Authctxt *authctxt = ctxt;
|
||||
if (authctxt == NULL)
|
||||
@ -335,7 +335,7 @@ input_userauth_success(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
authctxt->success = 1; /* break out */
|
||||
}
|
||||
void
|
||||
input_userauth_failure(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_failure(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Authctxt *authctxt = ctxt;
|
||||
char *authlist = NULL;
|
||||
@ -356,7 +356,7 @@ input_userauth_failure(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
userauth(authctxt, authlist);
|
||||
}
|
||||
void
|
||||
input_userauth_pk_ok(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Authctxt *authctxt = ctxt;
|
||||
Key *key = NULL;
|
||||
@ -767,7 +767,7 @@ userauth_kbdint(Authctxt *authctxt)
|
||||
* parse INFO_REQUEST, prompt user and send INFO_RESPONSE
|
||||
*/
|
||||
void
|
||||
input_userauth_info_req(int type, int plen, u_int32_t seq, void *ctxt)
|
||||
input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
|
||||
{
|
||||
Authctxt *authctxt = ctxt;
|
||||
char *name, *inst, *lang, *prompt, *response;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user