comparison common-kex.c @ 595:2895626d864f

Add diffie-hellman-group14-sha1 KEX method
author Matt Johnston <matt@ucc.asn.au>
date Thu, 24 Feb 2011 12:42:42 +0000
parents a98a2138364a
children 3aa74a4d83ae
comparison
equal deleted inserted replaced
594:a98a2138364a 595:2895626d864f
34 #include "bignum.h" 34 #include "bignum.h"
35 #include "random.h" 35 #include "random.h"
36 #include "runopts.h" 36 #include "runopts.h"
37 37
38 /* diffie-hellman-group1-sha1 value for p */ 38 /* diffie-hellman-group1-sha1 value for p */
39 static const unsigned char dh_p_val[] = { 39 #define DH_P_1_LEN 128
40 static const unsigned char dh_p_1[DH_P_1_LEN] = {
40 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2, 41 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
41 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1, 42 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
42 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6, 43 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
43 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD, 44 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
44 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D, 45 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
46 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9, 47 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
47 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED, 48 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
48 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11, 49 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
49 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81, 50 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
50 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; 51 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
51 #define DH_P_LEN sizeof(dh_p_val) 52
52 53 /* diffie-hellman-group14-sha1 value for p */
54 #define DH_P_14_LEN 256
55 static const unsigned char dh_p_14[DH_P_14_LEN] = {
56 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2,
57 0x21, 0x68, 0xC2, 0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
58 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6,
59 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
60 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
61 0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
62 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9,
63 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
64 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE, 0x9F, 0x24, 0x11,
65 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D,
66 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, 0x98, 0xDA, 0x48, 0x36,
67 0x1C, 0x55, 0xD3, 0x9A, 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F,
68 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96, 0x1C, 0x62, 0xF3, 0x56,
69 0x20, 0x85, 0x52, 0xBB, 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D,
70 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, 0xF1, 0x74, 0x6C, 0x08,
71 0xCA, 0x18, 0x21, 0x7C, 0x32, 0x90, 0x5E, 0x46, 0x2E, 0x36, 0xCE, 0x3B,
72 0xE3, 0x9E, 0x77, 0x2C, 0x18, 0x0E, 0x86, 0x03, 0x9B, 0x27, 0x83, 0xA2,
73 0xEC, 0x07, 0xA2, 0x8F, 0xB5, 0xC5, 0x5D, 0xF0, 0x6F, 0x4C, 0x52, 0xC9,
74 0xDE, 0x2B, 0xCB, 0xF6, 0x95, 0x58, 0x17, 0x18, 0x39, 0x95, 0x49, 0x7C,
75 0xEA, 0x95, 0x6A, 0xE5, 0x15, 0xD2, 0x26, 0x18, 0x98, 0xFA, 0x05, 0x10,
76 0x15, 0x72, 0x8E, 0x5A, 0x8A, 0xAC, 0xAA, 0x68, 0xFF, 0xFF, 0xFF, 0xFF,
77 0xFF, 0xFF, 0xFF, 0xFF};
78
79 /* Same for group1 and group14 */
53 static const int DH_G_VAL = 2; 80 static const int DH_G_VAL = 2;
54 81
55 static void kexinitialise(); 82 static void kexinitialise();
56 void gen_new_keys(); 83 void gen_new_keys();
57 #ifndef DISABLE_ZLIB 84 #ifndef DISABLE_ZLIB
490 ses.kexstate.recvkexinit = 1; 517 ses.kexstate.recvkexinit = 1;
491 518
492 TRACE(("leave recv_msg_kexinit")) 519 TRACE(("leave recv_msg_kexinit"))
493 } 520 }
494 521
522 static void load_dh_p(mp_int * dh_p)
523 {
524 switch (ses.newkeys->algo_kex) {
525 case DROPBEAR_KEX_DH_GROUP1:
526 bytes_to_mp(dh_p, dh_p_1, DH_P_1_LEN);
527 break;
528 case DROPBEAR_KEX_DH_GROUP14:
529 bytes_to_mp(dh_p, dh_p_14, DH_P_14_LEN);
530 break;
531 }
532 }
533
495 /* Initialises and generate one side of the diffie-hellman key exchange values. 534 /* Initialises and generate one side of the diffie-hellman key exchange values.
496 * See the ietf-secsh-transport draft, section 6, for details */ 535 * See the ietf-secsh-transport draft, section 6, for details */
497 /* dh_pub and dh_priv MUST be already initialised */ 536 /* dh_pub and dh_priv MUST be already initialised */
498 void gen_kexdh_vals(mp_int *dh_pub, mp_int *dh_priv) { 537 void gen_kexdh_vals(mp_int *dh_pub, mp_int *dh_priv) {
499 538
504 TRACE(("enter send_msg_kexdh_reply")) 543 TRACE(("enter send_msg_kexdh_reply"))
505 544
506 m_mp_init_multi(&dh_g, &dh_p, &dh_q, NULL); 545 m_mp_init_multi(&dh_g, &dh_p, &dh_q, NULL);
507 546
508 /* read the prime and generator*/ 547 /* read the prime and generator*/
509 bytes_to_mp(&dh_p, (unsigned char*)dh_p_val, DH_P_LEN); 548 load_dh_p(&dh_p);
510 549
511 if (mp_set_int(&dh_g, DH_G_VAL) != MP_OKAY) { 550 if (mp_set_int(&dh_g, DH_G_VAL) != MP_OKAY) {
512 dropbear_exit("Diffie-Hellman error"); 551 dropbear_exit("Diffie-Hellman error");
513 } 552 }
514 553
542 mp_int *dh_e = NULL, *dh_f = NULL; 581 mp_int *dh_e = NULL, *dh_f = NULL;
543 hash_state hs; 582 hash_state hs;
544 583
545 /* read the prime and generator*/ 584 /* read the prime and generator*/
546 m_mp_init(&dh_p); 585 m_mp_init(&dh_p);
547 bytes_to_mp(&dh_p, dh_p_val, DH_P_LEN); 586 load_dh_p(&dh_p);
548 587
549 /* Check that dh_pub_them (dh_e or dh_f) is in the range [1, p-1] */ 588 /* Check that dh_pub_them (dh_e or dh_f) is in the range [1, p-1] */
550 if (mp_cmp(dh_pub_them, &dh_p) != MP_LT 589 if (mp_cmp(dh_pub_them, &dh_p) != MP_LT
551 || mp_cmp_d(dh_pub_them, 0) != MP_GT) { 590 || mp_cmp_d(dh_pub_them, 0) != MP_GT) {
552 dropbear_exit("Diffie-Hellman error"); 591 dropbear_exit("Diffie-Hellman error");