dropbear: cli-kex.c annotate

annotate cli-kex.c @ 835:4095b6d7c9fc ecc

Merge in changes from the past couple of releases

author	Matt Johnston <matt@ucc.asn.au>
date	Fri, 18 Oct 2013 21:38:01 +0800
parents	7dcb46da72d9
children	f4bb964c8678 6c69e7df3621

rev	line source
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
74 e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 59 diff changeset	4 * Copyright (c) 2002-2004 Matt Johnston
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 59 diff changeset	5 * Copyright (c) 2004 by Mihnea Stoenescu
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 * All rights reserved.
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 *
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * Permission is hereby granted, free of charge, to any person obtaining a copy
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * of this software and associated documentation files (the "Software"), to deal
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * in the Software without restriction, including without limitation the rights
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * copies of the Software, and to permit persons to whom the Software is
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 * furnished to do so, subject to the following conditions:
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 *
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * The above copyright notice and this permission notice shall be included in
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 * all copies or substantial portions of the Software.
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 *
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
0969767bca0d snapshot of stuff 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
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 * SOFTWARE. */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "includes.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "session.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "dbutil.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "algo.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "buffer.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "session.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #include "kex.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "ssh.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "packet.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #include "bignum.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 #include "random.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 #include "runopts.h"
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	38 #include "signkey.h"
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	39 #include "ecc.h"
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	42 static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	43 #define MAX_KNOWNHOSTS_LINE 4500
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 void send_msg_kexdh_init() {
739 d44325108d0e first_kex_packet_follows working, needs tidying Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	46 TRACE(("send_msg_kexdh_init()"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 CHECKCLEARTOWRITE();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 buf_putbyte(ses.writepayload, SSH_MSG_KEXDH_INIT);
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	50 if (IS_NORMAL_DH(ses.newkeys->algo_kex)) {
801 7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	51 if (ses.newkeys->algo_kex != cli_ses.param_kex_algo
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	52 \|\| !cli_ses.dh_param) {
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	53 if (cli_ses.dh_param) {
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	54 free_kexdh_param(cli_ses.dh_param);
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	55 }
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	56 cli_ses.dh_param = gen_kexdh_param();
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	57 }
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	58 buf_putmpint(ses.writepayload, &cli_ses.dh_param->pub);
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	59 } else {
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	60 #ifdef DROPBEAR_ECDH
801 7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	61 if (ses.newkeys->algo_kex != cli_ses.param_kex_algo
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	62 \|\| !cli_ses.ecdh_param) {
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	63 if (cli_ses.ecdh_param) {
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	64 free_kexecdh_param(cli_ses.ecdh_param);
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	65 }
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	66 cli_ses.ecdh_param = gen_kexecdh_param();
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	67 }
765 5503e05ab3a4 - Rename buf_put_ecc_pubkey_string() to buf_put_ecc_raw_pubkey_string() Matt Johnston <matt@ucc.asn.au> parents: 761 diff changeset	68 buf_put_ecc_raw_pubkey_string(ses.writepayload, &cli_ses.ecdh_param->key);
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	69 #endif
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	70 }
801 7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	71 cli_ses.param_kex_algo = ses.newkeys->algo_kex;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 encrypt_packet();
775 2f1c199b6e4b requirenext fixup for firstkexfollows Matt Johnston <matt@ucc.asn.au> parents: 773 diff changeset	73 ses.requirenext[0] = SSH_MSG_KEXDH_REPLY;
2f1c199b6e4b requirenext fixup for firstkexfollows Matt Johnston <matt@ucc.asn.au> parents: 773 diff changeset	74 ses.requirenext[1] = SSH_MSG_KEXINIT;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 /* Handle a diffie-hellman key exchange reply. */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 void recv_msg_kexdh_reply() {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80 sign_key *hostkey = NULL;
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	81 unsigned int type, keybloblen;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	82 unsigned char* keyblob = NULL;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	83
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	84 TRACE(("enter recv_msg_kexdh_reply"))
84 29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 80 diff changeset	85
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 80 diff changeset	86 if (cli_ses.kex_state != KEXDH_INIT_SENT) {
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 80 diff changeset	87 dropbear_exit("Received out-of-order kexdhreply");
29a5c7c62350 default initialisers for mp_ints Matt Johnston <matt@ucc.asn.au> parents: 80 diff changeset	88 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 type = ses.newkeys->algo_hostkey;
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	90 TRACE(("type is %d", type))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 hostkey = new_sign_key();
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	93 keybloblen = buf_getint(ses.payload);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	94
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	95 keyblob = buf_getptr(ses.payload, keybloblen);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	96 if (!ses.kexstate.donefirstkex) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	97 /* Only makes sense the first time */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	98 checkhostkey(keyblob, keybloblen);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	99 }
34 e2a1eaa19f22 Client mostly works up to password auth Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	100
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 if (buf_get_pub_key(ses.payload, hostkey, &type) != DROPBEAR_SUCCESS) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	102 TRACE(("failed getting pubkey"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 dropbear_exit("Bad KEX packet");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	106 if (IS_NORMAL_DH(ses.newkeys->algo_kex)) {
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	107 // Normal diffie-hellman
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	108 DEF_MP_INT(dh_f);
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	109 m_mp_init(&dh_f);
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	110 if (buf_getmpint(ses.payload, &dh_f) != DROPBEAR_SUCCESS) {
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	111 TRACE(("failed getting mpint"))
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	112 dropbear_exit("Bad KEX packet");
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	113 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	115 kexdh_comb_key(cli_ses.dh_param, &dh_f, hostkey);
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	116 mp_clear(&dh_f);
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	117 } else {
b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	118 #ifdef DROPBEAR_ECDH
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 756 diff changeset	119 buffer *ecdh_qs = buf_getstringbuf(ses.payload);
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 759 diff changeset	120 kexecdh_comb_key(cli_ses.ecdh_param, ecdh_qs, hostkey);
759 76fba0856749 More changes for KEX and ECDH. Set up hash descriptors, make ECC code work, Matt Johnston <matt@ucc.asn.au> parents: 756 diff changeset	121 buf_free(ecdh_qs);
755 b07eb3dc23ec refactor kexdh code a bit, start working on ecdh etc Matt Johnston <matt@ucc.asn.au> parents: 723 diff changeset	122 #endif
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124
801 7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	125 if (cli_ses.dh_param) {
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	126 free_kexdh_param(cli_ses.dh_param);
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	127 cli_ses.dh_param = NULL;
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	128 }
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	129 #ifdef DROPBEAR_ECDH
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	130 if (cli_ses.ecdh_param) {
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	131 free_kexecdh_param(cli_ses.ecdh_param);
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	132 cli_ses.ecdh_param = NULL;
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	133 }
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	134 #endif
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135
801 7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	136 cli_ses.param_kex_algo = NULL;
7dcb46da72d9 merge in HEAD Matt Johnston <matt@ucc.asn.au> parents: 765 775 diff changeset	137 if (buf_verify(ses.payload, hostkey, ses.hash) != DROPBEAR_SUCCESS) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 dropbear_exit("Bad hostkey signature");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 sign_key_free(hostkey);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 hostkey = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 send_msg_newkeys();
775 2f1c199b6e4b requirenext fixup for firstkexfollows Matt Johnston <matt@ucc.asn.au> parents: 773 diff changeset	145 ses.requirenext[0] = SSH_MSG_NEWKEYS;
2f1c199b6e4b requirenext fixup for firstkexfollows Matt Johnston <matt@ucc.asn.au> parents: 773 diff changeset	146 ses.requirenext[1] = 0;
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	147 TRACE(("leave recv_msg_kexdh_init"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 }
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	149
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	150 static void ask_to_confirm(unsigned char* keyblob, unsigned int keybloblen) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	151
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	152 char* fp = NULL;
170 a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	153 FILE *tty = NULL;
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	154 char response = 'z';
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	155
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	156 fp = sign_key_fingerprint(keyblob, keybloblen);
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	157 if (cli_opts.always_accept_key) {
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	158 fprintf(stderr, "\nHost '%s' key accepted unconditionally.\n(fingerprint %s)\n",
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	159 cli_opts.remotehost,
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	160 fp);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	161 m_free(fp);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	162 return;
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	163 }
440 91939c8c2572 Remove a newline from the kex prompt question, from FreeWRT Matt Johnston <matt@ucc.asn.au> parents: 436 diff changeset	164 fprintf(stderr, "\nHost '%s' is not in the trusted hosts file.\n(fingerprint %s)\nDo you want to continue connecting? (y/n) ",
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	165 cli_opts.remotehost,
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	166 fp);
340 454a34b2dfd1 Fixes from Erik Hovland: Matt Johnston <matt@ucc.asn.au> parents: 322 diff changeset	167 m_free(fp);
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	168
170 a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	169 tty = fopen(_PATH_TTY, "r");
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	170 if (tty) {
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	171 response = getc(tty);
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	172 fclose(tty);
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	173 } else {
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	174 response = getc(stdin);
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	175 }
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	176
a62cb364f615 Read "y/n" response for fingerprints from /dev/tty directly so that dbclient Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	177 if (response == 'y') {
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	178 return;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	179 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	180
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	181 dropbear_exit("Didn't validate host key");
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	182 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	183
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	184 static FILE* open_known_hosts_file(int * readonly)
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	185 {
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	186 FILE * hostsfile = NULL;
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	187 char * filename = NULL;
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	188 char * homedir = NULL;
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	189
322 84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	190 homedir = getenv("HOME");
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	191
322 84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	192 if (!homedir) {
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	193 struct passwd * pw = NULL;
322 84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	194 pw = getpwuid(getuid());
84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	195 if (pw) {
84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	196 homedir = pw->pw_dir;
84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	197 }
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	198 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	199
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	200 if (homedir) {
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	201 unsigned int len;
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	202 len = strlen(homedir);
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	203 filename = m_malloc(len + 18); /* "/.ssh/known_hosts" and null-terminator*/
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	204
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	205 snprintf(filename, len+18, "%s/.ssh", homedir);
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	206 /* Check that ~/.ssh exists - easiest way is just to mkdir */
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	207 if (mkdir(filename, S_IRWXU) != 0) {
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	208 if (errno != EEXIST) {
322 84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	209 dropbear_log(LOG_INFO, "Warning: failed creating %s/.ssh: %s",
84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	210 homedir, strerror(errno));
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	211 TRACE(("mkdir didn't work: %s", strerror(errno)))
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	212 goto out;
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	213 }
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	214 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	215
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	216 snprintf(filename, len+18, "%s/.ssh/known_hosts", homedir);
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	217 hostsfile = fopen(filename, "a+");
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	218
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	219 if (hostsfile != NULL) {
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	220 *readonly = 0;
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	221 fseek(hostsfile, 0, SEEK_SET);
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	222 } else {
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	223 /* We mightn't have been able to open it if it was read-only */
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	224 if (errno == EACCES \|\| errno == EROFS) {
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	225 TRACE(("trying readonly: %s", strerror(errno)))
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	226 *readonly = 1;
318 9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	227 hostsfile = fopen(filename, "r");
9916350d7d8b don't fail fatally if the client can't get homedir from getpwuid(), fallback Matt Johnston <matt@ucc.asn.au> parents: 170 diff changeset	228 }
106 e13f8a712a1c Fix if the first write fails Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	229 }
59 bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	230 }
bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	231
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	232 if (hostsfile == NULL) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	233 TRACE(("hostsfile didn't open: %s", strerror(errno)))
322 84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	234 dropbear_log(LOG_WARNING, "Failed to open %s/.ssh/known_hosts",
84aa4e60bd3c Look at HOME before /etc/passwd when looking for ~/.ssh/known_hosts Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	235 homedir);
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	236 goto out;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	237 }
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	238
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	239 out:
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	240 m_free(filename);
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	241 return hostsfile;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	242 }
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	243
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	244 static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen) {
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	245
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	246 FILE *hostsfile = NULL;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	247 int readonly = 0;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	248 unsigned int hostlen, algolen;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	249 unsigned long len;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	250 const char *algoname = NULL;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	251 char * fingerprint = NULL;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	252 buffer * line = NULL;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	253 int ret;
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	254
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	255 if (cli_opts.no_hostkey_check) {
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	256 fprintf(stderr, "Caution, skipping hostkey check for %s\n", cli_opts.remotehost);
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	257 return;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	258 }
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	259
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	260 hostsfile = open_known_hosts_file(&readonly);
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	261 if (!hostsfile) {
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	262 ask_to_confirm(keyblob, keybloblen);
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	263 /* ask_to_confirm will exit upon failure */
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	264 return;
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	265 }
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	266
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	267 line = buf_new(MAX_KNOWNHOSTS_LINE);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	268 hostlen = strlen(cli_opts.remotehost);
59 bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	269 algoname = signkey_name_from_type(ses.newkeys->algo_hostkey, &algolen);
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	270
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	271 do {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	272 if (buf_getline(line, hostsfile) == DROPBEAR_FAILURE) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	273 TRACE(("failed reading line: prob EOF"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	274 break;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	275 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	276
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	277 /* The line is too short to be sensible */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	278 /* "30" is 'enough to hold ssh-dss plus the spaces, ie so we don't
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	279 * buf_getfoo() past the end and die horribly - the base64 parsing
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	280 * code is what tiptoes up to the end nicely */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	281 if (line->len < (hostlen+30) ) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	282 TRACE(("line is too short to be sensible"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	283 continue;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	284 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	285
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	286 /* Compare hostnames */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	287 if (strncmp(cli_opts.remotehost, buf_getptr(line, hostlen),
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	288 hostlen) != 0) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	289 continue;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	290 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	291
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	292 buf_incrpos(line, hostlen);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	293 if (buf_getbyte(line) != ' ') {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	294 /* there wasn't a space after the hostname, something dodgy */
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	295 TRACE(("missing space afte matching hostname"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	296 continue;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	297 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	298
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	299 if (strncmp(buf_getptr(line, algolen), algoname, algolen) != 0) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	300 TRACE(("algo doesn't match"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	301 continue;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	302 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	303
59 bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	304 buf_incrpos(line, algolen);
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	305 if (buf_getbyte(line) != ' ') {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	306 TRACE(("missing space after algo"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	307 continue;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	308 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	309
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	310 /* Now we're at the interesting hostkey */
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	311 ret = cmp_base64_key(keyblob, keybloblen, algoname, algolen,
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	312 line, &fingerprint);
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	313
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	314 if (ret == DROPBEAR_SUCCESS) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	315 /* Good matching key */
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	316 TRACE(("good matching key"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	317 goto out;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	318 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	319
436 7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	320 /* The keys didn't match. eep. Note that we're "leaking"
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	321 the fingerprint strings here, but we're exiting anyway */
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	322 dropbear_exit("\n\nHost key mismatch for %s !\n"
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	323 "Fingerprint is %s\n"
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	324 "Expected %s\n"
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	325 "If you know that the host key is correct you can\nremove the bad entry from ~/.ssh/known_hosts",
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	326 cli_opts.remotehost,
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	327 sign_key_fingerprint(keyblob, keybloblen),
7282370416a0 Improve known_hosts checking. Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	328 fingerprint ? fingerprint : "UNKNOWN");
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	329 } while (1); /* keep going 'til something happens */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	330
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	331 /* Key doesn't exist yet */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	332 ask_to_confirm(keyblob, keybloblen);
59 bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	333
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	334 /* If we get here, they said yes */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	335
59 bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	336 if (readonly) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 106 diff changeset	337 TRACE(("readonly"))
59 bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	338 goto out;
bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	339 }
bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	340
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	341 if (!cli_opts.always_accept_key) {
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	342 /* put the new entry in the file */
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	343 fseek(hostsfile, 0, SEEK_END); /* In case it wasn't opened append */
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	344 buf_setpos(line, 0);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	345 buf_setlen(line, 0);
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 544 diff changeset	346 buf_putbytes(line, cli_opts.remotehost, hostlen);
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	347 buf_putbyte(line, ' ');
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	348 buf_putbytes(line, algoname, algolen);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	349 buf_putbyte(line, ' ');
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	350 len = line->size - line->pos;
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	351 /* The only failure with base64 is buffer_overflow, but buf_getwriteptr
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	352 * will die horribly in the case anyway */
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	353 base64_encode(keyblob, keybloblen, buf_getwriteptr(line, len), &len);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	354 buf_incrwritepos(line, len);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	355 buf_putbyte(line, '\n');
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	356 buf_setpos(line, 0);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	357 fwrite(buf_getptr(line, line->len), line->len, 1, hostsfile);
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	358 /* We ignore errors, since there's not much we can do about them */
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 340 diff changeset	359 }
59 bdc97a5719f4 add new entries to known_hosts Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	360
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	361 out:
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	362 if (hostsfile != NULL) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	363 fclose(hostsfile);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	364 }
79 5a55bd66707f - don't crash when trying to add to known_hosts if it doesn't exist Matt Johnston <matt@ucc.asn.au> parents: 74 diff changeset	365 if (line != NULL) {
5a55bd66707f - don't crash when trying to add to known_hosts if it doesn't exist Matt Johnston <matt@ucc.asn.au> parents: 74 diff changeset	366 buf_free(line);
5a55bd66707f - don't crash when trying to add to known_hosts if it doesn't exist Matt Johnston <matt@ucc.asn.au> parents: 74 diff changeset	367 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 440 diff changeset	368 m_free(fingerprint);
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	369 }

Mercurial > dropbear

annotate cli-kex.c @ 835:4095b6d7c9fc ecc