Mercurial > dropbear

comparison common-algo.c @ 852:7540c0822374 ecc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various cleanups and fixes for warnings
author Matt Johnston <matt@ucc.asn.au>
date Tue, 12 Nov 2013 23:02:32 +0800
parents 6c69e7df3621
children c19acba28590
comparison
equal deleted inserted replaced
851:c1c1b43f78c2 852:7540c0822374
229 }; 229 };
230 230
231 static const struct dropbear_kex kex_dh_group1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_1, DH_P_1_LEN, NULL, &sha1_desc }; 231 static const struct dropbear_kex kex_dh_group1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_1, DH_P_1_LEN, NULL, &sha1_desc };
232 static const struct dropbear_kex kex_dh_group14 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc }; 232 static const struct dropbear_kex kex_dh_group14 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc };
233 233
234 /* These can't be const since dropbear_ecc_fill_dp() fills out
235 ecc_curve at runtime */
234 #ifdef DROPBEAR_ECDH 236 #ifdef DROPBEAR_ECDH
235 #ifdef DROPBEAR_ECC_256 237 #ifdef DROPBEAR_ECC_256
236 static struct dropbear_kex kex_ecdh_nistp256 = {DROPBEAR_KEX_ECDH, NULL, 0, &ecc_curve_nistp256, &sha256_desc }; 238 static struct dropbear_kex kex_ecdh_nistp256 = {DROPBEAR_KEX_ECDH, NULL, 0, &ecc_curve_nistp256, &sha256_desc };
237 #endif 239 #endif
238 #ifdef DROPBEAR_ECC_384 240 #ifdef DROPBEAR_ECC_384
243 #endif 245 #endif
244 #endif /* DROPBEAR_ECDH */ 246 #endif /* DROPBEAR_ECDH */
245 247
246 #ifdef DROPBEAR_CURVE25519 248 #ifdef DROPBEAR_CURVE25519
247 /* Referred to directly */ 249 /* Referred to directly */
248 const struct dropbear_kex kex_curve25519 = {DROPBEAR_KEX_CURVE25519, NULL, 0, NULL, &sha256_desc }; 250 static const struct dropbear_kex kex_curve25519 = {DROPBEAR_KEX_CURVE25519, NULL, 0, NULL, &sha256_desc };
249 #endif 251 #endif
250 252
251 algo_type sshkex[] = { 253 algo_type sshkex[] = {
252 #ifdef DROPBEAR_CURVE25519 254 #ifdef DROPBEAR_CURVE25519
253 {"[email protected]", 0, &kex_curve25519, 1, NULL}, 255 {"[email protected]", 0, &kex_curve25519, 1, NULL},