dropbear: common-kex.c annotate

annotate common-kex.c @ 1617:1fbe598a14fb

Merge bugfix delay invalid users

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 23 Aug 2018 23:43:45 +0800
parents	0bdbb9ecc403
children	d32bcb5c557d

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"
1224 82e2037d34ea Move dh group constants to a separate file Matt Johnston <matt@ucc.asn.au> parents: 1175 diff changeset	32 #include "dh_groups.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "ssh.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "packet.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #include "bignum.h"
858 220f55d540ae rename random.h to dbrandom.h since some OSes have a system random.h Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	36 #include "dbrandom.h"
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	37 #include "runopts.h"
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	38 #include "ecc.h"
766 d1575fdc29a6 start on ecdsa keys Matt Johnston <matt@ucc.asn.au> parents: 765 diff changeset	39 #include "crypto_desc.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1251 diff changeset	41 static void kexinitialise(void);
9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1251 diff changeset	42 static void gen_new_keys(void);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 #ifndef DISABLE_ZLIB
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1251 diff changeset	44 static void gen_new_zstream_recv(void);
9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1251 diff changeset	45 static void gen_new_zstream_trans(void);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 #endif
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1251 diff changeset	47 static void read_kex_algos(void);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 /* helper function for gen_new_keys */
762 a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	49 static void hashkeys(unsigned char *out, unsigned int outlen,
a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	50 const hash_state * hs, const unsigned char X);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 /* Send our list of algorithms we can use */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 void send_msg_kexinit() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 buf_putbyte(ses.writepayload, SSH_MSG_KEXINIT);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 /* cookie */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 genrandom(buf_getwriteptr(ses.writepayload, 16), 16);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 buf_incrwritepos(ses.writepayload, 16);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 /* kex algos */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 buf_put_algolist(ses.writepayload, sshkex);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 /* server_host_key_algorithms */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 buf_put_algolist(ses.writepayload, sshhostkey);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68
683 63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	69 /* encryption_algorithms_client_to_server */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	70 buf_put_algolist(ses.writepayload, sshciphers);
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	71
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	72 /* encryption_algorithms_server_to_client */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	73 buf_put_algolist(ses.writepayload, sshciphers);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74
683 63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	75 /* mac_algorithms_client_to_server */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	76 buf_put_algolist(ses.writepayload, sshhashes);
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	77
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	78 /* mac_algorithms_server_to_client */
63f8d6c469cf ENABLE_USER_ALGO_LIST should work for the client Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	79 buf_put_algolist(ses.writepayload, sshhashes);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 /* compression_algorithms_client_to_server */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	83 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	84
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 /* compression_algorithms_server_to_client */
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	86 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	87
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 /* languages_client_to_server */
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1108 diff changeset	89 buf_putstring(ses.writepayload, "", 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 /* languages_server_to_client */
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1108 diff changeset	92 buf_putstring(ses.writepayload, "", 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	94 /* first_kex_packet_follows */
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	95 buf_putbyte(ses.writepayload, (ses.send_kex_first_guess != NULL));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 /* reserved unit32 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 buf_putint(ses.writepayload, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 /* set up transmitted kex packet buffer for hashing.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 * 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	102 ses.transkexinit = buf_newcopy(ses.writepayload);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 encrypt_packet();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 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	106
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	107 ses.kexstate.sentkexinit = 1;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	108
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	109 ses.newkeys = (struct key_context*)m_malloc(sizeof(struct key_context));
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	110
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	111 if (ses.send_kex_first_guess) {
801 7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 793 781 diff changeset	112 ses.newkeys->algo_kex = sshkex[0].data;
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	113 ses.newkeys->algo_hostkey = sshhostkey[0].val;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	114 ses.send_kex_first_guess();
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	115 }
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	116
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	117 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	118 TRACE(("-> KEXINIT"))
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	119
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121
771 a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	122 static void switch_keys() {
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	123 TRACE2(("enter switch_keys"))
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	124 if (!(ses.kexstate.sentkexinit && ses.kexstate.recvkexinit)) {
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	125 dropbear_exit("Unexpected newkeys message");
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	126 }
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	127
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	128 if (!ses.keys) {
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	129 ses.keys = m_malloc(sizeof(*ses.newkeys));
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	130 }
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	131 if (ses.kexstate.recvnewkeys && ses.newkeys->recv.valid) {
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	132 TRACE(("switch_keys recv"))
781 f110d321fe7a Fix build when zlib is disabled, from Matt Johnston <matt@ucc.asn.au> parents: 775 diff changeset	133 #ifndef DISABLE_ZLIB
771 a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	134 gen_new_zstream_recv();
781 f110d321fe7a Fix build when zlib is disabled, from Matt Johnston <matt@ucc.asn.au> parents: 775 diff changeset	135 #endif
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	136 ses.keys->recv = ses.newkeys->recv;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	137 m_burn(&ses.newkeys->recv, sizeof(ses.newkeys->recv));
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	138 ses.newkeys->recv.valid = 0;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	139 }
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	140 if (ses.kexstate.sentnewkeys && ses.newkeys->trans.valid) {
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	141 TRACE(("switch_keys trans"))
781 f110d321fe7a Fix build when zlib is disabled, from Matt Johnston <matt@ucc.asn.au> parents: 775 diff changeset	142 #ifndef DISABLE_ZLIB
771 a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	143 gen_new_zstream_trans();
781 f110d321fe7a Fix build when zlib is disabled, from Matt Johnston <matt@ucc.asn.au> parents: 775 diff changeset	144 #endif
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	145 ses.keys->trans = ses.newkeys->trans;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	146 m_burn(&ses.newkeys->trans, sizeof(ses.newkeys->trans));
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	147 ses.newkeys->trans.valid = 0;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	148 }
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	149 if (ses.kexstate.sentnewkeys && ses.kexstate.recvnewkeys)
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	150 {
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	151 TRACE(("switch_keys done"))
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	152 ses.keys->algo_kex = ses.newkeys->algo_kex;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	153 ses.keys->algo_hostkey = ses.newkeys->algo_hostkey;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	154 ses.keys->allow_compress = 0;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	155 m_free(ses.newkeys);
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	156 ses.newkeys = NULL;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	157 kexinitialise();
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	158 }
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	159 TRACE2(("leave switch_keys"))
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	160 }
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 /* 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	163 void send_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164
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	165 TRACE(("enter send_msg_newkeys"))
4 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 /* generate the kexinit request */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 CHECKCLEARTOWRITE();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 buf_putbyte(ses.writepayload, SSH_MSG_NEWKEYS);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 encrypt_packet();
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	171
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 /* set up our state */
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	174 ses.kexstate.sentnewkeys = 1;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	175 ses.kexstate.donefirstkex = 1;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	176 ses.dataallowed = 1; /* we can send other packets again now */
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	177 gen_new_keys();
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	178 switch_keys();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179
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	180 TRACE(("leave send_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 /* 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	184 void recv_msg_newkeys() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185
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	186 TRACE(("enter recv_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	188 ses.kexstate.recvnewkeys = 1;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	189 switch_keys();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	191 TRACE(("leave recv_msg_newkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	195 /* Set up the kex for the first time */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	196 void kexfirstinitialise() {
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	197 ses.kexstate.donefirstkex = 0;
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	198
996 47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	199 #ifdef DISABLE_ZLIB
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	200 ses.compress_algos = ssh_nocompress;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	201 #else
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	202 switch (opts.compress_mode)
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	203 {
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	204 case DROPBEAR_COMPRESS_DELAYED:
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	205 ses.compress_algos = ssh_delaycompress;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	206 break;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	207
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	208 case DROPBEAR_COMPRESS_ON:
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	209 ses.compress_algos = ssh_compress;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	210 break;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	211
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	212 case DROPBEAR_COMPRESS_OFF:
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	213 ses.compress_algos = ssh_nocompress;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	214 break;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 987 diff changeset	215 }
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 555 diff changeset	216 #endif
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	217 kexinitialise();
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	218 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	219
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	220 /* Reset the kex state, ready for a new negotiation */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	221 static void kexinitialise() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222
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	223 TRACE(("kexinitialise()"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 /* sent/recv'd MSG_KEXINIT */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 ses.kexstate.sentkexinit = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227 ses.kexstate.recvkexinit = 0;
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_NEWKEYS */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 ses.kexstate.recvnewkeys = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 ses.kexstate.sentnewkeys = 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 /* first_packet_follows */
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	234 ses.kexstate.them_firstfollows = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 ses.kexstate.datatrans = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237 ses.kexstate.datarecv = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	239 ses.kexstate.our_first_follows_matches = 0;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	240
928 7cd89d4e0335 Add new monotonic_now() wrapper so that timeouts are unaffected by Matt Johnston <matt@ucc.asn.au> parents: 907 diff changeset	241 ses.kexstate.lastkextime = monotonic_now();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245 /* 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	246 * 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	247 * 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	248 * out must have at least min(SHA1_HASH_SIZE, outlen) bytes allocated.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249 *
409 0e69e948caba Add comments about requiring keysize <= 2SHA1_HASH_SIZE Matt Johnston <matt@ucc.asn.au>* parents: 257 diff changeset	250 * See Section 7.2 of rfc4253 (ssh transport) for details */
762 a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	251 static void hashkeys(unsigned char *out, unsigned int outlen,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 const hash_state * hs, const unsigned char X) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	254 const struct ltc_hash_descriptor *hash_desc = ses.newkeys->algo_kex->hash_desc;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 hash_state hs2;
762 a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	256 unsigned int offset;
855 04ede40a529a - Some fixes for old compilers like tru64 v4 from Daniel Richard G. Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	257 unsigned char tmpout[MAX_HASH_SIZE];
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 memcpy(&hs2, hs, sizeof(hash_state));
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	260 hash_desc->process(&hs2, &X, 1);
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	261 hash_desc->process(&hs2, ses.session_id->data, ses.session_id->len);
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	262 hash_desc->done(&hs2, tmpout);
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	263 memcpy(out, tmpout, MIN(hash_desc->hashsize, outlen));
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	264 for (offset = hash_desc->hashsize;
679 03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	265 offset < outlen;
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	266 offset += hash_desc->hashsize)
679 03073a27abb3 - Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be Matt Johnston <matt@ucc.asn.au> parents: 648 diff changeset	267 {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 /* need to extend */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 memcpy(&hs2, hs, sizeof(hash_state));
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	270 hash_desc->process(&hs2, out, offset);
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	271 hash_desc->done(&hs2, tmpout);
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	272 memcpy(&out[offset], tmpout, MIN(outlen - offset, hash_desc->hashsize));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 }
987 ed85797bbc85 clear hash state memory after use Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	274 m_burn(&hs2, sizeof(hash_state));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	275 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	276
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 /* 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	278 * 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	279 * This occurs after the DH key-exchange.
4 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 * 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	282 * 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	283
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	284 static void gen_new_keys() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 unsigned char C2S_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 unsigned char C2S_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 unsigned char S2C_IV[MAX_IV_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289 unsigned char S2C_key[MAX_KEY_LEN];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	290 /* unsigned char key[MAX_KEY_LEN]; */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291 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	292
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	293 hash_state hs;
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	294 const struct ltc_hash_descriptor *hash_desc = ses.newkeys->algo_kex->hash_desc;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295 char mactransletter, macrecvletter; /* Client or server specific */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296
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	297 TRACE(("enter gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298 /* 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	299
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	300 hash_desc->init(&hs);
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	301 hash_process_mp(hash_desc, &hs, ses.dh_K);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 mp_clear(ses.dh_K);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 m_free(ses.dh_K);
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	304 hash_desc->process(&hs, ses.hash->data, ses.hash->len);
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	305 buf_burn(ses.hash);
ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	306 buf_free(ses.hash);
ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	307 ses.hash = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 if (IS_DROPBEAR_CLIENT) {
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	310 trans_IV = C2S_IV;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	311 recv_IV = S2C_IV;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	312 trans_key = C2S_key;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	313 recv_key = S2C_key;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 mactransletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 macrecvletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 } else {
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	317 trans_IV = S2C_IV;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	318 recv_IV = C2S_IV;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	319 trans_key = S2C_key;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	320 recv_key = C2S_key;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 mactransletter = 'F';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 macrecvletter = 'E';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324
762 a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	325 hashkeys(C2S_IV, sizeof(C2S_IV), &hs, 'A');
a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	326 hashkeys(S2C_IV, sizeof(S2C_IV), &hs, 'B');
a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	327 hashkeys(C2S_key, sizeof(C2S_key), &hs, 'C');
a78a38e402d1 - Fix various hardcoded uses of SHA1 Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	328 hashkeys(S2C_key, sizeof(S2C_key), &hs, 'D');
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	330 if (ses.newkeys->recv.algo_crypt->cipherdesc != NULL) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	331 int recv_cipher = find_cipher(ses.newkeys->recv.algo_crypt->cipherdesc->name);
512 0129fd8ccc71 Update nocrypto branch to current head Matt Johnston <matt@ucc.asn.au> parents: 511 diff changeset	332 if (recv_cipher < 0)
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	333 dropbear_exit("Crypto error");
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	334 if (ses.newkeys->recv.crypt_mode->start(recv_cipher,
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	335 recv_IV, recv_key,
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	336 ses.newkeys->recv.algo_crypt->keysize, 0,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	337 &ses.newkeys->recv.cipher_state) != CRYPT_OK) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	338 dropbear_exit("Crypto error");
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	339 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	340 }
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	341
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	342 if (ses.newkeys->trans.algo_crypt->cipherdesc != NULL) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	343 int trans_cipher = find_cipher(ses.newkeys->trans.algo_crypt->cipherdesc->name);
512 0129fd8ccc71 Update nocrypto branch to current head Matt Johnston <matt@ucc.asn.au> parents: 511 diff changeset	344 if (trans_cipher < 0)
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	345 dropbear_exit("Crypto error");
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	346 if (ses.newkeys->trans.crypt_mode->start(trans_cipher,
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	347 trans_IV, trans_key,
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	348 ses.newkeys->trans.algo_crypt->keysize, 0,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	349 &ses.newkeys->trans.cipher_state) != CRYPT_OK) {
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	350 dropbear_exit("Crypto error");
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	351 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	352 }
512 0129fd8ccc71 Update nocrypto branch to current head Matt Johnston <matt@ucc.asn.au> parents: 511 diff changeset	353
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	354 if (ses.newkeys->trans.algo_mac->hash_desc != NULL) {
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	355 hashkeys(ses.newkeys->trans.mackey,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	356 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter);
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	357 ses.newkeys->trans.hash_index = find_hash(ses.newkeys->trans.algo_mac->hash_desc->name);
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	358 }
712 bf0ac0512ef7 Fix "-m none" case and ugly typo Matt Johnston <matt@ucc.asn.au> parents: 684 diff changeset	359
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	360 if (ses.newkeys->recv.algo_mac->hash_desc != NULL) {
681 a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	361 hashkeys(ses.newkeys->recv.mackey,
a4b7627b3157 Update insecure-nocrypto to current head Matt Johnston <matt@ucc.asn.au> parents: 679 512 diff changeset	362 ses.newkeys->recv.algo_mac->keysize, &hs, macrecvletter);
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	363 ses.newkeys->recv.hash_index = find_hash(ses.newkeys->recv.algo_mac->hash_desc->name);
252 29afa62b5450 - a hack for grahame to run dropbear with "none" cipher. Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	364 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365
753 d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	366 /* Ready to switch over */
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	367 ses.newkeys->trans.valid = 1;
d63ef1e211ea Take transmit and receive keys into use separately Matt Johnston <matt@ucc.asn.au> parents: 746 diff changeset	368 ses.newkeys->recv.valid = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369
648 4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	370 m_burn(C2S_IV, sizeof(C2S_IV));
4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	371 m_burn(C2S_key, sizeof(C2S_key));
4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	372 m_burn(S2C_IV, sizeof(S2C_IV));
4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	373 m_burn(S2C_key, sizeof(S2C_key));
987 ed85797bbc85 clear hash state memory after use Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	374 m_burn(&hs, sizeof(hash_state));
648 4222a1039b06 Clear a few buffers when possible Matt Johnston <matt@ucc.asn.au> parents: 603 diff changeset	375
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	376 TRACE(("leave gen_new_keys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 #ifndef DISABLE_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	380
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	381 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	382 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	383 \|\| (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	384 && 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	385 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	386
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	387 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	388 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	389 \|\| (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	390 && 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	391 }
d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	392
1365 9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	393 static void* dropbear_zalloc(void* UNUSED(opaque), uInt items, uInt size) {
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	394 return m_calloc(items, size);
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	395 }
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	396
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	397 static void dropbear_zfree(void* UNUSED(opaque), void* ptr) {
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	398 m_free(ptr);
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	399 }
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	400
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	401 /* 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	402 * called from gen_new_keys() */
771 a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	403 static void gen_new_zstream_recv() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405 /* 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	406 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	407 \|\| 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	408 ses.newkeys->recv.zstream = (z_streamp)m_malloc(sizeof(z_stream));
1365 9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	409 ses.newkeys->recv.zstream->zalloc = dropbear_zalloc;
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	410 ses.newkeys->recv.zstream->zfree = dropbear_zfree;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	412 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	413 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	416 ses.newkeys->recv.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 }
771 a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	418 /* clean up old keys */
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	419 if (ses.keys->recv.zstream != NULL) {
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	420 if (inflateEnd(ses.keys->recv.zstream) == Z_STREAM_ERROR) {
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	421 /* Z_DATA_ERROR is ok, just means that stream isn't ended */
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	422 dropbear_exit("Crypto error");
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	423 }
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	424 m_free(ses.keys->recv.zstream);
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	425 }
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	426 }
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	427
a389a2a7aa96 Fix zlib for split newkeys Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	428 static void gen_new_zstream_trans() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	430 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	431 \|\| 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	432 ses.newkeys->trans.zstream = (z_streamp)m_malloc(sizeof(z_stream));
1365 9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	433 ses.newkeys->trans.zstream->zalloc = dropbear_zalloc;
9aa6cd66b51d zlib can use m_malloc/m_free too Matt Johnston <matt@ucc.asn.au> parents: 1358 diff changeset	434 ses.newkeys->trans.zstream->zfree = dropbear_zfree;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435
555 daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	436 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	437 Z_DEFLATED, DROPBEAR_ZLIB_WINDOW_BITS,
daf52f813328 - Add option to change zlib windowBits/memLevel Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	438 DROPBEAR_ZLIB_MEM_LEVEL, Z_DEFAULT_STRATEGY)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 != Z_OK) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 dropbear_exit("zlib error");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 } else {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	443 ses.newkeys->trans.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	445
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	446 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	447 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	448 /* 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	449 dropbear_exit("Crypto error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	451 m_free(ses.keys->trans.zstream);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453 }
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	454 #endif /* DISABLE_ZLIB */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455
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 /* 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	458 * 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	459 * 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	460 * 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	461 * 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	462 * initiate the diffie-hellman key exchange */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	463 void recv_msg_kexinit() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	464
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	465 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	466 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	467 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	468
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	469 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	470 TRACE(("enter recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	471
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	472 if (!ses.kexstate.sentkexinit) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	473 /* we need to send a kex packet */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474 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	475 TRACE(("continue recv_msg_kexinit: sent kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	478 /* 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	479 local_ident_len = strlen(LOCAL_IDENT);
1108 2ebf450edc2d Turn sshsession's remoteident attribute into char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	480 remote_ident_len = strlen(ses.remoteident);
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	481
63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	482 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	483 + 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	484 + 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	485
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.kexhashbuf = buf_new(kexhashbuf_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	487
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	488 if (IS_DROPBEAR_CLIENT) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	489
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	490 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	491 read_kex_algos();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	492
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	493 /* V_C, the client's version string (CR and NL excluded) */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	494 buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	495 /* V_S, the server's version string (CR and NL excluded) */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	496 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	497
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	498 /* I_C, the payload of the client's SSH_MSG_KEXINIT */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	499 buf_putstring(ses.kexhashbuf,
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1108 diff changeset	500 (const char*)ses.transkexinit->data, ses.transkexinit->len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	501 /* I_S, the payload of the server's SSH_MSG_KEXINIT */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	502 buf_setpos(ses.payload, ses.payload_beginning);
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	503 buf_putstring(ses.kexhashbuf,
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	504 (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	505 ses.payload->len-ses.payload->pos);
886 cbc73a5aefb0 requirenext doesn't need two values Matt Johnston <matt@ucc.asn.au> parents: 885 diff changeset	506 ses.requirenext = SSH_MSG_KEXDH_REPLY;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	507 } else {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	508 /* SERVER */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	509
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	510 /* read the peer's choice of algos */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	511 read_kex_algos();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	512 /* V_C, the client's version string (CR and NL excluded) */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	513 buf_putstring(ses.kexhashbuf, ses.remoteident, remote_ident_len);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	514 /* V_S, the server's version string (CR and NL excluded) */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	515 buf_putstring(ses.kexhashbuf, LOCAL_IDENT, local_ident_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	516
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	517 /* I_C, the payload of the client's SSH_MSG_KEXINIT */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	518 buf_setpos(ses.payload, ses.payload_beginning);
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	519 buf_putstring(ses.kexhashbuf,
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	520 (const char*)buf_getptr(ses.payload, ses.payload->len-ses.payload->pos),
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	521 ses.payload->len-ses.payload->pos);
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	522
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	523 /* I_S, the payload of the server's SSH_MSG_KEXINIT */
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1175 diff changeset	524 buf_putstring(ses.kexhashbuf,
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1108 diff changeset	525 (const char*)ses.transkexinit->data, ses.transkexinit->len);
257 63601217f5ab * options.h, common-kex.c: fix support of 4096 byte host keys Matt Johnston <matt@ucc.asn.au> parents: 228 diff changeset	526
886 cbc73a5aefb0 requirenext doesn't need two values Matt Johnston <matt@ucc.asn.au> parents: 885 diff changeset	527 ses.requirenext = SSH_MSG_KEXDH_INIT;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530 buf_free(ses.transkexinit);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	531 ses.transkexinit = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	532 /* 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	533
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	534 ses.kexstate.recvkexinit = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	535
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	536 TRACE(("leave recv_msg_kexinit"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	539 static void load_dh_p(mp_int * dh_p)
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	540 {
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	541 bytes_to_mp(dh_p, ses.newkeys->algo_kex->dh_p_bytes,
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	542 ses.newkeys->algo_kex->dh_p_len);
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	543 }
2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	544
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	545 /* 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	546 * 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	547 /* dh_pub and dh_priv MUST be already initialised */
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	548 struct kex_dh_param *gen_kexdh_param() {
855 04ede40a529a - Some fixes for old compilers like tru64 v4 from Daniel Richard G. Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	549 struct kex_dh_param *param = NULL;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	550
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	551 DEF_MP_INT(dh_p);
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	552 DEF_MP_INT(dh_q);
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 79 diff changeset	553 DEF_MP_INT(dh_g);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	554
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	555 TRACE(("enter gen_kexdh_vals"))
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	556
855 04ede40a529a - Some fixes for old compilers like tru64 v4 from Daniel Richard G. Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	557 param = m_malloc(sizeof(*param));
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 848 diff changeset	558 m_mp_init_multi(&param->pub, &param->priv, &dh_g, &dh_p, &dh_q, NULL);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	559
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	560 /* read the prime and generator*/
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	561 load_dh_p(&dh_p);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	562
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	563 if (mp_set_int(&dh_g, DH_G_VAL) != MP_OKAY) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	564 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	565 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	566
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	567 /* calculate q = (p-1)/2 */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	568 /* dh_priv is just a temp var here */
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	569 if (mp_sub_d(&dh_p, 1, &param->priv) != MP_OKAY) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	570 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	571 }
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	572 if (mp_div_2(&param->priv, &dh_q) != MP_OKAY) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	573 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	574 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	575
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	576 /* Generate a private portion 0 < dh_priv < dh_q */
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	577 gen_random_mpint(&dh_q, &param->priv);
26 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 /* f = g^y mod p */
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	580 if (mp_exptmod(&dh_g, &param->priv, &dh_p, &param->pub) != MP_OKAY) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	581 dropbear_exit("Diffie-Hellman error");
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 mp_clear_multi(&dh_g, &dh_p, &dh_q, NULL);
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	584 return param;
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	585 }
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	586
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	587 void free_kexdh_param(struct kex_dh_param *param)
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	588 {
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	589 mp_clear_multi(&param->pub, &param->priv, NULL);
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	590 m_free(param);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	591 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	592
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	593 /* 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	594 * of dh_e/dh_f etc. Hence these arguments:
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	595 * 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	596 * vice-versa. dh_priv is the x/y value corresponding to dh_pub_us */
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	597 void kexdh_comb_key(struct kex_dh_param param, mp_int dh_pub_them,
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	598 sign_key *hostkey) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	599
1013 a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	600 DEF_MP_INT(dh_p);
a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	601 DEF_MP_INT(dh_p_min1);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	602 mp_int dh_e = NULL, dh_f = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	603
1013 a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	604 m_mp_init_multi(&dh_p, &dh_p_min1, NULL);
595 2895626d864f Add diffie-hellman-group14-sha1 KEX method Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	605 load_dh_p(&dh_p);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	606
1013 a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	607 if (mp_sub_d(&dh_p, 1, &dh_p_min1) != MP_OKAY) {
a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	608 dropbear_exit("Diffie-Hellman error");
a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	609 }
a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	610
a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	611 /* Check that dh_pub_them (dh_e or dh_f) is in the range [2, p-2] */
a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	612 if (mp_cmp(dh_pub_them, &dh_p_min1) != MP_LT
a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	613 \|\| mp_cmp_d(dh_pub_them, 1) != MP_GT) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	614 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	615 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	616
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	617 /* K = e^y mod p = f^x mod p */
805 724c3e0c8734 Add m_mp_alloc_init_multi() helper Matt Johnston <matt@ucc.asn.au> parents: 801 diff changeset	618 m_mp_alloc_init_multi(&ses.dh_K, NULL);
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	619 if (mp_exptmod(dh_pub_them, &param->priv, &dh_p, ses.dh_K) != MP_OKAY) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	620 dropbear_exit("Diffie-Hellman error");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	621 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	622
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	623 /* clear no longer needed vars */
1013 a1e79ffa5862 Tighten validation of DH values. Odds of x==0 being generated are Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	624 mp_clear_multi(&dh_p, &dh_p_min1, NULL);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	625
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	626 /* 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	627 * not vice-versaing for client/server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	628 if (IS_DROPBEAR_CLIENT) {
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	629 dh_e = &param->pub;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	630 dh_f = dh_pub_them;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	631 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	632 dh_e = dh_pub_them;
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	633 dh_f = &param->pub;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	634 }
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 /* 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	637 /* K_S, the host key */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	638 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	639 /* e, exchange value sent by the client */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	640 buf_putmpint(ses.kexhashbuf, dh_e);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	641 /* f, exchange value sent by the server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	642 buf_putmpint(ses.kexhashbuf, dh_f);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	643 /* K, the shared secret */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	644 buf_putmpint(ses.kexhashbuf, ses.dh_K);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	645
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	646 /* calculate the hash H to sign */
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	647 finish_kexhashbuf();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	648 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	649
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	650 #if DROPBEAR_ECDH
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	651 struct kex_ecdh_param *gen_kexecdh_param() {
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	652 struct kex_ecdh_param param = m_malloc(sizeof(param));
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	653 if (ecc_make_key_ex(NULL, dropbear_ltc_prng,
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	654 &param->key, ses.newkeys->algo_kex->ecc_curve->dp) != CRYPT_OK) {
76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	655 dropbear_exit("ECC error");
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	656 }
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	657 return param;
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	658 }
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	659
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	660 void free_kexecdh_param(struct kex_ecdh_param *param) {
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	661 ecc_free(&param->key);
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	662 m_free(param);
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	663
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	664 }
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	665 void kexecdh_comb_key(struct kex_ecdh_param param, buffer pub_them,
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	666 sign_key *hostkey) {
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	667 const struct dropbear_kex *algo_kex = ses.newkeys->algo_kex;
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 855 diff changeset	668 /* public keys from client and server */
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	669 ecc_key Q_C, Q_S, *Q_them;
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	670
765 5503e05ab3a4 - Rename buf_put_ecc_pubkey_string() to buf_put_ecc_raw_pubkey_string() Matt Johnston <matt@ucc.asn.au> parents: 763 diff changeset	671 Q_them = buf_get_ecc_raw_pubkey(pub_them, algo_kex->ecc_curve);
1128 a9e074b78cd5 check ecc key return, fix null pointer crash Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	672 if (Q_them == NULL) {
a9e074b78cd5 check ecc key return, fix null pointer crash Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	673 dropbear_exit("ECC error");
a9e074b78cd5 check ecc key return, fix null pointer crash Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	674 }
757 230666086711 ecc key import function Matt Johnston <matt@ucc.asn.au> parents: 756 diff changeset	675
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	676 ses.dh_K = dropbear_ecc_shared_secret(Q_them, &param->key);
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	677
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	678 /* Create the remainder of the hash buffer, to generate the exchange hash
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	679 See RFC5656 section 4 page 7 */
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	680 if (IS_DROPBEAR_CLIENT) {
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	681 Q_C = &param->key;
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	682 Q_S = Q_them;
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	683 } else {
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	684 Q_C = Q_them;
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	685 Q_S = &param->key;
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	686 }
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	687
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	688 /* K_S, the host key */
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	689 buf_put_pub_key(ses.kexhashbuf, hostkey, ses.newkeys->algo_hostkey);
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	690 /* Q_C, client's ephemeral public key octet string */
765 5503e05ab3a4 - Rename buf_put_ecc_pubkey_string() to buf_put_ecc_raw_pubkey_string() Matt Johnston <matt@ucc.asn.au> parents: 763 diff changeset	691 buf_put_ecc_raw_pubkey_string(ses.kexhashbuf, Q_C);
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 757 diff changeset	692 /* Q_S, server's ephemeral public key octet string */
765 5503e05ab3a4 - Rename buf_put_ecc_pubkey_string() to buf_put_ecc_raw_pubkey_string() Matt Johnston <matt@ucc.asn.au> parents: 763 diff changeset	693 buf_put_ecc_raw_pubkey_string(ses.kexhashbuf, Q_S);
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	694 /* K, the shared secret */
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	695 buf_putmpint(ses.kexhashbuf, ses.dh_K);
bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	696
1607 0bdbb9ecc403 avoid leak of ecdh public key Matt Johnston <matt@ucc.asn.au> parents: 1558 diff changeset	697 ecc_free(Q_them);
0bdbb9ecc403 avoid leak of ecdh public key Matt Johnston <matt@ucc.asn.au> parents: 1558 diff changeset	698 m_free(Q_them);
0bdbb9ecc403 avoid leak of ecdh public key Matt Johnston <matt@ucc.asn.au> parents: 1558 diff changeset	699
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	700 /* calculate the hash H to sign */
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	701 finish_kexhashbuf();
ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	702 }
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	703 #endif /* DROPBEAR_ECDH */
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	704
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	705 #if DROPBEAR_CURVE25519
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	706 struct kex_curve25519_param *gen_kexcurve25519_param () {
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	707 /* Per http://cr.yp.to/ecdh.html */
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	708 struct kex_curve25519_param param = m_malloc(sizeof(param));
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	709 const unsigned char basepoint[32] = {9};
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	710
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	711 genrandom(param->priv, CURVE25519_LEN);
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	712 param->priv[0] &= 248;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	713 param->priv[31] &= 127;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	714 param->priv[31] \|= 64;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	715
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	716 curve25519_donna(param->pub, param->priv, basepoint);
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	717
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	718 return param;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	719 }
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	720
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	721 void free_kexcurve25519_param(struct kex_curve25519_param *param)
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	722 {
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	723 m_burn(param->priv, CURVE25519_LEN);
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	724 m_free(param);
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	725 }
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	726
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1402 diff changeset	727 void kexcurve25519_comb_key(const struct kex_curve25519_param param, const buffer buf_pub_them,
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	728 sign_key *hostkey) {
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 848 diff changeset	729 unsigned char out[CURVE25519_LEN];
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	730 const unsigned char* Q_C = NULL;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	731 const unsigned char* Q_S = NULL;
1175 1b8afc698e39 check for zero K value from curve25519 Matt Johnston <matt@ucc.asn.au> parents: 1128 diff changeset	732 char zeroes[CURVE25519_LEN] = {0};
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	733
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	734 if (buf_pub_them->len != CURVE25519_LEN)
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	735 {
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	736 dropbear_exit("Bad curve25519");
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	737 }
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	738
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	739 curve25519_donna(out, param->priv, buf_pub_them->data);
1175 1b8afc698e39 check for zero K value from curve25519 Matt Johnston <matt@ucc.asn.au> parents: 1128 diff changeset	740
1b8afc698e39 check for zero K value from curve25519 Matt Johnston <matt@ucc.asn.au> parents: 1128 diff changeset	741 if (constant_time_memcmp(zeroes, out, CURVE25519_LEN) == 0) {
1b8afc698e39 check for zero K value from curve25519 Matt Johnston <matt@ucc.asn.au> parents: 1128 diff changeset	742 dropbear_exit("Bad curve25519");
1b8afc698e39 check for zero K value from curve25519 Matt Johnston <matt@ucc.asn.au> parents: 1128 diff changeset	743 }
1b8afc698e39 check for zero K value from curve25519 Matt Johnston <matt@ucc.asn.au> parents: 1128 diff changeset	744
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 848 diff changeset	745 m_mp_alloc_init_multi(&ses.dh_K, NULL);
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	746 bytes_to_mp(ses.dh_K, out, CURVE25519_LEN);
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 848 diff changeset	747 m_burn(out, sizeof(out));
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	748
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	749 /* Create the remainder of the hash buffer, to generate the exchange hash.
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	750 See RFC5656 section 4 page 7 */
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	751 if (IS_DROPBEAR_CLIENT) {
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	752 Q_C = param->pub;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	753 Q_S = buf_pub_them->data;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	754 } else {
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	755 Q_S = param->pub;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	756 Q_C = buf_pub_them->data;
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	757 }
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	758
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	759 /* K_S, the host key */
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	760 buf_put_pub_key(ses.kexhashbuf, hostkey, ses.newkeys->algo_hostkey);
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	761 /* Q_C, client's ephemeral public key octet string */
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1108 diff changeset	762 buf_putstring(ses.kexhashbuf, (const char*)Q_C, CURVE25519_LEN);
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	763 /* Q_S, server's ephemeral public key octet string */
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1108 diff changeset	764 buf_putstring(ses.kexhashbuf, (const char*)Q_S, CURVE25519_LEN);
848 6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	765 /* K, the shared secret */
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	766 buf_putmpint(ses.kexhashbuf, ses.dh_K);
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	767
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	768 /* calculate the hash H to sign */
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	769 finish_kexhashbuf();
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	770 }
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	771 #endif /* DROPBEAR_CURVE25519 */
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	772
6c69e7df3621 curve25519 Matt Johnston <matt@ucc.asn.au> parents: 805 diff changeset	773
1456 a90fdd2d2ed8 add fuzzer-preauth_nomaths Matt Johnston <matt@ucc.asn.au> parents: 1411 diff changeset	774 void finish_kexhashbuf(void) {
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	775 hash_state hs;
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	776 const struct ltc_hash_descriptor *hash_desc = ses.newkeys->algo_kex->hash_desc;
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	777
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	778 hash_desc->init(&hs);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	779 buf_setpos(ses.kexhashbuf, 0);
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	780 hash_desc->process(&hs, buf_getptr(ses.kexhashbuf, ses.kexhashbuf->len),
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	781 ses.kexhashbuf->len);
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	782 ses.hash = buf_new(hash_desc->hashsize);
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	783 hash_desc->done(&hs, buf_getwriteptr(ses.hash, hash_desc->hashsize));
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 766 diff changeset	784 buf_setlen(ses.hash, hash_desc->hashsize);
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	785
1402 553c6bb80265 fix DEBUG_* condition Francois Perrad <francois.perrad@gadz.org> parents: 1295 diff changeset	786 #if defined(DEBUG_KEXHASH) && DEBUG_TRACE
907 4a74c58e11fc Make some debug info conditional Matt Johnston <matt@ucc.asn.au> parents: 886 diff changeset	787 if (!debug_trace) {
4a74c58e11fc Make some debug info conditional Matt Johnston <matt@ucc.asn.au> parents: 886 diff changeset	788 printhex("kexhashbuf", ses.kexhashbuf->data, ses.kexhashbuf->len);
4a74c58e11fc Make some debug info conditional Matt Johnston <matt@ucc.asn.au> parents: 886 diff changeset	789 printhex("kexhash", ses.hash->data, ses.hash->len);
4a74c58e11fc Make some debug info conditional Matt Johnston <matt@ucc.asn.au> parents: 886 diff changeset	790 }
883 ff597bf2cfb0 DROPBEAR_CLI_AUTH_IMMEDIATE fixed, now enabled by default Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	791 #endif
ff597bf2cfb0 DROPBEAR_CLI_AUTH_IMMEDIATE fixed, now enabled by default Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	792
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	793 buf_burn(ses.kexhashbuf);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	794 buf_free(ses.kexhashbuf);
987 ed85797bbc85 clear hash state memory after use Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	795 m_burn(&hs, sizeof(hash_state));
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	796 ses.kexhashbuf = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	797
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	798 /* first time around, we set the session_id to H */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	799 if (ses.session_id == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	800 /* create the session_id, this never needs freeing */
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	801 ses.session_id = buf_newcopy(ses.hash);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	802 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	803 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	804
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	805 /* 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	806 * algos for the client or server. */
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	807 static void read_kex_algos() {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	808
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	809 /* for asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	810 algo_type * c2s_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	811 algo_type * s2c_hash_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	812 algo_type * c2s_cipher_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	813 algo_type * s2c_cipher_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	814 algo_type * c2s_comp_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	815 algo_type * s2c_comp_algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	816 /* the generic one */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	817 algo_type * algo = NULL;
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	818
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	819 /* which algo couldn't match */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	820 char * erralgo = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	821
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	822 int goodguess = 0;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	823 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	824 true after */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	825
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	826 #if DROPBEAR_KEXGUESS2
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	827 enum kexguess2_used kexguess2 = KEXGUESS2_LOOK;
746 465fefc4f6e0 Put some #ifdef options around first-follows options in case they Matt Johnston <matt@ucc.asn.au> parents: 741 diff changeset	828 #else
465fefc4f6e0 Put some #ifdef options around first-follows options in case they Matt Johnston <matt@ucc.asn.au> parents: 741 diff changeset	829 enum kexguess2_used kexguess2 = KEXGUESS2_NO;
465fefc4f6e0 Put some #ifdef options around first-follows options in case they Matt Johnston <matt@ucc.asn.au> parents: 741 diff changeset	830 #endif
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	831
855 04ede40a529a - Some fixes for old compilers like tru64 v4 from Daniel Richard G. Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	832 buf_incrpos(ses.payload, 16); /* start after the cookie */
04ede40a529a - Some fixes for old compilers like tru64 v4 from Daniel Richard G. Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	833
04ede40a529a - Some fixes for old compilers like tru64 v4 from Daniel Richard G. Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	834 memset(ses.newkeys, 0x0, sizeof(*ses.newkeys));
04ede40a529a - Some fixes for old compilers like tru64 v4 from Daniel Richard G. Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	835
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	836 /* kex_algorithms */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	837 algo = buf_match_algo(ses.payload, sshkex, &kexguess2, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	838 allgood &= goodguess;
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	839 if (algo == NULL \|\| algo->val == KEXGUESS2_ALGO_ID) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	840 erralgo = "kex";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	841 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	842 }
740 3062da90dab8 Add kexguess2 behaviour Matt Johnston <matt@ucc.asn.au> parents: 739 diff changeset	843 TRACE(("kexguess2 %d", kexguess2))
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 116 diff changeset	844 TRACE(("kex algo %s", algo->name))
756 bf9dc2d9c2b1 more bits on ecc branch Matt Johnston <matt@ucc.asn.au> parents: 755 diff changeset	845 ses.newkeys->algo_kex = algo->data;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	846
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	847 /* server_host_key_algorithms */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	848 algo = buf_match_algo(ses.payload, sshhostkey, &kexguess2, &goodguess);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	849 allgood &= goodguess;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	850 if (algo == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	851 erralgo = "hostkey";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	852 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	853 }
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	854 TRACE(("hostkey algo %s", algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	855 ses.newkeys->algo_hostkey = algo->val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	856
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	857 /* encryption_algorithms_client_to_server */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	858 c2s_cipher_algo = buf_match_algo(ses.payload, sshciphers, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	859 if (c2s_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	860 erralgo = "enc c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	861 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	862 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	863 TRACE(("enc c2s is %s", c2s_cipher_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	864
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	865 /* encryption_algorithms_server_to_client */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	866 s2c_cipher_algo = buf_match_algo(ses.payload, sshciphers, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	867 if (s2c_cipher_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	868 erralgo = "enc s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	869 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	870 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	871 TRACE(("enc s2c is %s", s2c_cipher_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	872
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	873 /* mac_algorithms_client_to_server */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	874 c2s_hash_algo = buf_match_algo(ses.payload, sshhashes, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	875 if (c2s_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	876 erralgo = "mac c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	877 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	878 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	879 TRACE(("hash c2s is %s", c2s_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	880
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	881 /* mac_algorithms_server_to_client */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	882 s2c_hash_algo = buf_match_algo(ses.payload, sshhashes, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	883 if (s2c_hash_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	884 erralgo = "mac s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	885 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	886 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	887 TRACE(("hash s2c is %s", s2c_hash_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	888
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	889 /* compression_algorithms_client_to_server */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	890 c2s_comp_algo = buf_match_algo(ses.payload, ses.compress_algos, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	891 if (c2s_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	892 erralgo = "comp c->s";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	893 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	894 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	895 TRACE(("hash c2s is %s", c2s_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	896
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	897 /* compression_algorithms_server_to_client */
741 eafdf8b363f5 Get rid of client/server specific buf_match_algo, use single Matt Johnston <matt@ucc.asn.au> parents: 740 diff changeset	898 s2c_comp_algo = buf_match_algo(ses.payload, ses.compress_algos, NULL, NULL);
116 2010f4119c1a Check for non-matching algos properly Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	899 if (s2c_comp_algo == NULL) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	900 erralgo = "comp s->c";
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	901 goto error;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	902 }
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	903 TRACE(("hash s2c is %s", s2c_comp_algo->name))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	904
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	905 /* languages_client_to_server */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	906 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	907
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	908 /* languages_server_to_client */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	909 buf_eatstring(ses.payload);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	910
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	911 /* their first_kex_packet_follows */
179 161557a9dde8 * fix longstanding bug with connections being closed on failure to Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	912 if (buf_getbool(ses.payload)) {
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	913 TRACE(("them kex firstfollows. allgood %d", allgood))
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	914 ses.kexstate.them_firstfollows = 1;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	915 /* 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	916 if (!allgood) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	917 ses.ignorenext = 1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	918 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	919 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	920
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	921 /* Handle the asymmetry */
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	922 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	923 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	924 (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	925 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	926 (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	927 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	928 (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	929 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	930 (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	931 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	932 (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	933 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	934 (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	935 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	936 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	937 } else {
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	938 /* SERVER */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	939 ses.newkeys->recv.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	940 (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	941 ses.newkeys->trans.algo_crypt =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	942 (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	943 ses.newkeys->recv.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	944 (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	945 ses.newkeys->trans.crypt_mode =
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	946 (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	947 ses.newkeys->recv.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	948 (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	949 ses.newkeys->trans.algo_mac =
36 a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	950 (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	951 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	952 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	953 }
a600c015562d Handle differing c2s and s2c algorithms properly Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	954
1558 2f64cb3d3007 - #if not #ifdef for DROPBEAR_FUZZ Matt Johnston <matt@ucc.asn.au> parents: 1511 diff changeset	955 #if DROPBEAR_FUZZ
1357 08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1355 diff changeset	956 if (fuzz.fuzzing) {
08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1355 diff changeset	957 fuzz_kex_fakealgos();
08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1355 diff changeset	958 }
1347 b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	959 #endif
b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	960
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	961 /* reserved for future extensions */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	962 buf_getint(ses.payload);
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	963
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	964 if (ses.send_kex_first_guess && allgood) {
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	965 TRACE(("our_first_follows_matches 1"))
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	966 ses.kexstate.our_first_follows_matches = 1;
d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 712 diff changeset	967 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	968 return;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	969
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	970 error:
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	971 dropbear_exit("No matching algo %s", erralgo);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	972 }

Mercurial > dropbear

annotate common-kex.c @ 1617:1fbe598a14fb