dropbear: common-kex.c annotate

annotate common-kex.c @ 642:33fd2f3499d2 dropbear-tfm

A few build fixes

author	Matt Johnston <matt@ucc.asn.au>
date	Tue, 22 Nov 2011 19:28:58 +0700
parents	2b1bb792cd4d
children

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
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 /* encryption_algorithms_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110 buf_put_algolist(ses.writepayload, sshciphers);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 /* encryption_algorithms_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 buf_put_algolist(ses.writepayload, sshciphers);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 /* mac_algorithms_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 buf_put_algolist(ses.writepayload, sshhashes);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 /* mac_algorithms_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 buf_put_algolist(ses.writepayload, sshhashes);
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 /* compression_algorithms_client_to_server */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	122 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	123
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 /* compression_algorithms_server_to_client */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	125 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	126
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 /* languages_client_to_server */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 buf_putstring(ses.writepayload, "", 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 /* languages_server_to_client */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 buf_putstring(ses.writepayload, "", 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 /* first_kex_packet_follows - unimplemented for now */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 buf_putbyte(ses.writepayload, 0x00);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 /* reserved unit32 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 buf_putint(ses.writepayload, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 /* set up transmitted kex packet buffer for hashing.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 * 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	141 ses.transkexinit = buf_newcopy(ses.writepayload);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 encrypt_packet();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 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	145
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	146 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	147 TRACE(("-> KEXINIT"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 ses.kexstate.sentkexinit = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 /* * NOTE regarding (send\|recv)_msg_newkeys *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 * 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	153 * 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	154 * This enables client mode without affecting server functionality.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 /* Bring 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	158 void send_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	160 TRACE(("enter send_msg_newkeys"))
4 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 /* generate the kexinit request */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 buf_putbyte(ses.writepayload, SSH_MSG_NEWKEYS);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 encrypt_packet();
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 /* set up our state */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 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	170 TRACE(("while RECVNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 gen_new_keys();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 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	173 TRACE((" -> DATAALLOWED=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 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	175 ses.kexstate.donefirstkex = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 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	178 TRACE(("SENTNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180
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(("-> 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	182 TRACE(("leave send_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 /* 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	186 void recv_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187
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	188 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	189 TRACE(("enter recv_msg_newkeys"))
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 /* 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	192 * switch to the new keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 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	194 TRACE(("while SENTNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 gen_new_keys();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 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	197 TRACE((" -> DATAALLOWED=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 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	199 ses.kexstate.donefirstkex = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 } 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	201 TRACE(("RECVNEWKEYS=1"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 ses.kexstate.recvnewkeys = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204
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(("leave recv_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	209 /* Set up the kex for the first time */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	210 void kexfirstinitialise() {
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	211 ses.kexstate.donefirstkex = 0;
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	212
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	213 #ifndef DISABLE_ZLIB
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	214 if (opts.enable_compress) {
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	215 ses.compress_algos = ssh_compress;
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	216 } else
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	217 #endif
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	218 {
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	219 ses.compress_algos = ssh_nocompress;
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	220 }
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	221 kexinitialise();
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	222 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	223
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	224 /* Reset the kex state, ready for a new negotiation */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	225 static void kexinitialise() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226
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	227 TRACE(("kexinitialise()"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 /* sent/recv'd MSG_KEXINIT */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 ses.kexstate.sentkexinit = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 ses.kexstate.recvkexinit = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 /* sent/recv'd MSG_NEWKEYS */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 ses.kexstate.recvnewkeys = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 ses.kexstate.sentnewkeys = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237 /* first_packet_follows */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 ses.kexstate.firstfollows = 0;
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 ses.kexstate.datatrans = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 ses.kexstate.datarecv = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 410 diff changeset	243 ses.kexstate.lastkextime = time(NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	247 /* 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	248 * 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	249 * 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	250 * out must have at least min(SHA1_HASH_SIZE, outlen) bytes allocated.
409 0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	251 * The output will only be expanded once, as we are assured that
0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	252 * outlen <= 2*SHA1_HASH_SIZE for all known hashes.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253 *
409 0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	254 * 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	255 static void hashkeys(unsigned char *out, int outlen,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 const hash_state * hs, const unsigned char X) {
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 hash_state hs2;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 unsigned char k2[SHA1_HASH_SIZE]; /* used to extending */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 memcpy(&hs2, hs, sizeof(hash_state));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262 sha1_process(&hs2, &X, 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263 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	264 sha1_done(&hs2, out);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265 if (SHA1_HASH_SIZE < outlen) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	266 /* need to extend */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 memcpy(&hs2, hs, sizeof(hash_state));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 sha1_process(&hs2, out, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 sha1_done(&hs2, k2);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 memcpy(&out[SHA1_HASH_SIZE], k2, outlen - SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274 /* 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	275 * 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	276 * This occurs after the DH key-exchange.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 * 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	279 * 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	280
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 /* 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	282 void gen_new_keys() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 unsigned char C2S_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 unsigned char C2S_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 unsigned char S2C_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 unsigned char S2C_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 /* unsigned char key[MAX_KEY_LEN]; */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289 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	290
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291 hash_state hs;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 unsigned int C2S_keysize, S2C_keysize;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	293 char mactransletter, macrecvletter; /* Client or server specific */
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	294 int recv_cipher = 0, trans_cipher = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295
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	296 TRACE(("enter gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297 /* 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	298
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299 sha1_init(&hs);
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	300 sha1_process_fp(&hs, ses.dh_K);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	301 fp_zero(ses.dh_K);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 m_free(ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 sha1_process(&hs, ses.hash, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304 m_burn(ses.hash, SHA1_HASH_SIZE);
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 if (IS_DROPBEAR_CLIENT) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 trans_IV = C2S_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308 recv_IV = S2C_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 trans_key = C2S_key;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310 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	311 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	312 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	313 mactransletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 macrecvletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 trans_IV = S2C_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 recv_IV = C2S_IV;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 trans_key = S2C_key;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 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	320 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	321 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	322 mactransletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 macrecvletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	325
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	326 hashkeys(C2S_IV, SHA1_HASH_SIZE, &hs, 'A');
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	327 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	328 hashkeys(C2S_key, C2S_keysize, &hs, 'C');
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 hashkeys(S2C_key, S2C_keysize, &hs, 'D');
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	331 recv_cipher = find_cipher(ses.newkeys->recv.algo_crypt->cipherdesc->name);
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	332 if (recv_cipher < 0)
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	333 dropbear_exit("Crypto error");
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	334 if (ses.newkeys->recv.crypt_mode->start(recv_cipher,
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	335 recv_IV, recv_key,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	336 ses.newkeys->recv.algo_crypt->keysize, 0,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	337 &ses.newkeys->recv.cipher_state) != CRYPT_OK) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	338 dropbear_exit("Crypto error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339 }
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	340
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	341 trans_cipher = find_cipher(ses.newkeys->trans.algo_crypt->cipherdesc->name);
342 3e098639b05f From Erik Hovland Matt Johnston <matt@ucc.asn.au> parents: 257 diff changeset	342 if (trans_cipher < 0)
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	343 dropbear_exit("Crypto error");
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	344 if (ses.newkeys->trans.crypt_mode->start(trans_cipher,
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	345 trans_IV, trans_key,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	346 ses.newkeys->trans.algo_crypt->keysize, 0,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	347 &ses.newkeys->trans.cipher_state) != CRYPT_OK) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	348 dropbear_exit("Crypto error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351 /* MAC keys */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	352 hashkeys(ses.newkeys->trans.mackey,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	353 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	354 hashkeys(ses.newkeys->recv.mackey,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	355 ses.newkeys->recv.algo_mac->keysize, &hs, macrecvletter);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	356 ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hashdesc->name),
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	357 ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hashdesc->name),
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	358
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	359 #ifndef DISABLE_ZLIB
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	360 gen_new_zstreams();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363 /* Switch over to the new keys */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 m_burn(ses.keys, sizeof(struct key_context));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365 m_free(ses.keys);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 ses.keys = ses.newkeys;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 ses.newkeys = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	368
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	369 TRACE(("leave gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372 #ifndef DISABLE_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	373
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	374 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	375 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	376 \|\| (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	377 && 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	378 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	379
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	380 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	381 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	382 \|\| (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	383 && 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	384 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	385
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	386 /* 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	387 * called from gen_new_keys() */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 static void gen_new_zstreams() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390 /* 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	391 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	392 \|\| 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	393 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	394 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	395 ses.newkeys->recv.zstream->zfree = Z_NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	396
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	397 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	398 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	401 ses.newkeys->recv.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	404 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	405 \|\| 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	406 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	407 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	408 ses.newkeys->trans.zstream->zfree = Z_NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409
555 daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	410 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	411 Z_DEFLATED, DROPBEAR_ZLIB_WINDOW_BITS,
daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	412 DROPBEAR_ZLIB_MEM_LEVEL, Z_DEFAULT_STRATEGY)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 != Z_OK) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	416 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	417 ses.newkeys->trans.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	419
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 /* 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	421 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	422 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	423 /* 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	424 dropbear_exit("Crypto error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	426 m_free(ses.keys->recv.zstream);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	428 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	429 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	430 /* 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	431 dropbear_exit("Crypto error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	433 m_free(ses.keys->trans.zstream);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	436 #endif /* DISABLE_ZLIB */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 /* 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	440 * 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	441 * 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	442 * 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	443 * 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	444 * initiate the diffie-hellman key exchange */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 /* 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	447 /* 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	448 void recv_msg_kexinit() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	450 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	451 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	452 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	453
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	454 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	455 TRACE(("enter recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457 if (!ses.kexstate.sentkexinit) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	458 /* we need to send a kex packet */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459 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	460 TRACE(("continue recv_msg_kexinit: sent kexinit"))
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
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	463 /* 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	464 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	465 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	466
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	467 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	468 + 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	469 + 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	470
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	471 ses.kexhashbuf = buf_new(kexhashbuf_len);
4 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 if (IS_DROPBEAR_CLIENT) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	475 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	476 read_kex_algos();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	478 /* 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	479 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	480 (unsigned char*)LOCAL_IDENT, local_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	481 /* 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	482 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	483
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	484 /* 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	485 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	486 ses.transkexinit->data, ses.transkexinit->len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	487 /* 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	488 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	489 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	490
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	491 } else {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	492 /* SERVER */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	493
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	494 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	495 read_kex_algos();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	496 /* 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	497 buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	498 /* 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	499 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	500 (unsigned char*)LOCAL_IDENT, local_ident_len);
4 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 /* 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	503 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	504 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	505
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	506 /* 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	507 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	508 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	509
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	510 ses.requirenext = SSH_MSG_KEXDH_INIT;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	512
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	513 buf_free(ses.transkexinit);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	514 ses.transkexinit = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	515 /* 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	516
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	517 ses.kexstate.recvkexinit = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518
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	519 TRACE(("leave recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	520 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	521
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	522 static void load_dh_p(fp_int * dh_p)
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	523 {
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	524 switch (ses.newkeys->algo_kex) {
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	525 case DROPBEAR_KEX_DH_GROUP1:
641 2b1bb792cd4d - Update tfm changes to current default tip Matt Johnston <matt@ucc.asn.au> parents: 640 603 diff changeset	526 bytes_to_fp(dh_p, dh_p_1, DH_P_1_LEN);
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	527 break;
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	528 case DROPBEAR_KEX_DH_GROUP14:
641 2b1bb792cd4d - Update tfm changes to current default tip Matt Johnston <matt@ucc.asn.au> parents: 640 603 diff changeset	529 bytes_to_fp(dh_p, dh_p_14, DH_P_14_LEN);
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	530 break;
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	531 }
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	532 }
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	533
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	534 /* 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	535 * 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	536 /* dh_pub and dh_priv MUST be already initialised */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	537 void gen_kexdh_vals(fp_int dh_pub, fp_int dh_priv) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	538
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	539 DEF_FP_INT(dh_p);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	540 DEF_FP_INT(dh_q);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	541 DEF_FP_INT(dh_g);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	542
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	543 TRACE(("enter send_msg_kexdh_reply"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	544
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	545 m_fp_init_multi(&dh_g, &dh_p, &dh_q, NULL);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	546
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	547 /* read the prime and generator*/
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	548 load_dh_p(&dh_p);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	549
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	550 fp_set(&dh_g, DH_G_VAL);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	551
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	552 /* calculate q = (p-1)/2 */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	553 /* dh_priv is just a temp var here */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	554 fp_sub_d(&dh_p, 1, dh_priv);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	555
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	556 fp_div_2(dh_priv, &dh_q);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	557
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	558 /* Generate a private portion 0 < dh_priv < dh_q */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	559 gen_random_fpint(&dh_q, dh_priv);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	560
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	561 /* f = g^y mod p */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	562 if (fp_exptmod(&dh_g, dh_priv, &dh_p, dh_pub) != FP_OKAY) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	563 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	564 }
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	565 m_fp_zero_multi(&dh_g, &dh_p, &dh_q, NULL);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	566 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	567
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	568 /* 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	569 * of dh_e/dh_f etc. Hence these arguments:
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	570 * 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	571 * vice-versa. dh_priv is the x/y value corresponding to dh_pub_us */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	572 void kexdh_comb_key(fp_int dh_pub_us, fp_int dh_priv, fp_int *dh_pub_them,
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	573 sign_key *hostkey) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	574
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	575 fp_int dh_p;
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	576 fp_int dh_e = NULL, dh_f = NULL;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	577 hash_state hs;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	578
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	579 /* read the prime and generator*/
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	580 m_fp_init(&dh_p);
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	581 load_dh_p(&dh_p);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	582
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	583 /* Check that dh_pub_them (dh_e or dh_f) is in the range [1, p-1] */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	584 if (fp_cmp(dh_pub_them, &dh_p) != FP_LT
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	585 \|\| fp_cmp_d(dh_pub_them, 0) != FP_GT) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	586 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	587 }
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 /* K = e^y mod p = f^x mod p */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	590 ses.dh_K = (fp_int*)m_malloc(sizeof(fp_int));
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	591 m_fp_init(ses.dh_K);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	592 if (fp_exptmod(dh_pub_them, dh_priv, &dh_p, ses.dh_K) != FP_OKAY) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	593 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	594 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	595
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	596 /* clear no longer needed vars */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	597 m_fp_zero_multi(&dh_p, NULL);
26 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 /* 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	600 * not vice-versaing for client/server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	601 if (IS_DROPBEAR_CLIENT) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	602 dh_e = dh_pub_us;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	603 dh_f = dh_pub_them;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	604 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	605 dh_e = dh_pub_them;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	606 dh_f = dh_pub_us;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	607 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	608
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	609 /* 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	610 /* K_S, the host key */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	611 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	612 /* e, exchange value sent by the client */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	613 buf_putfpint(ses.kexhashbuf, dh_e);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	614 /* f, exchange value sent by the server */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	615 buf_putfpint(ses.kexhashbuf, dh_f);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	616 /* K, the shared secret */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	617 buf_putfpint(ses.kexhashbuf, ses.dh_K);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	618
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	619 /* calculate the hash H to sign */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	620 sha1_init(&hs);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	621 buf_setpos(ses.kexhashbuf, 0);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	622 sha1_process(&hs, buf_getptr(ses.kexhashbuf, ses.kexhashbuf->len),
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	623 ses.kexhashbuf->len);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	624 sha1_done(&hs, ses.hash);
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	625
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	626 buf_burn(ses.kexhashbuf);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	627 buf_free(ses.kexhashbuf);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	628 ses.kexhashbuf = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	629
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	630 /* first time around, we set the session_id to H */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	631 if (ses.session_id == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	632 /* create the session_id, this never needs freeing */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	633 ses.session_id = (unsigned char*)m_malloc(SHA1_HASH_SIZE);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	634 memcpy(ses.session_id, ses.hash, SHA1_HASH_SIZE);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	635 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	636 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	637
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	638 /* 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	639 * algos for the client or server. */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	640 static void read_kex_algos() {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	641
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	642 /* for asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	643 algo_type * c2s_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	644 algo_type * s2c_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	645 algo_type * c2s_cipher_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	646 algo_type * s2c_cipher_algo = NULL;
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	647 algo_type * c2s_comp_algo = NULL;
33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	648 algo_type * s2c_comp_algo = NULL;
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	649 /* the generic one */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	650 algo_type * algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	651
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	652 /* which algo couldn't match */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	653 char * erralgo = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	654
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	655 int goodguess = 0;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	656 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	657 true after */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	658
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	659 buf_incrpos(ses.payload, 16); /* start after the cookie */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	660
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	661 ses.newkeys = (struct key_context*)m_malloc(sizeof(struct key_context));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	662
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	663 /* kex_algorithms */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	664 algo = ses.buf_match_algo(ses.payload, sshkex, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	665 allgood &= goodguess;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	666 if (algo == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	667 erralgo = "kex";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	668 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	669 }
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	670 TRACE(("kex algo %s", algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	671 ses.newkeys->algo_kex = algo->val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	672
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	673 /* server_host_key_algorithms */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	674 algo = ses.buf_match_algo(ses.payload, sshhostkey, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	675 allgood &= goodguess;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	676 if (algo == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	677 erralgo = "hostkey";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	678 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	679 }
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	680 TRACE(("hostkey algo %s", algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	681 ses.newkeys->algo_hostkey = algo->val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	682
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	683 /* encryption_algorithms_client_to_server */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	684 c2s_cipher_algo = ses.buf_match_algo(ses.payload, sshciphers, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	685 if (c2s_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	686 erralgo = "enc c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	687 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	688 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	689 TRACE(("enc c2s is %s", c2s_cipher_algo->name))
26 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 /* encryption_algorithms_server_to_client */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	692 s2c_cipher_algo = ses.buf_match_algo(ses.payload, sshciphers, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	693 if (s2c_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	694 erralgo = "enc s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	695 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	696 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	697 TRACE(("enc s2c is %s", s2c_cipher_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	698
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	699 /* mac_algorithms_client_to_server */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	700 c2s_hash_algo = ses.buf_match_algo(ses.payload, sshhashes, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	701 if (c2s_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	702 erralgo = "mac c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	703 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	704 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	705 TRACE(("hash c2s is %s", c2s_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	706
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	707 /* mac_algorithms_server_to_client */
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	708 s2c_hash_algo = ses.buf_match_algo(ses.payload, sshhashes, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	709 if (s2c_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	710 erralgo = "mac s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	711 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	712 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	713 TRACE(("hash s2c is %s", s2c_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	714
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	715 /* compression_algorithms_client_to_server */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	716 c2s_comp_algo = ses.buf_match_algo(ses.payload, ses.compress_algos, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	717 if (c2s_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	718 erralgo = "comp c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	719 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	720 }
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	721 TRACE(("hash c2s is %s", c2s_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	722
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	723 /* compression_algorithms_server_to_client */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	724 s2c_comp_algo = ses.buf_match_algo(ses.payload, ses.compress_algos, &goodguess);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	725 if (s2c_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	726 erralgo = "comp s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	727 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	728 }
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	729 TRACE(("hash s2c is %s", s2c_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	730
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	731 /* languages_client_to_server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	732 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	733
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	734 /* languages_server_to_client */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	735 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	736
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	737 /* 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	738 if (buf_getbool(ses.payload)) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	739 ses.kexstate.firstfollows = 1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	740 /* 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	741 if (!allgood) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	742 ses.ignorenext = 1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	743 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	744 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	745
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	746 /* Handle the asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	747 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	748 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	749 (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	750 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	751 (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	752 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	753 (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	754 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	755 (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	756 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	757 (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	758 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	759 (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	760 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	761 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	762 } else {
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	763 /* SERVER */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	764 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	765 (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	766 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	767 (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	768 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	769 (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	770 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	771 (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	772 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	773 (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	774 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	775 (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	776 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	777 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	778 }
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	779
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	780 /* reserved for future extensions */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	781 buf_getint(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	782 return;
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 error:
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	785 dropbear_exit("No matching algo %s", erralgo);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	786 }

Mercurial > dropbear

annotate common-kex.c @ 642:33fd2f3499d2 dropbear-tfm