dropbear: dss.c annotate

annotate dss.c @ 642:33fd2f3499d2 dropbear-tfm

A few build fixes

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

rev	line source
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * All rights reserved.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * 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	8 * 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	9 * 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	10 * 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	11 * 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	12 * 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	13 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * 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	15 * all copies or substantial portions of the Software.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * 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	18 * 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	19 * 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	20 * 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	21 * 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	22 * 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	23 * SOFTWARE. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "dbutil.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "bignum.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "dss.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 "ssh.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "random.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 /* Handle DSS (Digital Signature Standard), aka DSA (D.S. Algorithm),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 * operations, such as key reading, signing, verification. Key generation
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 * is in gendss.c, since it isn't required in the server itself.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 * See FIPS186 or the Handbook of Applied Cryptography for details of the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 * algorithm */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 #ifdef DROPBEAR_DSS
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 /* Load a dss key from a buffer, initialising the values.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 * The key will have the same format as buf_put_dss_key.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 * These should be freed with dss_key_free.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 * Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	46 int buf_get_dss_pub_key(buffer* buf, dropbear_dss_key *key) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	48 TRACE(("enter buf_get_dss_pub_key"))
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	49 dropbear_assert(key != NULL);
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	50 key->p = m_malloc(sizeof(fp_int));
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	51 key->q = m_malloc(sizeof(fp_int));
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	52 key->g = m_malloc(sizeof(fp_int));
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	53 key->y = m_malloc(sizeof(fp_int));
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	54 m_fp_init_multi(key->p, key->q, key->g, key->y, NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 key->x = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 buf_incrpos(buf, 4+SSH_SIGNKEY_DSS_LEN); /* int + "ssh-dss" */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	58 if (buf_getfpint(buf, key->p) == DROPBEAR_FAILURE
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	59 \|\| buf_getfpint(buf, key->q) == DROPBEAR_FAILURE
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	60 \|\| buf_getfpint(buf, key->g) == DROPBEAR_FAILURE
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	61 \|\| buf_getfpint(buf, key->y) == DROPBEAR_FAILURE) {
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	62 TRACE(("leave buf_get_dss_pub_key: failed reading fpints"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	66 if (fp_count_bits(key->p) < MIN_DSS_KEYLEN) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 dropbear_log(LOG_WARNING, "DSS key too short");
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	68 TRACE(("leave buf_get_dss_pub_key: short key"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	72 TRACE(("leave buf_get_dss_pub_key: success"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 return DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 /* Same as buf_get_dss_pub_key, but reads a private "x" key at the end.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 * Loads a private dss key from a buffer
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 * Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	79 int buf_get_dss_priv_key(buffer* buf, dropbear_dss_key *key) {
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 int ret = DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	83 dropbear_assert(key != NULL);
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 ret = buf_get_dss_pub_key(buf, key);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 if (ret == DROPBEAR_FAILURE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	90 key->x = m_malloc(sizeof(fp_int));
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	91 m_fp_init(key->x);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	92 ret = buf_getfpint(buf, key->x);
368 ed910547d449 Free x component of DSS key upon failure to load Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	93 if (ret == DROPBEAR_FAILURE) {
ed910547d449 Free x component of DSS key upon failure to load Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	94 m_free(key->x);
ed910547d449 Free x component of DSS key upon failure to load Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	95 }
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 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 /* Clear and free the memory used by a public or private key */
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	102 void dss_key_free(dropbear_dss_key *key) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	104 TRACE(("enter dsa_key_free"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 if (key == 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: 150 diff changeset	106 TRACE(("enter dsa_key_free: key == NULL"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 return;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 if (key->p) {
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	110 fp_zero(key->p);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 m_free(key->p);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 if (key->q) {
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	114 fp_zero(key->q);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 m_free(key->q);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 if (key->g) {
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	118 fp_zero(key->g);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 m_free(key->g);
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 if (key->y) {
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	122 fp_zero(key->y);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 m_free(key->y);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 if (key->x) {
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	126 fp_zero(key->x);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 m_free(key->x);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 m_free(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: 150 diff changeset	130 TRACE(("leave dsa_key_free"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 /* put the dss public key into the buffer in the required format:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 * string "ssh-dss"
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	136 * fpint p
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	137 * fpint q
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	138 * fpint g
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	139 * fpint y
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 */
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	141 void buf_put_dss_pub_key(buffer* buf, dropbear_dss_key *key) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	143 dropbear_assert(key != NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 buf_putstring(buf, SSH_SIGNKEY_DSS, SSH_SIGNKEY_DSS_LEN);
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	145 buf_putfpint(buf, key->p);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	146 buf_putfpint(buf, key->q);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	147 buf_putfpint(buf, key->g);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	148 buf_putfpint(buf, key->y);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 /* Same as buf_put_dss_pub_key, but with the private "x" key appended */
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	153 void buf_put_dss_priv_key(buffer* buf, dropbear_dss_key *key) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	155 dropbear_assert(key != NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156 buf_put_dss_pub_key(buf, key);
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	157 buf_putfpint(buf, key->x);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 #ifdef DROPBEAR_SIGNKEY_VERIFY
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 /* Verify a DSS signature (in buf) made on data by the key given.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 * returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	164 int buf_dss_verify(buffer* buf, dropbear_dss_key key, const unsigned char data,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 unsigned int len) {
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 unsigned char msghash[SHA1_HASH_SIZE];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 hash_state hs;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 int ret = DROPBEAR_FAILURE;
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	170 DEF_FP_INT(val1);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	171 DEF_FP_INT(val2);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	172 DEF_FP_INT(val3);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	173 DEF_FP_INT(val4);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 char * string = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 int stringlen;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	177 TRACE(("enter buf_dss_verify"))
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	178 dropbear_assert(key != NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	180 m_fp_init_multi(&val1, &val2, &val3, &val4, NULL);
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	181
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 /* get blob, check length */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 string = buf_getstring(buf, &stringlen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 if (stringlen != 2*SHA1_HASH_SIZE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 /* hash the data */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189 sha1_init(&hs);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 sha1_process(&hs, data, len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 sha1_done(&hs, msghash);
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 /* create the signature - s' and r' are the received signatures in buf */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 /* w = (s')-1 mod q */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 /* let val1 = s' */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	196 bytes_to_fp(&val1, &string[SHA1_HASH_SIZE], SHA1_HASH_SIZE);
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 186 diff changeset	197
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	198 if (fp_cmp(&val1, key->q) != FP_LT) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	199 TRACE(("verify failed, s' >= q"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 /* let val2 = w = (s')^-1 mod q*/
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	203 if (fp_invmod(&val1, key->q, &val2) != FP_OKAY) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 /* u1 = ((SHA(M')w) mod q */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 /* let val1 = SHA(M') = msghash */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	209 bytes_to_fp(&val1, msghash, SHA1_HASH_SIZE);
188 c9483550701b - refactored random mp_int generation and byte->mp_int code Matt Johnston <matt@ucc.asn.au> parents: 186 diff changeset	210
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 /* let val3 = u1 = ((SHA(M')w) mod q */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	212 if (fp_mulmod(&val1, &val2, key->q, &val3) != FP_OKAY) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 /* u2 = ((r')w) mod q */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 /* let val1 = r' */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	218 bytes_to_fp(&val1, &string[0], SHA1_HASH_SIZE);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	219 if (fp_cmp(&val1, key->q) != FP_LT) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	220 TRACE(("verify failed, r' >= q"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223 /* let val4 = u2 = ((r')w) mod q */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	224 if (fp_mulmod(&val1, &val2, key->q, &val4) != FP_OKAY) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 /* v = (((g)^u1 (y)^u2) mod p) mod q */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 /* val2 = g^u1 mod p */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	230 if (fp_exptmod(key->g, &val3, key->p, &val2) != FP_OKAY) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 goto out;
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 /* val3 = y^u2 mod p */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	234 if (fp_exptmod(key->y, &val4, key->p, &val3) != FP_OKAY) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237 /* val4 = ((g)^u1 (y)^u2) mod p */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	238 if (fp_mulmod(&val2, &val3, key->p, &val4) != FP_OKAY) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 /* val2 = v = (((g)^u1 (y)^u2) mod p) mod q */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	242 if (fp_mod(&val4, key->q, &val2) != FP_OKAY) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246 /* check whether signatures verify */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	247 if (fp_cmp(&val2, &val1) == FP_EQ) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248 /* good sig */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249 ret = DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 out:
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	253 m_fp_zero_multi(&val1, &val2, &val3, &val4, NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254 m_free(string);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 #endif /* DROPBEAR_SIGNKEY_VERIFY */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260
179 161557a9dde8 * fix longstanding bug with connections being closed on failure to Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	261 #ifdef DSS_PROTOK
150 82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	262 /* convert an unsigned mp into an array of bytes, malloced.
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	263 * This array must be freed after use, len contains the length of the array,
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	264 * if len != NULL */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	265 static unsigned char* fptobytes(fp_int mp, int len) {
150 82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	266
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	267 unsigned char* ret;
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	268 int size;
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	269
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	270 size = fp_unsigned_bin_size(mp);
150 82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	271 ret = m_malloc(size);
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	272 fp_to_unsigned_bin(mp, ret);
150 82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	273 if (len != NULL) {
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	274 *len = size;
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	275 }
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	276 return ret;
82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	277 }
179 161557a9dde8 * fix longstanding bug with connections being closed on failure to Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	278 #endif
150 82fcf3185616 Cleaning out various dead wood found with -dead_strip Matt Johnston <matt@ucc.asn.au> parents: 84 diff changeset	279
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280 /* Sign the data presented with key, writing the signature contents
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 * to the buffer
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283 * When DSS_PROTOK is #defined:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 * The alternate k generation method is based on the method used in PuTTY.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 * In particular to avoid being vulnerable to attacks using flaws in random
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 * generation of k, we use the following:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 * proto_k = SHA512 ( SHA512(x) \|\| SHA160(message) )
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289 * k = proto_k mod q
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	290 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291 * Now we aren't relying on the random number generation to protect the private
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 * key x, which is a long term secret */
642 33fd2f3499d2 A few build fixes Matt Johnston <matt@ucc.asn.au> parents: 641 diff changeset	293 void buf_put_dss_sign(buffer* buf, dropbear_dss_key key, const unsigned char data,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294 unsigned int len) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296 unsigned char msghash[SHA1_HASH_SIZE];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297 unsigned int writelen;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298 unsigned int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299 #ifdef DSS_PROTOK
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300 unsigned char privkeyhash[SHA512_HASH_SIZE];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301 unsigned char *privkeytmp;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 unsigned char proto_k[SHA512_HASH_SIZE];
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	303 DEF_FP_INT(dss_protok);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304 #endif
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	305 DEF_FP_INT(dss_k);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	306 DEF_FP_INT(dss_m);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	307 DEF_FP_INT(dss_temp1);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	308 DEF_FP_INT(dss_temp2);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	309 DEF_FP_INT(dss_r);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	310 DEF_FP_INT(dss_s);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 hash_state hs;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	312
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	313 TRACE(("enter buf_put_dss_sign"))
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	314 dropbear_assert(key != NULL);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 /* hash the data */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 sha1_init(&hs);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 sha1_process(&hs, data, len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 sha1_done(&hs, msghash);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	321 m_fp_init_multi(&dss_k, &dss_temp1, &dss_temp2, &dss_r, &dss_s,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 &dss_m, NULL);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 #ifdef DSS_PROTOK
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 /* hash the privkey */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	325 privkeytmp = fptobytes(key->x, &i);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 sha512_init(&hs);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 sha512_process(&hs, "the quick brown fox jumped over the lazy dog", 44);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 sha512_process(&hs, privkeytmp, i);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 sha512_done(&hs, privkeyhash);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 m_burn(privkeytmp, i);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 m_free(privkeytmp);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 /* calculate proto_k */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334 sha512_init(&hs);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 sha512_process(&hs, privkeyhash, SHA512_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336 sha512_process(&hs, msghash, SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 sha512_done(&hs, proto_k);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339 /* generate k */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	340 m_fp_init(&dss_protok);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	341 bytes_to_fp(&dss_protok, proto_k, SHA512_HASH_SIZE);
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	342 if (fp_mod(&dss_protok, key->q, &dss_k) != FP_OKAY) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 586 diff changeset	343 dropbear_exit("DSS error");
340 454a34b2dfd1 Fixes from Erik Hovland: Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	344 }
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	345 m_fp_zero(&dss_protok);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346 m_burn(proto_k, SHA512_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	347 #else /* DSS_PROTOK not defined*/
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	348 gen_random_fpint(key->q, &dss_k);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351 /* now generate the actual signature */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	352 bytes_to_fp(&dss_m, msghash, SHA1_HASH_SIZE);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354 /* g^k mod p */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	355 if (fp_exptmod(key->g, &dss_k, key->p, &dss_temp1) != FP_OKAY) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 586 diff changeset	356 dropbear_exit("DSS error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	357 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	358 /* r = (g^k mod p) mod q */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	359 if (fp_mod(&dss_temp1, key->q, &dss_r) != FP_OKAY) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 586 diff changeset	360 dropbear_exit("DSS error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363 /* xr mod q /
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	364 if (fp_mulmod(&dss_r, key->x, key->q, &dss_temp1) != FP_OKAY) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 586 diff changeset	365 dropbear_exit("DSS error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 /* (SHA1(M) + xr) mod q) */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	368 if (fp_addmod(&dss_m, &dss_temp1, key->q, &dss_temp2) != FP_OKAY) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 586 diff changeset	369 dropbear_exit("DSS error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372 /* (k^-1) mod q */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	373 if (fp_invmod(&dss_k, key->q, &dss_temp1) != FP_OKAY) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 586 diff changeset	374 dropbear_exit("DSS error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 /* s = (k^-1(SHA1(M) + xr)) mod q */
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	378 if (fp_mulmod(&dss_temp1, &dss_temp2, key->q, &dss_s) != FP_OKAY) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 586 diff changeset	379 dropbear_exit("DSS error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 buf_putstring(buf, SSH_SIGNKEY_DSS, SSH_SIGNKEY_DSS_LEN);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 buf_putint(buf, 2*SHA1_HASH_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	385 writelen = fp_unsigned_bin_size(&dss_r);
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	386 dropbear_assert(writelen <= SHA1_HASH_SIZE);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 /* need to pad to 160 bits with leading zeros */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 for (i = 0; i < SHA1_HASH_SIZE - writelen; i++) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 buf_putbyte(buf, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390 }
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	391 fp_to_unsigned_bin(&dss_r, buf_getwriteptr(buf, writelen));
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	392 fp_zero(&dss_r);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	393 buf_incrwritepos(buf, writelen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	395 writelen = fp_unsigned_bin_size(&dss_s);
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 188 diff changeset	396 dropbear_assert(writelen <= SHA1_HASH_SIZE);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 /* need to pad to 160 bits with leading zeros */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	398 for (i = 0; i < SHA1_HASH_SIZE - writelen; i++) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399 buf_putbyte(buf, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 }
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	401 fp_to_unsigned_bin(&dss_s, buf_getwriteptr(buf, writelen));
76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	402 fp_zero(&dss_s);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 buf_incrwritepos(buf, writelen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404
640 76097ec1a29a - Bring in original tomsfastmath patch against 0.52 from Peter Turczak Matt Johnston <matt@ucc.asn.au> parents: 378 diff changeset	405 m_fp_zero_multi(&dss_k, &dss_temp1, &dss_temp2, &dss_r, &dss_s,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406 &dss_m, NULL);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	408 /* create the signature to return */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	410 TRACE(("leave buf_put_dss_sign"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	412
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 #endif /* DROPBEAR_DSS */

Mercurial > dropbear

annotate dss.c @ 642:33fd2f3499d2 dropbear-tfm