dropbear: common-kex.c annotate

annotate common-kex.c @ 751:685d05f1cc5c

Just put the version string on the queue, don't use atomicio

author	Matt Johnston <matt@ucc.asn.au>
date	Wed, 03 Apr 2013 19:23:53 +0800
parents	465fefc4f6e0
children	d63ef1e211ea

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"
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	36 #include "runopts.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 /* diffie-hellman-group1-sha1 value for p */
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	39 #define DH_P_1_LEN 128
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	40 static const unsigned char dh_p_1[DH_P_1_LEN] = {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 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	42 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	43 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	44 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	45 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	46 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	47 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	48 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	49 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	50 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	51 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	53 /* diffie-hellman-group14-sha1 value for p */
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	54 #define DH_P_14_LEN 256
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	55 static const unsigned char dh_p_14[DH_P_14_LEN] = {
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	56 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	57 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	58 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	59 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	60 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	61 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	62 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	63 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	64 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	65 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	66 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, 0x98, 0xDA, 0x48, 0x36,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	67 0x1C, 0x55, 0xD3, 0x9A, 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	68 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96, 0x1C, 0x62, 0xF3, 0x56,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	69 0x20, 0x85, 0x52, 0xBB, 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	70 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, 0xF1, 0x74, 0x6C, 0x08,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	71 0xCA, 0x18, 0x21, 0x7C, 0x32, 0x90, 0x5E, 0x46, 0x2E, 0x36, 0xCE, 0x3B,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	72 0xE3, 0x9E, 0x77, 0x2C, 0x18, 0x0E, 0x86, 0x03, 0x9B, 0x27, 0x83, 0xA2,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	73 0xEC, 0x07, 0xA2, 0x8F, 0xB5, 0xC5, 0x5D, 0xF0, 0x6F, 0x4C, 0x52, 0xC9,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	74 0xDE, 0x2B, 0xCB, 0xF6, 0x95, 0x58, 0x17, 0x18, 0x39, 0x95, 0x49, 0x7C,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	75 0xEA, 0x95, 0x6A, 0xE5, 0x15, 0xD2, 0x26, 0x18, 0x98, 0xFA, 0x05, 0x10,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	76 0x15, 0x72, 0x8E, 0x5A, 0x8A, 0xAC, 0xAA, 0x68, 0xFF, 0xFF, 0xFF, 0xFF,
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	77 0xFF, 0xFF, 0xFF, 0xFF};
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	78
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	79 /* Same for group1 and group14 */
227 ad1b24e39bf3 Make a variables static Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	80 static const int DH_G_VAL = 2;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	82 static void kexinitialise();
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	83 void gen_new_keys();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 #ifndef DISABLE_ZLIB
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 static void gen_new_zstreams();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 #endif
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	87 static void read_kex_algos();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 /* helper function for gen_new_keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 static void hashkeys(unsigned char *out, int outlen,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 const hash_state * hs, unsigned const char X);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91
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 /* Send our list of algorithms we can use */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 void send_msg_kexinit() {
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 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 buf_putbyte(ses.writepayload, SSH_MSG_KEXINIT);
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 /* cookie */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 genrandom(buf_getwriteptr(ses.writepayload, 16), 16);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 buf_incrwritepos(ses.writepayload, 16);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 /* kex algos */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 buf_put_algolist(ses.writepayload, sshkex);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 /* server_host_key_algorithms */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 buf_put_algolist(ses.writepayload, sshhostkey);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108
683 63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	109 /* encryption_algorithms_client_to_server */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	110 buf_put_algolist(ses.writepayload, sshciphers);
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	111
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	112 /* encryption_algorithms_server_to_client */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	113 buf_put_algolist(ses.writepayload, sshciphers);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
683 63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	115 /* mac_algorithms_client_to_server */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	116 buf_put_algolist(ses.writepayload, sshhashes);
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	117
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	118 /* mac_algorithms_server_to_client */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	119 buf_put_algolist(ses.writepayload, sshhashes);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120
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 /* compression_algorithms_client_to_server */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	123 buf_put_algolist(ses.writepayload, ses.compress_algos);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 /* compression_algorithms_server_to_client */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	126 buf_put_algolist(ses.writepayload, ses.compress_algos);
4 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 /* languages_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 buf_putstring(ses.writepayload, "", 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 /* languages_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 buf_putstring(ses.writepayload, "", 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	134 /* first_kex_packet_follows */
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	135 buf_putbyte(ses.writepayload, (ses.send_kex_first_guess != NULL));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 /* reserved unit32 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 buf_putint(ses.writepayload, 0);
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 transmitted kex packet buffer for hashing.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 * 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	142 ses.transkexinit = buf_newcopy(ses.writepayload);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 encrypt_packet();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 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	146
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	147 ses.kexstate.sentkexinit = 1;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	148
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	149 ses.newkeys = (struct key_context*)m_malloc(sizeof(struct key_context));
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	150
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	151 if (ses.send_kex_first_guess) {
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	152 ses.newkeys->algo_kex = sshkex[0].val;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	153 ses.newkeys->algo_hostkey = sshhostkey[0].val;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	154 ses.send_kex_first_guess();
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	155 }
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	156
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	157 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	158 TRACE(("-> KEXINIT"))
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	159
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 /* * NOTE regarding (send\|recv)_msg_newkeys *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 * 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	164 * 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	165 * This enables client mode without affecting server functionality.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 /* 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	169 void send_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170
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	171 TRACE(("enter send_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 /* generate the kexinit request */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 buf_putbyte(ses.writepayload, SSH_MSG_NEWKEYS);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 encrypt_packet();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177
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 /* set up our state */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 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	181 TRACE(("while RECVNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 gen_new_keys();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 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	184 TRACE((" -> DATAALLOWED=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 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	186 ses.kexstate.donefirstkex = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 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	189 TRACE(("SENTNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191
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	192 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	193 TRACE(("leave send_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 /* 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	197 void recv_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198
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	199 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	200 TRACE(("enter recv_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 /* 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	203 * switch to the new keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 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	205 TRACE(("while SENTNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 gen_new_keys();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 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	208 TRACE((" -> DATAALLOWED=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 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	210 ses.kexstate.donefirstkex = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 } 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	212 TRACE(("RECVNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 ses.kexstate.recvnewkeys = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215
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	216 TRACE(("leave recv_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	220 /* Set up the kex for the first time */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	221 void kexfirstinitialise() {
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	222 ses.kexstate.donefirstkex = 0;
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	223
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	224 #ifndef DISABLE_ZLIB
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	225 if (opts.enable_compress) {
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	226 ses.compress_algos = ssh_compress;
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	227 } else
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	228 #endif
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	229 {
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	230 ses.compress_algos = ssh_nocompress;
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	231 }
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	232 kexinitialise();
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	233 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	234
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	235 /* Reset the kex state, ready for a new negotiation */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	236 static void kexinitialise() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237
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	238 TRACE(("kexinitialise()"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 /* sent/recv'd MSG_KEXINIT */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 ses.kexstate.sentkexinit = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242 ses.kexstate.recvkexinit = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 /* sent/recv'd MSG_NEWKEYS */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245 ses.kexstate.recvnewkeys = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246 ses.kexstate.sentnewkeys = 0;
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 /* first_packet_follows */
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	249 ses.kexstate.them_firstfollows = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 ses.kexstate.datatrans = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 ses.kexstate.datarecv = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	254 ses.kexstate.our_first_follows_matches = 0;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	255
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 410 diff changeset	256 ses.kexstate.lastkextime = time(NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260 /* 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	261 * 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	262 * 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	263 * out must have at least min(SHA1_HASH_SIZE, outlen) bytes allocated.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264 *
409 0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	265 * 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	266 static void hashkeys(unsigned char *out, int outlen,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 const hash_state * hs, const unsigned char X) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 hash_state hs2;
679 03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	270 int offset;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 memcpy(&hs2, hs, sizeof(hash_state));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 sha1_process(&hs2, &X, 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274 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	275 sha1_done(&hs2, out);
679 03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	276 for (offset = SHA1_HASH_SIZE;
03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	277 offset < outlen;
03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	278 offset += SHA1_HASH_SIZE)
03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	279 {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280 /* need to extend */
679 03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	281 unsigned char k2[SHA1_HASH_SIZE];
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 memcpy(&hs2, hs, sizeof(hash_state));
679 03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	283 sha1_process(&hs2, out, offset);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 sha1_done(&hs2, k2);
679 03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	285 memcpy(&out[offset], k2, MIN(outlen - offset, SHA1_HASH_SIZE));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 }
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 /* Generate the actual encryption/integrity keys, using the results of the
603 3aa74a4d83ae Refer to RFCs rather than drafts, update some section references Matt Johnston <matt@ucc.asn.au> parents: 595 diff changeset	290 * key exchange, as specified in section 7.2 of the transport rfc 4253.
3aa74a4d83ae Refer to RFCs rather than drafts, update some section references Matt Johnston <matt@ucc.asn.au> parents: 595 diff changeset	291 * This occurs after the DH key-exchange.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	293 * 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	294 * 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	295
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296 /* 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	297 void gen_new_keys() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299 unsigned char C2S_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300 unsigned char C2S_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301 unsigned char S2C_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 unsigned char S2C_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 /* unsigned char key[MAX_KEY_LEN]; */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304 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	305
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 hash_state hs;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 unsigned int C2S_keysize, S2C_keysize;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308 char mactransletter, macrecvletter; /* Client or server specific */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309
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	310 TRACE(("enter gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 /* 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	312
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313 sha1_init(&hs);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 sha1_process_mp(&hs, ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 mp_clear(ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 m_free(ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 sha1_process(&hs, ses.hash, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 m_burn(ses.hash, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320 if (IS_DROPBEAR_CLIENT) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 trans_IV = C2S_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 recv_IV = S2C_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 trans_key = C2S_key;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 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	325 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	326 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	327 mactransletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 macrecvletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 trans_IV = S2C_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 recv_IV = C2S_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332 trans_key = S2C_key;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 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	334 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	335 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	336 mactransletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 macrecvletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	340 hashkeys(C2S_IV, SHA1_HASH_SIZE, &hs, 'A');
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	341 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	342 hashkeys(C2S_key, C2S_keysize, &hs, 'C');
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343 hashkeys(S2C_key, S2C_keysize, &hs, 'D');
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	345 if (ses.newkeys->recv.algo_crypt->cipherdesc != NULL) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	346 int recv_cipher = find_cipher(ses.newkeys->recv.algo_crypt->cipherdesc->name);
512 0129fd8ccc71 Update nocrypto branch to current head Matt Johnston <matt@ucc.asn.au> parents: 511 diff changeset	347 if (recv_cipher < 0)
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	348 dropbear_exit("Crypto error");
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	349 if (ses.newkeys->recv.crypt_mode->start(recv_cipher,
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	350 recv_IV, recv_key,
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	351 ses.newkeys->recv.algo_crypt->keysize, 0,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	352 &ses.newkeys->recv.cipher_state) != CRYPT_OK) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	353 dropbear_exit("Crypto error");
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	354 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	355 }
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	356
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	357 if (ses.newkeys->trans.algo_crypt->cipherdesc != NULL) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	358 int trans_cipher = find_cipher(ses.newkeys->trans.algo_crypt->cipherdesc->name);
512 0129fd8ccc71 Update nocrypto branch to current head Matt Johnston <matt@ucc.asn.au> parents: 511 diff changeset	359 if (trans_cipher < 0)
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	360 dropbear_exit("Crypto error");
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	361 if (ses.newkeys->trans.crypt_mode->start(trans_cipher,
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	362 trans_IV, trans_key,
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	363 ses.newkeys->trans.algo_crypt->keysize, 0,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	364 &ses.newkeys->trans.cipher_state) != CRYPT_OK) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	365 dropbear_exit("Crypto error");
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	366 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 }
512 0129fd8ccc71 Update nocrypto branch to current head Matt Johnston <matt@ucc.asn.au> parents: 511 diff changeset	368
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	369 if (ses.newkeys->trans.algo_mac->hashdesc != NULL) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	370 hashkeys(ses.newkeys->trans.mackey,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	371 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter);
712 bf0ac0512ef7 Fix "-m none" case and ugly typo Matt Johnston <matt@ucc.asn.au> parents: 684 diff changeset	372 ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hashdesc->name);
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	373 }
712 bf0ac0512ef7 Fix "-m none" case and ugly typo Matt Johnston <matt@ucc.asn.au> parents: 684 diff changeset	374
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	375 if (ses.newkeys->recv.algo_mac->hashdesc != NULL) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	376 hashkeys(ses.newkeys->recv.mackey,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	377 ses.newkeys->recv.algo_mac->keysize, &hs, macrecvletter);
712 bf0ac0512ef7 Fix "-m none" case and ugly typo Matt Johnston <matt@ucc.asn.au> parents: 684 diff changeset	378 ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hashdesc->name);
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	379 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381 #ifndef DISABLE_ZLIB
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 gen_new_zstreams();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385 /* Switch over to the new keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	386 m_burn(ses.keys, sizeof(struct key_context));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 m_free(ses.keys);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 ses.keys = ses.newkeys;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 ses.newkeys = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390
648 4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	391 m_burn(C2S_IV, sizeof(C2S_IV));
4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	392 m_burn(C2S_key, sizeof(C2S_key));
4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	393 m_burn(S2C_IV, sizeof(S2C_IV));
4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	394 m_burn(S2C_key, sizeof(S2C_key));
4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	395
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	396 TRACE(("leave gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 }
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 #ifndef DISABLE_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	400
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	401 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	402 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	403 \|\| (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	404 && 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	405 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	406
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	407 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	408 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	409 \|\| (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	410 && 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	411 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	412
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 /* 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	414 * called from gen_new_keys() */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 static void gen_new_zstreams() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	416
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 /* 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	418 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	419 \|\| 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	420 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	421 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	422 ses.newkeys->recv.zstream->zfree = Z_NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	424 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	425 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	428 ses.newkeys->recv.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	431 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	432 \|\| 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	433 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	434 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	435 ses.newkeys->trans.zstream->zfree = Z_NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436
555 daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	437 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	438 Z_DEFLATED, DROPBEAR_ZLIB_WINDOW_BITS,
daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	439 DROPBEAR_ZLIB_MEM_LEVEL, Z_DEFAULT_STRATEGY)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 != Z_OK) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	444 ses.newkeys->trans.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	446
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447 /* 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	448 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	449 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	450 /* Z_DATA_ERROR is ok, just means that stream isn't ended */
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	451 dropbear_exit("Crypto error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	453 m_free(ses.keys->recv.zstream);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	455 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	456 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	457 /* Z_DATA_ERROR is ok, just means that stream isn't ended */
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	458 dropbear_exit("Crypto error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	460 m_free(ses.keys->trans.zstream);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	461 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	462 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	463 #endif /* DISABLE_ZLIB */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	464
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	466 /* 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	467 * 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	468 * 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	469 * 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	470 * 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	471 * initiate the diffie-hellman key exchange */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	472
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	473 /* 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	474 /* 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	475 void recv_msg_kexinit() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	477 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	478 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	479 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	480
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	481 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	482 TRACE(("enter recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	483
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	484 if (!ses.kexstate.sentkexinit) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	485 /* we need to send a kex packet */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	486 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	487 TRACE(("continue recv_msg_kexinit: sent kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	488 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	489
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	490 /* 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	491 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	492 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	493
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	494 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	495 + 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	496 + 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	497
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	498 ses.kexhashbuf = buf_new(kexhashbuf_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	499
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	500 if (IS_DROPBEAR_CLIENT) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	501
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	502 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	503 read_kex_algos();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	504
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	505 /* 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	506 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	507 (unsigned char*)LOCAL_IDENT, local_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	508 /* 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	509 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	510
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	511 /* 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	512 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	513 ses.transkexinit->data, ses.transkexinit->len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	514 /* 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	515 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	516 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	517
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518 } else {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	519 /* SERVER */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	520
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	521 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	522 read_kex_algos();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	523 /* 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	524 buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	525 /* 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	526 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	527 (unsigned char*)LOCAL_IDENT, local_ident_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	529 /* 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	530 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	531 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	532
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	533 /* 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	534 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	535 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	536
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	537 ses.requirenext = SSH_MSG_KEXDH_INIT;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	540 buf_free(ses.transkexinit);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	541 ses.transkexinit = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542 /* 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	543
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	544 ses.kexstate.recvkexinit = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	545
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	546 TRACE(("leave recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	547 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	548
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	549 static void load_dh_p(mp_int * dh_p)
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	550 {
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	551 switch (ses.newkeys->algo_kex) {
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	552 case DROPBEAR_KEX_DH_GROUP1:
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	553 bytes_to_mp(dh_p, dh_p_1, DH_P_1_LEN);
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	554 break;
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	555 case DROPBEAR_KEX_DH_GROUP14:
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	556 bytes_to_mp(dh_p, dh_p_14, DH_P_14_LEN);
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	557 break;
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	558 }
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	559 }
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	560
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	561 /* Initialises and generate one side of the diffie-hellman key exchange values.
603 3aa74a4d83ae Refer to RFCs rather than drafts, update some section references Matt Johnston <matt@ucc.asn.au> parents: 595 diff changeset	562 * See the transport rfc 4253 section 8 for details */
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	563 /* dh_pub and dh_priv MUST be already initialised */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	564 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	565
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	566 DEF_MP_INT(dh_p);
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	567 DEF_MP_INT(dh_q);
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	568 DEF_MP_INT(dh_g);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	569
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	570 TRACE(("enter gen_kexdh_vals"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	571
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	572 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	573
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	574 /* read the prime and generator*/
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	575 load_dh_p(&dh_p);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	576
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	577 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	578 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	579 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	580
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	581 /* calculate q = (p-1)/2 */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	582 /* dh_priv is just a temp var here */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	583 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	584 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	585 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	586 if (mp_div_2(dh_priv, &dh_q) != MP_OKAY) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	587 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	588 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	589
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	590 /* 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	591 gen_random_mpint(&dh_q, dh_priv);
26 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 /* f = g^y mod p */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	594 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	595 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	596 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	597 mp_clear_multi(&dh_g, &dh_p, &dh_q, NULL);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	598 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	599
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	600 /* 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	601 * of dh_e/dh_f etc. Hence these arguments:
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	602 * 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	603 * 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	604 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	605 sign_key *hostkey) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	606
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	607 mp_int dh_p;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	608 mp_int dh_e = NULL, dh_f = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	609 hash_state hs;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	610
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	611 /* read the prime and generator*/
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	612 m_mp_init(&dh_p);
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	613 load_dh_p(&dh_p);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	614
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	615 /* 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	616 if (mp_cmp(dh_pub_them, &dh_p) != MP_LT
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	617 \|\| mp_cmp_d(dh_pub_them, 0) != MP_GT) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	618 dropbear_exit("Diffie-Hellman error");
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
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	621 /* K = e^y mod p = f^x mod p */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	622 ses.dh_K = (mp_int*)m_malloc(sizeof(mp_int));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	623 m_mp_init(ses.dh_K);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	624 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	625 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	626 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	627
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	628 /* clear no longer needed vars */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	629 mp_clear_multi(&dh_p, NULL);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	630
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	631 /* 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	632 * not vice-versaing for client/server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	633 if (IS_DROPBEAR_CLIENT) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	634 dh_e = dh_pub_us;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	635 dh_f = dh_pub_them;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	636 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	637 dh_e = dh_pub_them;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	638 dh_f = dh_pub_us;
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
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	641 /* 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	642 /* K_S, the host key */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	643 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	644 /* e, exchange value sent by the client */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	645 buf_putmpint(ses.kexhashbuf, dh_e);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	646 /* f, exchange value sent by the server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	647 buf_putmpint(ses.kexhashbuf, dh_f);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	648 /* K, the shared secret */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	649 buf_putmpint(ses.kexhashbuf, ses.dh_K);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	650
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	651 /* calculate the hash H to sign */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	652 sha1_init(&hs);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	653 buf_setpos(ses.kexhashbuf, 0);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	654 sha1_process(&hs, buf_getptr(ses.kexhashbuf, ses.kexhashbuf->len),
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	655 ses.kexhashbuf->len);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	656 sha1_done(&hs, ses.hash);
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	657
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	658 buf_burn(ses.kexhashbuf);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	659 buf_free(ses.kexhashbuf);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	660 ses.kexhashbuf = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	661
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	662 /* first time around, we set the session_id to H */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	663 if (ses.session_id == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	664 /* create the session_id, this never needs freeing */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	665 ses.session_id = (unsigned char*)m_malloc(SHA1_HASH_SIZE);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	666 memcpy(ses.session_id, ses.hash, SHA1_HASH_SIZE);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	667 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	668 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	669
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	670 /* 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	671 * algos for the client or server. */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	672 static void read_kex_algos() {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	673
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	674 /* for asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	675 algo_type * c2s_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	676 algo_type * s2c_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	677 algo_type * c2s_cipher_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	678 algo_type * s2c_cipher_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	679 algo_type * c2s_comp_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	680 algo_type * s2c_comp_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	681 /* the generic one */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	682 algo_type * algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	683
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	684 /* which algo couldn't match */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	685 char * erralgo = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	686
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	687 int goodguess = 0;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	688 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	689 true after */
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 buf_incrpos(ses.payload, 16); /* start after the cookie */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	692
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	693 memset(ses.newkeys, 0x0, sizeof(*ses.newkeys));
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	694
746 465fefc4f6e0 Put some #ifdef options around first-follows options in case they Matt Johnston <matt@ucc.asn.au> parents: 741 diff changeset	695 #ifdef USE_KEXGUESS2
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	696 enum kexguess2_used kexguess2 = KEXGUESS2_LOOK;
746 465fefc4f6e0 Put some #ifdef options around first-follows options in case they Matt Johnston <matt@ucc.asn.au> parents: 741 diff changeset	697 #else
465fefc4f6e0 Put some #ifdef options around first-follows options in case they Matt Johnston <matt@ucc.asn.au> parents: 741 diff changeset	698 enum kexguess2_used kexguess2 = KEXGUESS2_NO;
465fefc4f6e0 Put some #ifdef options around first-follows options in case they Matt Johnston <matt@ucc.asn.au> parents: 741 diff changeset	699 #endif
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	700
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	701 /* kex_algorithms */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	702 algo = buf_match_algo(ses.payload, sshkex, &kexguess2, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	703 allgood &= goodguess;
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	704 if (algo == NULL \|\| algo->val == KEXGUESS2_ALGO_ID) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	705 erralgo = "kex";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	706 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	707 }
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	708 TRACE(("kexguess2 %d", kexguess2))
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	709 TRACE(("kex algo %s", algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	710 ses.newkeys->algo_kex = algo->val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	711
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	712 /* server_host_key_algorithms */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	713 algo = buf_match_algo(ses.payload, sshhostkey, &kexguess2, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	714 allgood &= goodguess;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	715 if (algo == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	716 erralgo = "hostkey";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	717 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	718 }
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	719 TRACE(("hostkey algo %s", algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	720 ses.newkeys->algo_hostkey = algo->val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	721
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	722 /* encryption_algorithms_client_to_server */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	723 c2s_cipher_algo = buf_match_algo(ses.payload, sshciphers, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	724 if (c2s_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	725 erralgo = "enc c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	726 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	727 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	728 TRACE(("enc c2s is %s", c2s_cipher_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	729
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	730 /* encryption_algorithms_server_to_client */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	731 s2c_cipher_algo = buf_match_algo(ses.payload, sshciphers, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	732 if (s2c_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	733 erralgo = "enc s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	734 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	735 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	736 TRACE(("enc s2c is %s", s2c_cipher_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	737
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	738 /* mac_algorithms_client_to_server */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	739 c2s_hash_algo = buf_match_algo(ses.payload, sshhashes, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	740 if (c2s_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	741 erralgo = "mac c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	742 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	743 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	744 TRACE(("hash c2s is %s", c2s_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	745
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	746 /* mac_algorithms_server_to_client */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	747 s2c_hash_algo = buf_match_algo(ses.payload, sshhashes, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	748 if (s2c_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	749 erralgo = "mac s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	750 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	751 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	752 TRACE(("hash s2c is %s", s2c_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	753
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	754 /* compression_algorithms_client_to_server */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	755 c2s_comp_algo = buf_match_algo(ses.payload, ses.compress_algos, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	756 if (c2s_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	757 erralgo = "comp c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	758 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	759 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	760 TRACE(("hash c2s is %s", c2s_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	761
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	762 /* compression_algorithms_server_to_client */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	763 s2c_comp_algo = buf_match_algo(ses.payload, ses.compress_algos, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	764 if (s2c_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	765 erralgo = "comp s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	766 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	767 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	768 TRACE(("hash s2c is %s", s2c_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	769
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	770 /* languages_client_to_server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	771 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	772
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	773 /* languages_server_to_client */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	774 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	775
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	776 /* their 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	777 if (buf_getbool(ses.payload)) {
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	778 TRACE(("them kex firstfollows. allgood %d", allgood))
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	779 ses.kexstate.them_firstfollows = 1;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	780 /* 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	781 if (!allgood) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	782 ses.ignorenext = 1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	783 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	784 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	785
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	786 /* Handle the asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	787 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	788 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	789 (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	790 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	791 (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	792 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	793 (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	794 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	795 (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	796 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	797 (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	798 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	799 (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	800 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	801 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	802 } else {
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	803 /* SERVER */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	804 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	805 (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	806 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	807 (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	808 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	809 (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	810 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	811 (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	812 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	813 (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	814 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	815 (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	816 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	817 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	818 }
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	819
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	820 /* reserved for future extensions */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	821 buf_getint(ses.payload);
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	822
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	823 if (ses.send_kex_first_guess && allgood) {
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	824 TRACE(("our_first_follows_matches 1"))
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	825 ses.kexstate.our_first_follows_matches = 1;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	826 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	827 return;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	828
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	829 error:
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	830 dropbear_exit("No matching algo %s", erralgo);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	831 }

Mercurial > dropbear

annotate common-kex.c @ 751:685d05f1cc5c