Mercurial > dropbear
comparison kex.h @ 1681:435cfb9ec96e
send and handle SSH_MSG_EXT_INFO only at the correct point
- other fixes for rsa pubkey auth
- only include ext-info handling when rsa pubkey auth is compiled
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sun, 24 May 2020 14:16:58 +0800 |
parents | 4b4cfc92c5b7 |
children | 8f93f37c01de |
comparison
equal
deleted
inserted
replaced
1680:5e763ad6e2e0 | 1681:435cfb9ec96e |
---|---|
59 int is_compress_trans(void); | 59 int is_compress_trans(void); |
60 int is_compress_recv(void); | 60 int is_compress_recv(void); |
61 #endif | 61 #endif |
62 | 62 |
63 void recv_msg_kexdh_init(void); /* server */ | 63 void recv_msg_kexdh_init(void); /* server */ |
64 void send_msg_ext_info(void); /* server */ | |
65 | 64 |
66 void send_msg_kexdh_init(void); /* client */ | 65 void send_msg_kexdh_init(void); /* client */ |
67 void recv_msg_kexdh_reply(void); /* client */ | 66 void recv_msg_kexdh_reply(void); /* client */ |
68 | 67 |
69 void recv_msg_ext_info(void); | 68 void recv_msg_ext_info(void); |
74 unsigned recvkexinit : 1; | 73 unsigned recvkexinit : 1; |
75 unsigned them_firstfollows : 1; /* true when first_kex_packet_follows is set */ | 74 unsigned them_firstfollows : 1; /* true when first_kex_packet_follows is set */ |
76 unsigned sentnewkeys : 1; /* set once we've send MSG_NEWKEYS (will be cleared once we have also received */ | 75 unsigned sentnewkeys : 1; /* set once we've send MSG_NEWKEYS (will be cleared once we have also received */ |
77 unsigned recvnewkeys : 1; /* set once we've received MSG_NEWKEYS (cleared once we have also sent */ | 76 unsigned recvnewkeys : 1; /* set once we've received MSG_NEWKEYS (cleared once we have also sent */ |
78 | 77 |
79 unsigned donefirstkex : 1; /* Set to 1 after the first kex has completed, | 78 unsigned int donefirstkex; /* Set to 1 after the first kex has completed, |
80 ie the transport layer has been set up */ | 79 ie the transport layer has been set up */ |
80 unsigned int donesecondkex; /* Set to 1 after the second kex has completed */ | |
81 | 81 |
82 unsigned our_first_follows_matches : 1; | 82 unsigned our_first_follows_matches : 1; |
83 | 83 |
84 time_t lastkextime; /* time of the last kex */ | 84 time_t lastkextime; /* time of the last kex */ |
85 unsigned int datatrans; /* data transmitted since last kex */ | 85 unsigned int datatrans; /* data transmitted since last kex */ |