From: Margaret Wasserman Date: Mon, 7 Jan 2013 21:20:19 +0000 (-0500) Subject: Base DH code including DH test program. X-Git-Tag: 1.0~75 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=c2bb3381a4a91485b03019a550693477639acd0e Base DH code including DH test program. --- diff --git a/Makefile.am b/Makefile.am index fb649db..114855b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS= tr/tr tpq/example/tpqc tpq/example/tpqs tidr/example/tidrc tidr/example/tidrs +bin_PROGRAMS= tr/tr tpq/example/tpqc tpq/example/tpqs tidr/example/tidrc tidr/example/tidrs common/dh_test/dh_test AM_CPPFLAGS=-I$(srcdir)/include SUBDIRS = gsscon @@ -39,4 +39,5 @@ common/tr_msg.c tidr_example_tidrs_LDADD = gsscon/libgsscon.la +common_dh_test_dh_test_SOURCES = common/tr_dh.c common/dh_test/dh_test.c diff --git a/common/dh_test/dh_test b/common/dh_test/dh_test new file mode 100755 index 0000000..49adb1a Binary files /dev/null and b/common/dh_test/dh_test differ diff --git a/common/dh_test/dh_test.c b/common/dh_test/dh_test.c new file mode 100644 index 0000000..1352f97 --- /dev/null +++ b/common/dh_test/dh_test.c @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2012, JANET(UK) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JANET(UK) nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include + +#include + +char tmp_key1[32] = + {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x19, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F}; + +char tmp_key2[32] = + {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04}; + +int tmp_len = 32; + +int main (int argc, + const char *argv[]) +{ + DH *c_dh = NULL; + DH *s_dh = NULL; + char *c_keybuf = NULL; + char *s_keybuf = NULL; + int dh_err = 0, c_keylen = 0, s_keylen = 0; + + /* TBD -- Generate random private keys */ + + /* Generate initial DH params on the client side */ + if (NULL == (c_dh = tr_create_dh_params(tmp_key1, tmp_len))) { + printf("Error: Can't create client DH params, exiting.\n"); + exit(1); + } + + fprintf(stderr, "Client DH Parameters:\n"); + DHparams_print_fp(stdout, c_dh); + fprintf(stderr, "\n"); + + /*** Would now send DH params and client's public key to the server ***/ + + /* Generate DH params on the server side */ + if (NULL == (s_dh = tr_create_matching_dh(tmp_key2, tmp_len, c_dh))) { + printf("Error: Can't create server server DH params, exiting.\n"); + exit(1); + } + + fprintf(stderr, "Server DH Parameters:\n"); + DHparams_print_fp(stdout, s_dh); + fprintf(stderr, "\n"); + + /*** Would now send server's pub key to client ***/ + + /* Compute key on client */ + if (NULL == (c_keybuf = malloc(DH_size(c_dh)))) { + printf ("Error: Can't allocate client keybuf, exiting.\n"); + exit(1); + } + if (0 > (c_keylen = tr_compute_dh_key(c_keybuf, + DH_size(c_dh), + s_dh->pub_key, + c_dh))) { + + } + + /* Compute key on server */ + if (NULL == (s_keybuf = malloc(DH_size(c_dh)))) { + printf ("Error: Can't allocate server keybuf, exiting.\n"); + exit(1); + } + if (0 > (s_keylen = tr_compute_dh_key(s_keybuf, + DH_size(s_dh), + c_dh->pub_key, + s_dh))) { + + } + + /* Compare the two keys to see if they match */ + if ((c_keylen != s_keylen) && + (0 != memcmp(c_keybuf, s_keybuf, c_keylen))) { + printf("Error: Different keys generated!\n"); + exit(1); + } + + printf("Success: Identical keys generated!\n"); + exit(0); +} + + + diff --git a/common/tr_dh.c b/common/tr_dh.c new file mode 100644 index 0000000..c13ba8d --- /dev/null +++ b/common/tr_dh.c @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2012, JANET(UK) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JANET(UK) nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include + +unsigned char tr_2048_dhprime[2048/8] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2, 0x34, + 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1, + 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74, + 0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22, + 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD, + 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, + 0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37, + 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45, + 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6, + 0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x37, 0xED, 0x6B, + 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED, + 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, + 0xAE, 0x9F, 0x24, 0x11, 0x7C, 0x4B, 0x1F, 0xE6, + 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D, + 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, + 0x98, 0xDA, 0x48, 0x36, 0x1C, 0x55, 0xD3, 0x9A, + 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F, + 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96, + 0x1C, 0x62, 0xF3, 0x56, 0x20, 0x85, 0x52, 0xBB, + 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D, + 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, + 0xF1, 0x74, 0x6C, 0x08, 0xCA, 0x18, 0x21, 0x7C, + 0x32, 0x90, 0x5E, 0x46, 0x2E, 0x36, 0xCE, 0x3B, + 0xE3, 0x9E, 0x77, 0x2C, 0x18, 0x0E, 0x86, 0x03, + 0x9B, 0x27, 0x83, 0xA2, 0xEC, 0x07, 0xA2, 0x8F, + 0xB5, 0xC5, 0x5D, 0xF0, 0x6F, 0x4C, 0x52, 0xC9, + 0xDE, 0x2B, 0xCB, 0xF6, 0x95, 0x58, 0x17, 0x18, + 0x39, 0x95, 0x49, 0x7C, 0xEA, 0x95, 0x6A, 0xE5, + 0x15, 0xD2, 0x26, 0x18, 0x98, 0xFA, 0x05, 0x10, + 0x15, 0x72, 0x8E, 0x5A, 0x8A, 0xAC, 0xAA, 0x68, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF +}; + +DH *tr_create_dh_params(char *priv_key, + size_t keylen) { + + DH *dh = NULL; + int dh_err = 0; + + if (NULL == (dh = DH_new())) + return NULL; + + if ((NULL == (dh->g = BN_new())) || + (NULL == (dh->p = BN_new())) || + (NULL == (dh->q = BN_new()))) { + DH_free(dh); + } + + BN_set_word(dh->g, 2); + dh->p = BN_bin2bn(tr_2048_dhprime, sizeof(tr_2048_dhprime), NULL); + BN_rshift1(dh->q, dh->p); + + if ((priv_key) && (keylen > 0)) + dh->priv_key = BN_bin2bn(priv_key, keylen, NULL); + + DH_generate_key(dh); /* generates the public key */ + DH_check(dh, &dh_err); + if (0 != dh_err) { + fprintf(stderr, "Warning: dh_check failed with %d", dh_err); + if (dh_err & DH_CHECK_P_NOT_PRIME) + fprintf(stderr, ": p value is not prime\n"); + else if (dh_err & DH_CHECK_P_NOT_SAFE_PRIME) + fprintf(stderr, ": p value is not a safe prime\n"); + else if (dh_err & DH_UNABLE_TO_CHECK_GENERATOR) + fprintf(stderr, ": unable to check the generator value\n"); + else if (dh_err & DH_NOT_SUITABLE_GENERATOR) + fprintf (stderr, ": the g value is not a generator\n"); + else + fprintf(stderr, "\n"); + } + + return(dh); +} + +DH *tr_create_matching_dh (char *priv_key, + size_t keylen, + DH *in_dh) { + DH *dh = NULL; + int dh_err = 0; + + if (!in_dh) + return NULL; + + if (NULL == (dh = DH_new())) + return NULL; + + if ((NULL == (dh->g = BN_dup(in_dh->g))) || + (NULL == (dh->p = BN_dup(in_dh->p))) || + (NULL == (dh->q = BN_dup(in_dh->q)))) { + DH_free(dh); + } + + /* TBD -- share code with previous function */ + if ((priv_key) && (keylen > 0)) + dh->priv_key = BN_bin2bn(priv_key, keylen, NULL); + + DH_generate_key(dh); /* generates the public key */ + DH_check(dh, &dh_err); + if (0 != dh_err) { + fprintf(stderr, "Warning: dh_check failed with %d", dh_err); + if (dh_err & DH_CHECK_P_NOT_PRIME) + fprintf(stderr, ": p value is not prime\n"); + else if (dh_err & DH_CHECK_P_NOT_SAFE_PRIME) + fprintf(stderr, ": p value is not a safe prime\n"); + else if (dh_err & DH_UNABLE_TO_CHECK_GENERATOR) + fprintf(stderr, ": unable to check the generator value\n"); + else if (dh_err & DH_NOT_SUITABLE_GENERATOR) + fprintf (stderr, ": the g value is not a generator\n"); + else + fprintf(stderr, "\n"); + } + + return(dh); +} + +void tr_destroy_dh_params(DH *dh) { + + if (dh) { + DH_free(dh); + } +} + +int tr_compute_dh_key(unsigned char *buf, + size_t buflen, + BIGNUM *pub_key, + DH *priv_dh) { + + int rc = 0; + + if ((!buf) || + (!pub_key) || + (!priv_dh) || + (buflen < DH_size(priv_dh))) + return(-1); + + rc = DH_compute_key(buf, pub_key, priv_dh); + return rc; +} + + + + diff --git a/include/tr_dh.h b/include/tr_dh.h new file mode 100644 index 0000000..ef3f0a9 --- /dev/null +++ b/include/tr_dh.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2012, JANET(UK) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of JANET(UK) nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef TR_DH_H +#define TR_DH_H + +#include +#include + +DH *tr_create_dh_params(char *key, size_t len); +DH *tr_create_matching_dh(char *key, size_t len, DH *in_dh); +void tr_destroy_dh_params(DH *dh); +int tr_compute_dh_key(char *buf, size_t buflen, BIGNUM *pub_key, DH *priv_dh); + +#endif