summaryrefslogtreecommitdiffhomepage
path: root/common-kex.c
diff options
context:
space:
mode:
authorFrancois Perrad <francois.perrad@gadz.org>2016-01-01 15:02:09 +0100
committerFrancois Perrad <francois.perrad@gadz.org>2016-01-01 15:02:09 +0100
commit9bda22e70219c3056c07837803d0289b76453adb (patch)
tree0da32b7188892b1faea5fb1a6a3d97f587a8b54e /common-kex.c
parent23ac7f56fa2acd9f35e6b8ca36602f3c14e986cd (diff)
more hard tab
Diffstat (limited to 'common-kex.c')
-rw-r--r--common-kex.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/common-kex.c b/common-kex.c
index b233819..8c0c873 100644
--- a/common-kex.c
+++ b/common-kex.c
@@ -40,7 +40,7 @@
/* diffie-hellman-group1-sha1 value for p */
const unsigned char dh_p_1[DH_P_1_LEN] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
- 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
+ 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
@@ -54,7 +54,7 @@ const unsigned char dh_p_1[DH_P_1_LEN] = {
/* diffie-hellman-group14-sha1 value for p */
const unsigned char dh_p_14[DH_P_14_LEN] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
- 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
+ 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
@@ -349,17 +349,17 @@ static void gen_new_keys() {
ses.hash = NULL;
if (IS_DROPBEAR_CLIENT) {
- trans_IV = C2S_IV;
- recv_IV = S2C_IV;
- trans_key = C2S_key;
- recv_key = S2C_key;
+ trans_IV = C2S_IV;
+ recv_IV = S2C_IV;
+ trans_key = C2S_key;
+ recv_key = S2C_key;
mactransletter = 'E';
macrecvletter = 'F';
} else {
- trans_IV = S2C_IV;
- recv_IV = C2S_IV;
- trans_key = S2C_key;
- recv_key = C2S_key;
+ trans_IV = S2C_IV;
+ recv_IV = C2S_IV;
+ trans_key = S2C_key;
+ recv_key = C2S_key;
mactransletter = 'F';
macrecvletter = 'E';
}
@@ -525,18 +525,18 @@ void recv_msg_kexinit() {
read_kex_algos();
/* V_C, the client's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
+ buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
/* V_S, the server's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
+ buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
/* I_C, the payload of the client's SSH_MSG_KEXINIT */
- buf_putstring(ses.kexhashbuf,
+ buf_putstring(ses.kexhashbuf,
(const char*)ses.transkexinit->data, ses.transkexinit->len);
/* I_S, the payload of the server's SSH_MSG_KEXINIT */
- buf_setpos(ses.payload, ses.payload_beginning);
- buf_putstring(ses.kexhashbuf,
- (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
- ses.payload->len-ses.payload->pos);
+ buf_setpos(ses.payload, ses.payload_beginning);
+ buf_putstring(ses.kexhashbuf,
+ (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
+ ses.payload->len-ses.payload->pos);
ses.requirenext = SSH_MSG_KEXDH_REPLY;
} else {
/* SERVER */
@@ -544,18 +544,18 @@ void recv_msg_kexinit() {
/* read the peer's choice of algos */
read_kex_algos();
/* V_C, the client's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
+ buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
/* V_S, the server's version string (CR and NL excluded) */
- buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
+ buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
/* I_C, the payload of the client's SSH_MSG_KEXINIT */
- buf_setpos(ses.payload, ses.payload_beginning);
- buf_putstring(ses.kexhashbuf,
- (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
- ses.payload->len-ses.payload->pos);
+ buf_setpos(ses.payload, ses.payload_beginning);
+ buf_putstring(ses.kexhashbuf,
+ (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
+ ses.payload->len-ses.payload->pos);
/* I_S, the payload of the server's SSH_MSG_KEXINIT */
- buf_putstring(ses.kexhashbuf,
+ buf_putstring(ses.kexhashbuf,
(const char*)ses.transkexinit->data, ses.transkexinit->len);
ses.requirenext = SSH_MSG_KEXDH_INIT;