mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 01:48:00 +00:00
Split pkt_ctx into a separate enumeration for each of kex and userauth
instead of a bitfield for both. This doesn't gain much here, but it should make it easier to make things other than logging use the context. [originally from svn r7647]
This commit is contained in:
Ben Harris
parent
c1459927df
commit
77da96c62f
86
ssh.c
86
ssh.c
@ -113,14 +113,18 @@
|
||||
* Packet type contexts, so that ssh2_pkt_type can correctly decode
|
||||
* the ambiguous type numbers back into the correct type strings.
|
||||
*/
|
||||
#define SSH2_PKTCTX_DHGROUP 0x0001
|
||||
#define SSH2_PKTCTX_DHGEX 0x0002
|
||||
#define SSH2_PKTCTX_RSAKEX 0x0004
|
||||
#define SSH2_PKTCTX_KEX_MASK 0x000F
|
||||
#define SSH2_PKTCTX_PUBLICKEY 0x0010
|
||||
#define SSH2_PKTCTX_PASSWORD 0x0020
|
||||
#define SSH2_PKTCTX_KBDINTER 0x0040
|
||||
#define SSH2_PKTCTX_AUTH_MASK 0x00F0
|
||||
typedef enum {
|
||||
SSH2_PKTCTX_NOKEX,
|
||||
SSH2_PKTCTX_DHGROUP,
|
||||
SSH2_PKTCTX_DHGEX,
|
||||
SSH2_PKTCTX_RSAKEX
|
||||
} Pkt_KCtx;
|
||||
typedef enum {
|
||||
SSH2_PKTCTX_NOAUTH,
|
||||
SSH2_PKTCTX_PUBLICKEY,
|
||||
SSH2_PKTCTX_PASSWORD,
|
||||
SSH2_PKTCTX_KBDINTER
|
||||
} Pkt_ACtx;
|
||||
|
||||
#define SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT 1 /* 0x1 */
|
||||
#define SSH2_DISCONNECT_PROTOCOL_ERROR 2 /* 0x2 */
|
||||
@ -281,7 +285,8 @@ static unsigned int ssh_tty_parse_boolean(char *s)
|
||||
}
|
||||
|
||||
#define translate(x) if (type == x) return #x
|
||||
#define translatec(x,ctx) if (type == x && (pkt_ctx & ctx)) return #x
|
||||
#define translatek(x,ctx) if (type == x && (pkt_kctx == ctx)) return #x
|
||||
#define translatea(x,ctx) if (type == x && (pkt_actx == ctx)) return #x
|
||||
static char *ssh1_pkt_type(int type)
|
||||
{
|
||||
translate(SSH1_MSG_DISCONNECT);
|
||||
@ -327,7 +332,7 @@ static char *ssh1_pkt_type(int type)
|
||||
translate(SSH1_CMSG_AUTH_CCARD_RESPONSE);
|
||||
return "unknown";
|
||||
}
|
||||
static char *ssh2_pkt_type(int pkt_ctx, int type)
|
||||
static char *ssh2_pkt_type(Pkt_KCtx pkt_kctx, Pkt_ACtx pkt_actx, int type)
|
||||
{
|
||||
translate(SSH2_MSG_DISCONNECT);
|
||||
translate(SSH2_MSG_IGNORE);
|
||||
@ -337,23 +342,23 @@ static char *ssh2_pkt_type(int pkt_ctx, int type)
|
||||
translate(SSH2_MSG_SERVICE_ACCEPT);
|
||||
translate(SSH2_MSG_KEXINIT);
|
||||
translate(SSH2_MSG_NEWKEYS);
|
||||
translatec(SSH2_MSG_KEXDH_INIT, SSH2_PKTCTX_DHGROUP);
|
||||
translatec(SSH2_MSG_KEXDH_REPLY, SSH2_PKTCTX_DHGROUP);
|
||||
translatec(SSH2_MSG_KEX_DH_GEX_REQUEST, SSH2_PKTCTX_DHGEX);
|
||||
translatec(SSH2_MSG_KEX_DH_GEX_GROUP, SSH2_PKTCTX_DHGEX);
|
||||
translatec(SSH2_MSG_KEX_DH_GEX_INIT, SSH2_PKTCTX_DHGEX);
|
||||
translatec(SSH2_MSG_KEX_DH_GEX_REPLY, SSH2_PKTCTX_DHGEX);
|
||||
translatec(SSH2_MSG_KEXRSA_PUBKEY, SSH2_PKTCTX_RSAKEX);
|
||||
translatec(SSH2_MSG_KEXRSA_SECRET, SSH2_PKTCTX_RSAKEX);
|
||||
translatec(SSH2_MSG_KEXRSA_DONE, SSH2_PKTCTX_RSAKEX);
|
||||
translatek(SSH2_MSG_KEXDH_INIT, SSH2_PKTCTX_DHGROUP);
|
||||
translatek(SSH2_MSG_KEXDH_REPLY, SSH2_PKTCTX_DHGROUP);
|
||||
translatek(SSH2_MSG_KEX_DH_GEX_REQUEST, SSH2_PKTCTX_DHGEX);
|
||||
translatek(SSH2_MSG_KEX_DH_GEX_GROUP, SSH2_PKTCTX_DHGEX);
|
||||
translatek(SSH2_MSG_KEX_DH_GEX_INIT, SSH2_PKTCTX_DHGEX);
|
||||
translatek(SSH2_MSG_KEX_DH_GEX_REPLY, SSH2_PKTCTX_DHGEX);
|
||||
translatek(SSH2_MSG_KEXRSA_PUBKEY, SSH2_PKTCTX_RSAKEX);
|
||||
translatek(SSH2_MSG_KEXRSA_SECRET, SSH2_PKTCTX_RSAKEX);
|
||||
translatek(SSH2_MSG_KEXRSA_DONE, SSH2_PKTCTX_RSAKEX);
|
||||
translate(SSH2_MSG_USERAUTH_REQUEST);
|
||||
translate(SSH2_MSG_USERAUTH_FAILURE);
|
||||
translate(SSH2_MSG_USERAUTH_SUCCESS);
|
||||
translate(SSH2_MSG_USERAUTH_BANNER);
|
||||
translatec(SSH2_MSG_USERAUTH_PK_OK, SSH2_PKTCTX_PUBLICKEY);
|
||||
translatec(SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ, SSH2_PKTCTX_PASSWORD);
|
||||
translatec(SSH2_MSG_USERAUTH_INFO_REQUEST, SSH2_PKTCTX_KBDINTER);
|
||||
translatec(SSH2_MSG_USERAUTH_INFO_RESPONSE, SSH2_PKTCTX_KBDINTER);
|
||||
translatea(SSH2_MSG_USERAUTH_PK_OK, SSH2_PKTCTX_PUBLICKEY);
|
||||
translatea(SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ, SSH2_PKTCTX_PASSWORD);
|
||||
translatea(SSH2_MSG_USERAUTH_INFO_REQUEST, SSH2_PKTCTX_KBDINTER);
|
||||
translatea(SSH2_MSG_USERAUTH_INFO_RESPONSE, SSH2_PKTCTX_KBDINTER);
|
||||
translate(SSH2_MSG_GLOBAL_REQUEST);
|
||||
translate(SSH2_MSG_REQUEST_SUCCESS);
|
||||
translate(SSH2_MSG_REQUEST_FAILURE);
|
||||
@ -770,7 +775,8 @@ struct ssh_tag {
|
||||
|
||||
bufchain banner; /* accumulates banners during do_ssh2_authconn */
|
||||
|
||||
int pkt_ctx;
|
||||
Pkt_KCtx pkt_kctx;
|
||||
Pkt_ACtx pkt_actx;
|
||||
|
||||
void *x11auth;
|
||||
|
||||
@ -1387,7 +1393,8 @@ static struct Packet *ssh2_rdpkt(Ssh ssh, unsigned char **data, int *datalen)
|
||||
}
|
||||
}
|
||||
log_packet(ssh->logctx, PKT_INCOMING, st->pktin->type,
|
||||
ssh2_pkt_type(ssh->pkt_ctx, st->pktin->type),
|
||||
ssh2_pkt_type(ssh->pkt_kctx, ssh->pkt_actx,
|
||||
st->pktin->type),
|
||||
st->pktin->data+6, st->pktin->length-6,
|
||||
nblanks, &blank);
|
||||
}
|
||||
@ -1735,7 +1742,7 @@ static int ssh2_pkt_construct(Ssh ssh, struct Packet *pkt)
|
||||
|
||||
if (ssh->logctx)
|
||||
log_packet(ssh->logctx, PKT_OUTGOING, pkt->data[5],
|
||||
ssh2_pkt_type(ssh->pkt_ctx, pkt->data[5]),
|
||||
ssh2_pkt_type(ssh->pkt_kctx, ssh->pkt_actx, pkt->data[5]),
|
||||
pkt->body, pkt->length - (pkt->body - pkt->data),
|
||||
pkt->nblanks, pkt->blanks);
|
||||
sfree(pkt->blanks); pkt->blanks = NULL;
|
||||
@ -5181,7 +5188,7 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
|
||||
s->maclist = macs, s->nmacs = lenof(macs);
|
||||
|
||||
begin_key_exchange:
|
||||
ssh->pkt_ctx &= ~SSH2_PKTCTX_KEX_MASK;
|
||||
ssh->pkt_kctx = SSH2_PKTCTX_NOKEX;
|
||||
{
|
||||
int i, j, commalist_started;
|
||||
|
||||
@ -5630,7 +5637,7 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
|
||||
*/
|
||||
if (!ssh->kex->pdata) {
|
||||
logevent("Doing Diffie-Hellman group exchange");
|
||||
ssh->pkt_ctx |= SSH2_PKTCTX_DHGEX;
|
||||
ssh->pkt_kctx = SSH2_PKTCTX_DHGEX;
|
||||
/*
|
||||
* Work out how big a DH group we will need to allow that
|
||||
* much data.
|
||||
@ -5655,7 +5662,7 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
|
||||
s->kex_init_value = SSH2_MSG_KEX_DH_GEX_INIT;
|
||||
s->kex_reply_value = SSH2_MSG_KEX_DH_GEX_REPLY;
|
||||
} else {
|
||||
ssh->pkt_ctx |= SSH2_PKTCTX_DHGROUP;
|
||||
ssh->pkt_kctx = SSH2_PKTCTX_DHGROUP;
|
||||
ssh->kex_ctx = dh_setup_group(ssh->kex);
|
||||
s->kex_init_value = SSH2_MSG_KEXDH_INIT;
|
||||
s->kex_reply_value = SSH2_MSG_KEXDH_REPLY;
|
||||
@ -5714,7 +5721,7 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
|
||||
} else {
|
||||
logeventf(ssh, "Doing RSA key exchange with hash %s",
|
||||
ssh->kex->hash->text_name);
|
||||
ssh->pkt_ctx |= SSH2_PKTCTX_RSAKEX;
|
||||
ssh->pkt_kctx = SSH2_PKTCTX_RSAKEX;
|
||||
/*
|
||||
* RSA key exchange. First expect a KEXRSA_PUBKEY packet
|
||||
* from the server.
|
||||
@ -7070,7 +7077,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
|
||||
* just in case it succeeds, and (b) so that we know what
|
||||
* authentication methods we can usefully try next.
|
||||
*/
|
||||
ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
|
||||
ssh->pkt_actx = SSH2_PKTCTX_NOAUTH;
|
||||
|
||||
s->pktout = ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST);
|
||||
ssh2_pkt_addstring(s->pktout, s->username);
|
||||
@ -7204,7 +7211,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
|
||||
in_commasep_string("keyboard-interactive", methods, methlen);
|
||||
}
|
||||
|
||||
ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
|
||||
ssh->pkt_actx = SSH2_PKTCTX_NOAUTH;
|
||||
|
||||
if (s->can_pubkey && !s->done_agent && s->nkeys) {
|
||||
|
||||
@ -7212,8 +7219,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
|
||||
* Attempt public-key authentication using a key from Pageant.
|
||||
*/
|
||||
|
||||
ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
|
||||
ssh->pkt_ctx |= SSH2_PKTCTX_PUBLICKEY;
|
||||
ssh->pkt_actx = SSH2_PKTCTX_PUBLICKEY;
|
||||
|
||||
logeventf(ssh, "Trying Pageant key #%d", s->keyi);
|
||||
|
||||
@ -7360,8 +7366,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
|
||||
struct ssh2_userkey *key; /* not live over crReturn */
|
||||
char *passphrase; /* not live over crReturn */
|
||||
|
||||
ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
|
||||
ssh->pkt_ctx |= SSH2_PKTCTX_PUBLICKEY;
|
||||
ssh->pkt_actx = SSH2_PKTCTX_PUBLICKEY;
|
||||
|
||||
s->tried_pubkey_config = TRUE;
|
||||
|
||||
@ -7540,8 +7545,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
|
||||
|
||||
s->type = AUTH_TYPE_KEYBOARD_INTERACTIVE;
|
||||
|
||||
ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
|
||||
ssh->pkt_ctx |= SSH2_PKTCTX_KBDINTER;
|
||||
ssh->pkt_actx = SSH2_PKTCTX_KBDINTER;
|
||||
|
||||
s->pktout = ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST);
|
||||
ssh2_pkt_addstring(s->pktout, s->username);
|
||||
@ -7683,8 +7687,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
|
||||
int ret; /* not live over crReturn */
|
||||
int changereq_first_time; /* not live over crReturn */
|
||||
|
||||
ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
|
||||
ssh->pkt_ctx |= SSH2_PKTCTX_PASSWORD;
|
||||
ssh->pkt_actx = SSH2_PKTCTX_PASSWORD;
|
||||
|
||||
s->cur_prompt = new_prompts(ssh->frontend);
|
||||
s->cur_prompt->to_server = TRUE;
|
||||
@ -8555,7 +8558,8 @@ static const char *ssh_init(void *frontend_handle, void **backend_handle,
|
||||
ssh->deferred_len = 0;
|
||||
ssh->deferred_size = 0;
|
||||
ssh->fallback_cmd = 0;
|
||||
ssh->pkt_ctx = 0;
|
||||
ssh->pkt_kctx = SSH2_PKTCTX_NOKEX;
|
||||
ssh->pkt_actx = SSH2_PKTCTX_NOAUTH;
|
||||
ssh->x11auth = NULL;
|
||||
ssh->v1_compressing = FALSE;
|
||||
ssh->v2_outgoing_sequence = 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user