dropbear: common-kex.c annotate

annotate common-kex.c @ 560:52d7301e46bd agent-client

Agent forwarding works

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 30 Jul 2009 15:14:33 +0000
parents	daf52f813328
children	f9b5dc0cba61

rev	line source
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
74 e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 36 diff changeset	2 * Dropbear SSH
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	4 * Copyright (c) 2002-2004 Matt Johnston
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * Portions Copyright (c) 2004 by Mihnea Stoenescu
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 * All rights reserved.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * Permission is hereby granted, free of charge, to any person obtaining a copy
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * of this software and associated documentation files (the "Software"), to deal
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * in the Software without restriction, including without limitation the rights
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * copies of the Software, and to permit persons to whom the Software is
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 * furnished to do so, subject to the following conditions:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * The above copyright notice and this permission notice shall be included in
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 * all copies or substantial portions of the Software.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 * SOFTWARE. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "includes.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "dbutil.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "algo.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "buffer.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "session.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "kex.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #include "ssh.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "packet.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "bignum.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #include "random.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 /* diffie-hellman-group1-sha1 value for p */
227 ad1b24e39bf3 Make a variables static Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	38 static const unsigned char dh_p_val[] = {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
227 ad1b24e39bf3 Make a variables static Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	50 #define DH_P_LEN sizeof(dh_p_val)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51
227 ad1b24e39bf3 Make a variables static Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	52 static const int DH_G_VAL = 2;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	54 static void kexinitialise();
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	55 void gen_new_keys();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 #ifndef DISABLE_ZLIB
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 static void gen_new_zstreams();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 #endif
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	59 static void read_kex_algos();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 /* helper function for gen_new_keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 static void hashkeys(unsigned char *out, int outlen,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 const hash_state * hs, unsigned const char X);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 /* Send our list of algorithms we can use */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 void send_msg_kexinit() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 buf_putbyte(ses.writepayload, SSH_MSG_KEXINIT);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 /* cookie */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 genrandom(buf_getwriteptr(ses.writepayload, 16), 16);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 buf_incrwritepos(ses.writepayload, 16);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 /* kex algos */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 buf_put_algolist(ses.writepayload, sshkex);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 /* server_host_key_algorithms */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 buf_put_algolist(ses.writepayload, sshhostkey);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 /* encryption_algorithms_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 buf_put_algolist(ses.writepayload, sshciphers);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 /* encryption_algorithms_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 buf_put_algolist(ses.writepayload, sshciphers);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 /* mac_algorithms_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 buf_put_algolist(ses.writepayload, sshhashes);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 /* mac_algorithms_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 buf_put_algolist(ses.writepayload, sshhashes);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 /* compression_algorithms_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 buf_put_algolist(ses.writepayload, sshcompress);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 /* compression_algorithms_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 buf_put_algolist(ses.writepayload, sshcompress);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 /* languages_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 buf_putstring(ses.writepayload, "", 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 /* languages_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 buf_putstring(ses.writepayload, "", 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 /* first_kex_packet_follows - unimplemented for now */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 buf_putbyte(ses.writepayload, 0x00);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 /* reserved unit32 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 buf_putint(ses.writepayload, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 /* set up transmitted kex packet buffer for hashing.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 * This is freed after the end of the kex */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 ses.transkexinit = buf_newcopy(ses.writepayload);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 encrypt_packet();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 ses.dataallowed = 0; /* don't send other packets during kex */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	118 TRACE(("DATAALLOWED=0"))
0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	119 TRACE(("-> KEXINIT"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 ses.kexstate.sentkexinit = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 /* * NOTE regarding (send\|recv)_msg_newkeys *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 * Changed by mihnea from the original kex.c to set dataallowed after a
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 * completed key exchange, no matter the order in which it was performed.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 * This enables client mode without affecting server functionality.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 /* Bring new keys into use after a key exchange, and let the client know*/
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 void send_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	132 TRACE(("enter send_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 /* generate the kexinit request */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 buf_putbyte(ses.writepayload, SSH_MSG_NEWKEYS);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 encrypt_packet();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 /* set up our state */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 if (ses.kexstate.recvnewkeys) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	142 TRACE(("while RECVNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 gen_new_keys();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 kexinitialise(); /* we've finished with this kex */
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	145 TRACE((" -> DATAALLOWED=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146 ses.dataallowed = 1; /* we can send other packets again now */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	147 ses.kexstate.donefirstkex = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 ses.kexstate.sentnewkeys = 1;
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	150 TRACE(("SENTNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	153 TRACE(("-> MSG_NEWKEYS"))
0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	154 TRACE(("leave send_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 /* Bring the new keys into use after a key exchange */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158 void recv_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	160 TRACE(("<- MSG_NEWKEYS"))
0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	161 TRACE(("enter recv_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 /* simply check if we've sent SSH_MSG_NEWKEYS, and if so,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 * switch to the new keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 if (ses.kexstate.sentnewkeys) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	166 TRACE(("while SENTNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 gen_new_keys();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 kexinitialise(); /* we've finished with this kex */
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	169 TRACE((" -> DATAALLOWED=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 ses.dataallowed = 1; /* we can send other packets again now */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	171 ses.kexstate.donefirstkex = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 } else {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	173 TRACE(("RECVNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 ses.kexstate.recvnewkeys = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	177 TRACE(("leave recv_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	181 /* Set up the kex for the first time */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	182 void kexfirstinitialise() {
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	183
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	184 ses.kexstate.donefirstkex = 0;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	185 kexinitialise();
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	186 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	187
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	188 /* Reset the kex state, ready for a new negotiation */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	189 static void kexinitialise() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	191 TRACE(("kexinitialise()"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 /* sent/recv'd MSG_KEXINIT */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 ses.kexstate.sentkexinit = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 ses.kexstate.recvkexinit = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 /* sent/recv'd MSG_NEWKEYS */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 ses.kexstate.recvnewkeys = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 ses.kexstate.sentnewkeys = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201 /* first_packet_follows */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 ses.kexstate.firstfollows = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 ses.kexstate.datatrans = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 ses.kexstate.datarecv = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 410 diff changeset	207 ses.kexstate.lastkextime = time(NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 /* Helper function for gen_new_keys, creates a hash. It makes a copy of the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 * already initialised hash_state hs, which should already have processed
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 * the dh_K and hash, since these are common. X is the letter 'A', 'B' etc.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 * out must have at least min(SHA1_HASH_SIZE, outlen) bytes allocated.
409 0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	215 * The output will only be expanded once, as we are assured that
0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	216 * outlen <= 2*SHA1_HASH_SIZE for all known hashes.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 *
409 0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	218 * See Section 7.2 of rfc4253 (ssh transport) for details */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 static void hashkeys(unsigned char *out, int outlen,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 const hash_state * hs, const unsigned char X) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 hash_state hs2;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223 unsigned char k2[SHA1_HASH_SIZE]; /* used to extending */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 memcpy(&hs2, hs, sizeof(hash_state));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 sha1_process(&hs2, &X, 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227 sha1_process(&hs2, ses.session_id, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 sha1_done(&hs2, out);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 if (SHA1_HASH_SIZE < outlen) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 /* need to extend */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 memcpy(&hs2, hs, sizeof(hash_state));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232 sha1_process(&hs2, out, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 sha1_done(&hs2, k2);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 memcpy(&out[SHA1_HASH_SIZE], k2, outlen - SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 /* Generate the actual encryption/integrity keys, using the results of the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 * key exchange, as specified in section 5.2 of the IETF secsh-transport
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 * draft. This occurs after the DH key-exchange.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242 * ses.newkeys is the new set of keys which are generated, these are only
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 * taken into use after both sides have sent a newkeys message */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245 /* Originally from kex.c, generalized for cli/svr mode --mihnea */
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	246 void gen_new_keys() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	247
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248 unsigned char C2S_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249 unsigned char C2S_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 unsigned char S2C_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 unsigned char S2C_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 /* unsigned char key[MAX_KEY_LEN]; */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253 unsigned char trans_IV, trans_key, recv_IV, recv_key;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 hash_state hs;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 unsigned int C2S_keysize, S2C_keysize;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257 char mactransletter, macrecvletter; /* Client or server specific */
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	258 int recv_cipher = 0, trans_cipher = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	260 TRACE(("enter gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 /* the dh_K and hash are the start of all hashes, we make use of that */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263 sha1_init(&hs);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264 sha1_process_mp(&hs, ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265 mp_clear(ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	266 m_free(ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 sha1_process(&hs, ses.hash, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 m_burn(ses.hash, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 if (IS_DROPBEAR_CLIENT) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 trans_IV = C2S_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 recv_IV = S2C_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 trans_key = C2S_key;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274 recv_key = S2C_key;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	275 C2S_keysize = ses.newkeys->trans.algo_crypt->keysize;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	276 S2C_keysize = ses.newkeys->recv.algo_crypt->keysize;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 mactransletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 macrecvletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280 trans_IV = S2C_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 recv_IV = C2S_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 trans_key = S2C_key;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283 recv_key = C2S_key;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	284 C2S_keysize = ses.newkeys->recv.algo_crypt->keysize;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	285 S2C_keysize = ses.newkeys->trans.algo_crypt->keysize;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 mactransletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 macrecvletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	290 hashkeys(C2S_IV, SHA1_HASH_SIZE, &hs, 'A');
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	291 hashkeys(S2C_IV, SHA1_HASH_SIZE, &hs, 'B');
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 hashkeys(C2S_key, C2S_keysize, &hs, 'C');
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	293 hashkeys(S2C_key, S2C_keysize, &hs, 'D');
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	295 recv_cipher = find_cipher(ses.newkeys->recv.algo_crypt->cipherdesc->name);
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	296 if (recv_cipher < 0)
3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	297 dropbear_exit("crypto error");
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	298 if (ses.newkeys->recv.crypt_mode->start(recv_cipher,
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	299 recv_IV, recv_key,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	300 ses.newkeys->recv.algo_crypt->keysize, 0,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	301 &ses.newkeys->recv.cipher_state) != CRYPT_OK) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 dropbear_exit("crypto error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 }
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	304
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	305 trans_cipher = find_cipher(ses.newkeys->trans.algo_crypt->cipherdesc->name);
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	306 if (trans_cipher < 0)
3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	307 dropbear_exit("crypto error");
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	308 if (ses.newkeys->trans.crypt_mode->start(trans_cipher,
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	309 trans_IV, trans_key,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	310 ses.newkeys->trans.algo_crypt->keysize, 0,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	311 &ses.newkeys->trans.cipher_state) != CRYPT_OK) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	312 dropbear_exit("crypto error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 /* MAC keys */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	316 hashkeys(ses.newkeys->trans.mackey,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	317 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	318 hashkeys(ses.newkeys->recv.mackey,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	319 ses.newkeys->recv.algo_mac->keysize, &hs, macrecvletter);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	320 ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hashdesc->name),
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	321 ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hashdesc->name),
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 #ifndef DISABLE_ZLIB
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 gen_new_zstreams();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	325 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 /* Switch over to the new keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 m_burn(ses.keys, sizeof(struct key_context));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 m_free(ses.keys);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 ses.keys = ses.newkeys;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 ses.newkeys = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	333 TRACE(("leave gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336 #ifndef DISABLE_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	337
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	338 int is_compress_trans() {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	339 return ses.keys->trans.algo_comp == DROPBEAR_COMP_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	340 \|\| (ses.authstate.authdone
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	341 && ses.keys->trans.algo_comp == DROPBEAR_COMP_ZLIB_DELAY);
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	342 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	343
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	344 int is_compress_recv() {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	345 return ses.keys->recv.algo_comp == DROPBEAR_COMP_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	346 \|\| (ses.authstate.authdone
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	347 && ses.keys->recv.algo_comp == DROPBEAR_COMP_ZLIB_DELAY);
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	348 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	349
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350 /* Set up new zlib compression streams, close the old ones. Only
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351 * called from gen_new_keys() */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	352 static void gen_new_zstreams() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354 /* create new zstreams */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	355 if (ses.newkeys->recv.algo_comp == DROPBEAR_COMP_ZLIB
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	356 \|\| ses.newkeys->recv.algo_comp == DROPBEAR_COMP_ZLIB_DELAY) {
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	357 ses.newkeys->recv.zstream = (z_streamp)m_malloc(sizeof(z_stream));
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	358 ses.newkeys->recv.zstream->zalloc = Z_NULL;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	359 ses.newkeys->recv.zstream->zfree = Z_NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	360
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	361 if (inflateInit(ses.newkeys->recv.zstream) != Z_OK) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	365 ses.newkeys->recv.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	368 if (ses.newkeys->trans.algo_comp == DROPBEAR_COMP_ZLIB
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	369 \|\| ses.newkeys->trans.algo_comp == DROPBEAR_COMP_ZLIB_DELAY) {
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	370 ses.newkeys->trans.zstream = (z_streamp)m_malloc(sizeof(z_stream));
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	371 ses.newkeys->trans.zstream->zalloc = Z_NULL;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	372 ses.newkeys->trans.zstream->zfree = Z_NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373
555 daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	374 if (deflateInit2(ses.newkeys->trans.zstream, Z_DEFAULT_COMPRESSION,
daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	375 Z_DEFLATED, DROPBEAR_ZLIB_WINDOW_BITS,
daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	376 DROPBEAR_ZLIB_MEM_LEVEL, Z_DEFAULT_STRATEGY)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 != Z_OK) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	381 ses.newkeys->trans.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	383
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384 /* clean up old keys */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	385 if (ses.keys->recv.zstream != NULL) {
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	386 if (inflateEnd(ses.keys->recv.zstream) == Z_STREAM_ERROR) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 /* Z_DATA_ERROR is ok, just means that stream isn't ended */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 dropbear_exit("crypto error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	390 m_free(ses.keys->recv.zstream);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	391 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	392 if (ses.keys->trans.zstream != NULL) {
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	393 if (deflateEnd(ses.keys->trans.zstream) == Z_STREAM_ERROR) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394 /* Z_DATA_ERROR is ok, just means that stream isn't ended */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	395 dropbear_exit("crypto error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	396 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	397 m_free(ses.keys->trans.zstream);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	398 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	400 #endif /* DISABLE_ZLIB */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	401
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 /* Executed upon receiving a kexinit message from the client to initiate
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404 * key exchange. If we haven't already done so, we send the list of our
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405 * preferred algorithms. The client's requested algorithms are processed,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406 * and we calculate the first portion of the key-exchange-hash for used
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407 * later in the key exchange. No response is sent, as the client should
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	408 * initiate the diffie-hellman key exchange */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	410 /* Originally from kex.c, generalized for cli/svr mode --mihnea */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411 /* Belongs in common_kex.c where it should be moved after review */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	412 void recv_msg_kexinit() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	414 unsigned int kexhashbuf_len = 0;
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	415 unsigned int remote_ident_len = 0;
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	416 unsigned int local_ident_len = 0;
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	417
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	418 TRACE(("<- KEXINIT"))
0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	419 TRACE(("enter recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 if (!ses.kexstate.sentkexinit) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422 /* we need to send a kex packet */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 send_msg_kexinit();
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	424 TRACE(("continue recv_msg_kexinit: sent kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	427 /* start the kex hash */
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	428 local_ident_len = strlen(LOCAL_IDENT);
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	429 remote_ident_len = strlen((char*)ses.remoteident);
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	430
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	431 kexhashbuf_len = local_ident_len + remote_ident_len
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	432 + ses.transkexinit->len + ses.payload->len
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	433 + KEXHASHBUF_MAX_INTS;
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	434
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	435 ses.kexhashbuf = buf_new(kexhashbuf_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 if (IS_DROPBEAR_CLIENT) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	439 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	440 read_kex_algos();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	442 /* V_C, the client's version string (CR and NL excluded) */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443 buf_putstring(ses.kexhashbuf,
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	444 (unsigned char*)LOCAL_IDENT, local_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	445 /* V_S, the server's version string (CR and NL excluded) */
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	446 buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	448 /* I_C, the payload of the client's SSH_MSG_KEXINIT */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 buf_putstring(ses.kexhashbuf,
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	450 ses.transkexinit->data, ses.transkexinit->len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	451 /* I_S, the payload of the server's SSH_MSG_KEXINIT */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 buf_setpos(ses.payload, 0);
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	453 buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455 } else {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	456 /* SERVER */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	458 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	459 read_kex_algos();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	460 /* V_C, the client's version string (CR and NL excluded) */
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	461 buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	462 /* V_S, the server's version string (CR and NL excluded) */
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	463 buf_putstring(ses.kexhashbuf,
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	464 (unsigned char*)LOCAL_IDENT, local_ident_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	466 /* I_C, the payload of the client's SSH_MSG_KEXINIT */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	467 buf_setpos(ses.payload, 0);
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	468 buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len);
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	469
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	470 /* I_S, the payload of the server's SSH_MSG_KEXINIT */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	471 buf_putstring(ses.kexhashbuf,
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	472 ses.transkexinit->data, ses.transkexinit->len);
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	473
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	474 ses.requirenext = SSH_MSG_KEXDH_INIT;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	475 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477 buf_free(ses.transkexinit);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	478 ses.transkexinit = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	479 /* the rest of ses.kexhashbuf will be done after DH exchange */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	480
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	481 ses.kexstate.recvkexinit = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	482
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	483 TRACE(("leave recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	484 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	485
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	486 /* Initialises and generate one side of the diffie-hellman key exchange values.
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	487 * See the ietf-secsh-transport draft, section 6, for details */
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	488 /* dh_pub and dh_priv MUST be already initialised */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	489 void gen_kexdh_vals(mp_int dh_pub, mp_int dh_priv) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	490
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	491 DEF_MP_INT(dh_p);
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	492 DEF_MP_INT(dh_q);
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	493 DEF_MP_INT(dh_g);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	494
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	495 TRACE(("enter send_msg_kexdh_reply"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	496
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	497 m_mp_init_multi(&dh_g, &dh_p, &dh_q, NULL);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	498
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	499 /* read the prime and generator*/
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	500 bytes_to_mp(&dh_p, (unsigned char*)dh_p_val, DH_P_LEN);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	501
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	502 if (mp_set_int(&dh_g, DH_G_VAL) != MP_OKAY) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	503 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	504 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	505
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	506 /* calculate q = (p-1)/2 */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	507 /* dh_priv is just a temp var here */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	508 if (mp_sub_d(&dh_p, 1, dh_priv) != MP_OKAY) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	509 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	510 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	511 if (mp_div_2(dh_priv, &dh_q) != MP_OKAY) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	512 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	513 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	514
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	515 /* Generate a private portion 0 < dh_priv < dh_q */
c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	516 gen_random_mpint(&dh_q, dh_priv);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	517
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	518 /* f = g^y mod p */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	519 if (mp_exptmod(&dh_g, dh_priv, &dh_p, dh_pub) != MP_OKAY) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	520 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	521 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	522 mp_clear_multi(&dh_g, &dh_p, &dh_q, NULL);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	523 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	524
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	525 /* This function is fairly common between client/server, with some substitution
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	526 * of dh_e/dh_f etc. Hence these arguments:
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	527 * dh_pub_us is 'e' for the client, 'f' for the server. dh_pub_them is
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	528 * vice-versa. dh_priv is the x/y value corresponding to dh_pub_us */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	529 void kexdh_comb_key(mp_int dh_pub_us, mp_int dh_priv, mp_int *dh_pub_them,
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	530 sign_key *hostkey) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	531
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	532 mp_int dh_p;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	533 mp_int dh_e = NULL, dh_f = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	534 hash_state hs;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	535
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	536 /* read the prime and generator*/
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	537 m_mp_init(&dh_p);
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	538 bytes_to_mp(&dh_p, dh_p_val, DH_P_LEN);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	539
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	540 /* Check that dh_pub_them (dh_e or dh_f) is in the range [1, p-1] */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	541 if (mp_cmp(dh_pub_them, &dh_p) != MP_LT
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	542 \|\| mp_cmp_d(dh_pub_them, 0) != MP_GT) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	543 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	544 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	545
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	546 /* K = e^y mod p = f^x mod p */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	547 ses.dh_K = (mp_int*)m_malloc(sizeof(mp_int));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	548 m_mp_init(ses.dh_K);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	549 if (mp_exptmod(dh_pub_them, dh_priv, &dh_p, ses.dh_K) != MP_OKAY) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	550 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	551 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	552
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	553 /* clear no longer needed vars */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	554 mp_clear_multi(&dh_p, NULL);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	555
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	556 /* From here on, the code needs to work with the _same_ vars on each side,
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	557 * not vice-versaing for client/server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	558 if (IS_DROPBEAR_CLIENT) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	559 dh_e = dh_pub_us;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	560 dh_f = dh_pub_them;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	561 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	562 dh_e = dh_pub_them;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	563 dh_f = dh_pub_us;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	564 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	565
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	566 /* Create the remainder of the hash buffer, to generate the exchange hash */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	567 /* K_S, the host key */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	568 buf_put_pub_key(ses.kexhashbuf, hostkey, ses.newkeys->algo_hostkey);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	569 /* e, exchange value sent by the client */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	570 buf_putmpint(ses.kexhashbuf, dh_e);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	571 /* f, exchange value sent by the server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	572 buf_putmpint(ses.kexhashbuf, dh_f);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	573 /* K, the shared secret */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	574 buf_putmpint(ses.kexhashbuf, ses.dh_K);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	575
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	576 /* calculate the hash H to sign */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	577 sha1_init(&hs);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	578 buf_setpos(ses.kexhashbuf, 0);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	579 sha1_process(&hs, buf_getptr(ses.kexhashbuf, ses.kexhashbuf->len),
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	580 ses.kexhashbuf->len);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	581 sha1_done(&hs, ses.hash);
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	582
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	583 buf_burn(ses.kexhashbuf);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	584 buf_free(ses.kexhashbuf);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	585 ses.kexhashbuf = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	586
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	587 /* first time around, we set the session_id to H */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	588 if (ses.session_id == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	589 /* create the session_id, this never needs freeing */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	590 ses.session_id = (unsigned char*)m_malloc(SHA1_HASH_SIZE);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	591 memcpy(ses.session_id, ses.hash, SHA1_HASH_SIZE);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	592 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	593 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	594
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	595 /* read the other side's algo list. buf_match_algo is a callback to match
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	596 * algos for the client or server. */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	597 static void read_kex_algos() {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	598
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	599 /* for asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	600 algo_type * c2s_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	601 algo_type * s2c_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	602 algo_type * c2s_cipher_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	603 algo_type * s2c_cipher_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	604 algo_type * c2s_comp_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	605 algo_type * s2c_comp_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	606 /* the generic one */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	607 algo_type * algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	608
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	609 /* which algo couldn't match */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	610 char * erralgo = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	611
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	612 int goodguess = 0;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	613 int allgood = 1; /* we AND this with each goodguess and see if its still
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	614 true after */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	615
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	616 buf_incrpos(ses.payload, 16); /* start after the cookie */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	617
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	618 ses.newkeys = (struct key_context*)m_malloc(sizeof(struct key_context));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	619
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	620 /* kex_algorithms */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	621 algo = ses.buf_match_algo(ses.payload, sshkex, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	622 allgood &= goodguess;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	623 if (algo == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	624 erralgo = "kex";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	625 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	626 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	627 TRACE(("kex algo %s", algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	628 ses.newkeys->algo_kex = algo->val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	629
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	630 /* server_host_key_algorithms */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	631 algo = ses.buf_match_algo(ses.payload, sshhostkey, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	632 allgood &= goodguess;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	633 if (algo == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	634 erralgo = "hostkey";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	635 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	636 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	637 TRACE(("hostkey algo %s", algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	638 ses.newkeys->algo_hostkey = algo->val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	639
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	640 /* encryption_algorithms_client_to_server */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	641 c2s_cipher_algo = ses.buf_match_algo(ses.payload, sshciphers, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	642 if (c2s_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	643 erralgo = "enc c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	644 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	645 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	646 TRACE(("enc c2s is %s", c2s_cipher_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	647
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	648 /* encryption_algorithms_server_to_client */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	649 s2c_cipher_algo = ses.buf_match_algo(ses.payload, sshciphers, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	650 if (s2c_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	651 erralgo = "enc s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	652 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	653 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	654 TRACE(("enc s2c is %s", s2c_cipher_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	655
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	656 /* mac_algorithms_client_to_server */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	657 c2s_hash_algo = ses.buf_match_algo(ses.payload, sshhashes, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	658 if (c2s_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	659 erralgo = "mac c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	660 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	661 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	662 TRACE(("hash c2s is %s", c2s_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	663
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	664 /* mac_algorithms_server_to_client */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	665 s2c_hash_algo = ses.buf_match_algo(ses.payload, sshhashes, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	666 if (s2c_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	667 erralgo = "mac s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	668 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	669 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	670 TRACE(("hash s2c is %s", s2c_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	671
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	672 /* compression_algorithms_client_to_server */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	673 c2s_comp_algo = ses.buf_match_algo(ses.payload, sshcompress, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	674 if (c2s_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	675 erralgo = "comp c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	676 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	677 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	678 TRACE(("hash c2s is %s", c2s_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	679
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	680 /* compression_algorithms_server_to_client */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	681 s2c_comp_algo = ses.buf_match_algo(ses.payload, sshcompress, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	682 if (s2c_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	683 erralgo = "comp s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	684 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	685 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	686 TRACE(("hash s2c is %s", s2c_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	687
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	688 /* languages_client_to_server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	689 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	690
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	691 /* languages_server_to_client */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	692 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	693
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	694 /* first_kex_packet_follows */
179 161557a9dde8 * fix longstanding bug with connections being closed on failure to Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	695 if (buf_getbool(ses.payload)) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	696 ses.kexstate.firstfollows = 1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	697 /* if the guess wasn't good, we ignore the packet sent */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	698 if (!allgood) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	699 ses.ignorenext = 1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	700 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	701 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	702
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	703 /* Handle the asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	704 if (IS_DROPBEAR_CLIENT) {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	705 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	706 (struct dropbear_cipher*)s2c_cipher_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	707 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	708 (struct dropbear_cipher*)c2s_cipher_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	709 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	710 (struct dropbear_cipher_mode*)s2c_cipher_algo->mode;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	711 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	712 (struct dropbear_cipher_mode*)c2s_cipher_algo->mode;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	713 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	714 (struct dropbear_hash*)s2c_hash_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	715 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	716 (struct dropbear_hash*)c2s_hash_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	717 ses.newkeys->recv.algo_comp = s2c_comp_algo->val;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	718 ses.newkeys->trans.algo_comp = c2s_comp_algo->val;
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	719 } else {
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	720 /* SERVER */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	721 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	722 (struct dropbear_cipher*)c2s_cipher_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	723 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	724 (struct dropbear_cipher*)s2c_cipher_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	725 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	726 (struct dropbear_cipher_mode*)c2s_cipher_algo->mode;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	727 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	728 (struct dropbear_cipher_mode*)s2c_cipher_algo->mode;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	729 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	730 (struct dropbear_hash*)c2s_hash_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	731 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	732 (struct dropbear_hash*)s2c_hash_algo->data;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	733 ses.newkeys->recv.algo_comp = c2s_comp_algo->val;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	734 ses.newkeys->trans.algo_comp = s2c_comp_algo->val;
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	735 }
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	736
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	737 /* reserved for future extensions */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	738 buf_getint(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	739 return;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	740
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	741 error:
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	742 dropbear_exit("no matching algo %s", erralgo);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	743 }

Mercurial > dropbear

annotate common-kex.c @ 560:52d7301e46bd agent-client