openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-21 20:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace Comp typedef with 'struct sshcomp'

Browse Source
This commit is contained in:
Markus Friedl
2012-10-12 16:56:40 +02:00
parent 62dfdae606
commit 12f57cf093
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ssh/kex.c
View File

@@ -428,7 +428,7 @@ choose_mac(struct ssh *ssh, struct sshmac *mac, char *client, char *server)
}
static int
choose_comp(Comp *comp, char *client, char *server)
choose_comp(struct sshcomp *comp, char *client, char *server)
{
char *name = match_list(client, server, NULL);

6
ssh/kex.h
View File

@@ -79,8 +79,6 @@ enum kex_exchange {
#define KEX_INIT_SENT 0x0001
typedef struct Comp Comp;
struct sshenc {
char *name;
Cipher *cipher;
@@ -90,7 +88,7 @@ struct sshenc {
u_char *key;
u_char *iv;
};
struct Comp {
struct sshcomp {
int type;
int enabled;
char *name;
@@ -98,7 +96,7 @@ struct Comp {
struct newkeys {
struct sshenc enc;
struct sshmac mac;
Comp comp;
struct sshcomp comp;
};
struct ssh;

14
ssh/packet.c
View File

@@ -898,7 +898,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
struct session_state *state = ssh->state;
struct sshenc *enc;
struct sshmac *mac;
Comp *comp;
struct sshcomp *comp;
CipherContext *cc;
u_int64_t *max_blocks;
int crypt_type, r;
@@ -995,7 +995,7 @@ static int
ssh_packet_enable_delayed_compress(struct ssh *ssh)
{
struct session_state *state = ssh->state;
Comp *comp = NULL;
struct sshcomp *comp = NULL;
int r, mode;
/*
@@ -1037,7 +1037,7 @@ ssh_packet_send2_wrapped(struct ssh *ssh)
u_int len;
struct sshenc *enc = NULL;
struct sshmac *mac = NULL;
Comp *comp = NULL;
struct sshcomp *comp = NULL;
int r, block_size;
if (state->newkeys[MODE_OUT] != NULL) {
@@ -1470,7 +1470,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
u_int maclen, block_size;
struct sshenc *enc = NULL;
struct sshmac *mac = NULL;
Comp *comp = NULL;
struct sshcomp *comp = NULL;
int r;
*typep = SSH_MSG_NONE;
@@ -2151,7 +2151,7 @@ ssh_packet_restore_state(struct ssh *ssh,
static int
ssh_packet_set_postauth(struct ssh *ssh)
{
Comp *comp;
struct sshcomp *comp;
int r, mode;
debug("%s: called", __func__);
@@ -2197,7 +2197,7 @@ newkeys_to_blob(struct sshbuf *m, struct ssh *ssh, int mode)
{
struct sshbuf *b;
CipherContext *cc;
Comp *comp;
struct sshcomp *comp;
struct sshenc *enc;
struct sshmac *mac;
struct newkeys *newkey;
@@ -2304,7 +2304,7 @@ static int
newkeys_from_blob(struct sshbuf *m, struct ssh *ssh, int mode)
{
struct sshbuf *b = NULL;
Comp *comp;
struct sshcomp *comp;
struct sshenc *enc;
struct sshmac *mac;
struct newkeys *newkey = NULL;