diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-10-09 21:40:47 +0000 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-10-09 21:40:47 +0000 |
commit | 6dc2b250b75362aadc9655f795e01e73b4995c88 (patch) | |
tree | e03bcc7e063448678d62bdb63a1369e078f48aba | |
parent | 3870e0504d069303681383a0ffdf9f37162fbdab (diff) | |
download | gnutls-6dc2b250b75362aadc9655f795e01e73b4995c88.tar.gz |
Updated the handling of prime numbers.
-rw-r--r-- | lib/Makefile.am | 3 | ||||
-rw-r--r-- | lib/auth_dhe_rsa.c | 37 | ||||
-rw-r--r-- | lib/auth_srp_passwd.c | 77 | ||||
-rw-r--r-- | lib/auth_x509.c | 1 | ||||
-rw-r--r-- | lib/gnutls.h.in | 3 | ||||
-rw-r--r-- | lib/gnutls_dh.c | 319 | ||||
-rw-r--r-- | lib/gnutls_dh.h | 1 | ||||
-rw-r--r-- | lib/gnutls_dh_primes.c | 470 | ||||
-rw-r--r-- | lib/gnutls_record.h | 1 | ||||
-rw-r--r-- | lib/gnutls_srp.c | 99 |
10 files changed, 583 insertions, 428 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 290cfa63ff..ed73fec8d2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -34,7 +34,8 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c \ gnutls_gcry.c ext_dnsname.c gnutls_pk.c gnutls_cert.c x509_verify.c\ gnutls_global.c gnutls_privkey.c gnutls_constate.c gnutls_anon_cred.c \ x509_sig_check.c pkix_asn1_tab.c pkcs1_asn1_tab.c gnutls_mem.c \ - x509_extensions.c auth_x509.c gnutls_ui.c gnutls_sig.c auth_dhe_rsa.c + x509_extensions.c auth_x509.c gnutls_ui.c gnutls_sig.c auth_dhe_rsa.c \ + gnutls_dh_primes.c libgnutls_la_SOURCES = $(COBJECTS) diff --git a/lib/auth_dhe_rsa.c b/lib/auth_dhe_rsa.c index 4777d7a2ff..475e6fe2b3 100644 --- a/lib/auth_dhe_rsa.c +++ b/lib/auth_dhe_rsa.c @@ -184,17 +184,22 @@ static int gen_dhe_rsa_client_kx(GNUTLS_STATE state, opaque ** data) X = gnutls_calc_dh_secret(&x, state->gnutls_key->client_g, state->gnutls_key->client_p); - if (X==NULL) + if (X==NULL || x==NULL) { + gnutls_assert(); + _gnutls_mpi_release( &x); + _gnutls_mpi_release( &X); return GNUTLS_E_MEMORY_ERROR; - + } + gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &n_X, X); (*data) = gnutls_malloc(n_X + 2); - if (*data == NULL) + if (*data == NULL) { + _gnutls_mpi_release( &x); + _gnutls_mpi_release( &X); return GNUTLS_E_MEMORY_ERROR; - + } + gcry_mpi_print(GCRYMPI_FMT_USG, &(*data)[2], &n_X, X); - (*data)[0] = 1; /* extern - explicit since we do not have - certificate */ _gnutls_mpi_release(&X); WRITEuint16(n_X, &(*data)[0]); @@ -203,9 +208,12 @@ static int gen_dhe_rsa_client_kx(GNUTLS_STATE state, opaque ** data) state->gnutls_key->KEY = gnutls_calc_dh_key(state->gnutls_key->client_Y, x, state->gnutls_key->client_p); - if (state->gnutls_key->KEY==NULL) - return GNUTLS_E_MEMORY_ERROR; + _gnutls_mpi_release(&x); + if (state->gnutls_key->KEY==NULL) { + gnutls_assert(); + return GNUTLS_E_MEMORY_ERROR; + } /* THESE SHOULD BE DISCARDED */ _gnutls_mpi_release(&state->gnutls_key->client_Y); @@ -337,21 +345,24 @@ static int proc_dhe_rsa_client_kx(GNUTLS_STATE state, opaque * data, } g = gnutls_get_dh_params(&p, bits); - if (g==NULL) { + if (g==NULL || p==NULL) { gnutls_assert(); + _gnutls_mpi_release( &g); + _gnutls_mpi_release( &p); return GNUTLS_E_MEMORY_ERROR; } state->gnutls_key->KEY = gnutls_calc_dh_key(state->gnutls_key->client_Y, state->gnutls_key->dh_secret, p); - if (state->gnutls_key->KEY==NULL) - return GNUTLS_E_MEMORY_ERROR; - - _gnutls_mpi_release(&g); _gnutls_mpi_release(&p); + if (state->gnutls_key->KEY==NULL) { + return GNUTLS_E_MEMORY_ERROR; + } + + _gnutls_mpi_release(&state->gnutls_key->client_Y); _gnutls_mpi_release(&state->gnutls_key->dh_secret); diff --git a/lib/auth_srp_passwd.c b/lib/auth_srp_passwd.c index 7cbdf945d6..cf5afed27c 100644 --- a/lib/auth_srp_passwd.c +++ b/lib/auth_srp_passwd.c @@ -28,6 +28,7 @@ #include "gnutls_auth_int.h" #include "gnutls_srp.h" #include "gnutls_random.h" +#include "gnutls_dh.h" #include "debug.h" /* this function parses tpasswd.conf file. Format is: @@ -286,57 +287,56 @@ GNUTLS_SRP_PWD_ENTRY *_gnutls_srp_pwd_read_entry( GNUTLS_KEY key, char* username #define RNDUSER "rnd" #define RND_SALT_SIZE 17 GNUTLS_SRP_PWD_ENTRY* _gnutls_randomize_pwd_entry() { - GNUTLS_SRP_PWD_ENTRY * pwd_entry = gnutls_malloc(sizeof(GNUTLS_SRP_PWD_ENTRY)); - size_t n = sizeof diffie_hellman_group1_prime; + GNUTLS_SRP_PWD_ENTRY * pwd_entry = gnutls_calloc(1, sizeof(GNUTLS_SRP_PWD_ENTRY)); if (pwd_entry == NULL) { gnutls_assert(); return NULL; } - pwd_entry->username = gnutls_malloc(strlen(RNDUSER)+1); - if (pwd_entry->username == NULL) { + pwd_entry->g = gnutls_get_dh_params( &pwd_entry->n, 1024); + if (pwd_entry->g==NULL || pwd_entry->n==NULL) { gnutls_assert(); + _gnutls_srp_clear_pwd_entry( pwd_entry); return NULL; } - strcpy( pwd_entry->username, RNDUSER); - pwd_entry->g = gcry_mpi_set_ui(NULL, SRP_G); - if (pwd_entry->g==NULL) { + pwd_entry->username = gnutls_malloc(strlen(RNDUSER)+1); + if (pwd_entry->username == NULL) { gnutls_assert(); + _gnutls_srp_clear_pwd_entry( pwd_entry); return NULL; } + strcpy( pwd_entry->username, RNDUSER); pwd_entry->v = gcry_mpi_new(160); if (pwd_entry->v==NULL) { gnutls_assert(); + _gnutls_srp_clear_pwd_entry( pwd_entry); return NULL; } gcry_mpi_randomize( pwd_entry->v, 160, GCRY_WEAK_RANDOM); - if (gcry_mpi_scan(&pwd_entry->n, GCRYMPI_FMT_USG, - diffie_hellman_group1_prime, &n) !=0 || pwd_entry->n==NULL) { - gnutls_assert(); - return NULL; - } - pwd_entry->salt_size = RND_SALT_SIZE; pwd_entry->salt = gnutls_malloc(RND_SALT_SIZE); if (pwd_entry->salt==NULL) { gnutls_assert(); + _gnutls_srp_clear_pwd_entry( pwd_entry); return NULL; } if (_gnutls_get_random(pwd_entry->salt, RND_SALT_SIZE, GNUTLS_WEAK_RANDOM) < 0) { gnutls_assert(); + _gnutls_srp_clear_pwd_entry( pwd_entry); return NULL; } pwd_entry->algorithm = 0; return pwd_entry; + } void _gnutls_srp_clear_pwd_entry( GNUTLS_SRP_PWD_ENTRY * entry) { @@ -351,3 +351,54 @@ void _gnutls_srp_clear_pwd_entry( GNUTLS_SRP_PWD_ENTRY * entry) { return; } + +/* Generates a prime and a generator, and returns the srpbase64 encoded value. + */ +int _gnutls_srp_generate_prime(opaque ** ret_g, opaque ** ret_n, int bits) +{ + + MPI prime, g; + int siz; + char *tmp; + + if ( _gnutls_dh_generate_prime(&g, &prime, bits) < 0) { + gnutls_assert(); + return GNUTLS_E_MEMORY_ERROR; + } + + siz = 0; + gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &siz, g); + if (ret_g != NULL) { + tmp = gnutls_malloc(siz); + if (tmp==NULL) return GNUTLS_E_MEMORY_ERROR; + + gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &siz, g); + + if (_gnutls_sbase64_encode(tmp, siz, ret_g) < 0) { + gnutls_free(tmp); + return GNUTLS_E_UNKNOWN_ERROR; + } + gnutls_free(tmp); + } + + siz = 0; + gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &siz, prime); + if (ret_n != NULL) { + tmp = gnutls_malloc(siz); + if (tmp==NULL) return GNUTLS_E_MEMORY_ERROR; + + gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &siz, prime); + if (_gnutls_sbase64_encode(tmp, siz, ret_n) < 0) { + gnutls_free(tmp); + return GNUTLS_E_UNKNOWN_ERROR; + } + + gnutls_free(tmp); + } + + _gnutls_mpi_release(&g); + _gnutls_mpi_release(&prime); + + return 0; + +} diff --git a/lib/auth_x509.c b/lib/auth_x509.c index f6bad788a1..07540d831c 100644 --- a/lib/auth_x509.c +++ b/lib/auth_x509.c @@ -32,6 +32,7 @@ #include <gnutls_pk.h> #include <gnutls_algorithms.h> #include <gnutls_global.h> +#include <gnutls_record.h> #include <x509_verify.h> #include <gnutls_sig.h> diff --git a/lib/gnutls.h.in b/lib/gnutls.h.in index f496a1465f..e9ae8e184f 100644 --- a/lib/gnutls.h.in +++ b/lib/gnutls.h.in @@ -87,6 +87,7 @@ int gnutls_handshake(SOCKET cd, GNUTLS_STATE state); int gnutls_check_pending(GNUTLS_STATE state); int gnutls_rehandshake(SOCKET cd, GNUTLS_STATE state); + AlertDescription gnutls_get_last_alert( GNUTLS_STATE state); int gnutls_send_alert(SOCKET, GNUTLS_STATE, AlertLevel, AlertDescription); @@ -216,6 +217,8 @@ int gnutls_set_x509_trust( X509PKI_CREDENTIALS res, char* CAFILE, char* CRLFILE) int gnutls_global_init(); void gnutls_global_deinit(); +int gnutls_dh_generate_new_primes(); + typedef ssize_t (*RECV_FUNC)(SOCKET, void*, size_t,int); typedef ssize_t (*SEND_FUNC)(SOCKET, const void*, size_t,int); typedef void (*LOG_FUNC)( const char*); diff --git a/lib/gnutls_dh.c b/lib/gnutls_dh.c index 7beda092d4..71fcaae801 100644 --- a/lib/gnutls_dh.c +++ b/lib/gnutls_dh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Nikos Mavroyanopoulos + * Copyright (C) 2000,2001 Nikos Mavroyanopoulos * * This file is part of GNUTLS. * someday was part of gsti @@ -23,203 +23,6 @@ #include <gnutls_errors.h> #include <gnutls_gcry.h> -#define DH_G_1024 2 -#define DH_G_4096 5 -#define DH_G_2048 5 -#define DH_G_3072 13 - -static const uint8 diffie_hellman_group1_prime[130] = { 0x04, 0x00, - 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, 0xE6, 0x53, 0x81, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -/* prime - 4096 bits */ -const uint8 diffie_hellman_prime_4096[512] = { - 0x98, 0xb7, 0x3d, 0x66, 0xf1, 0x18, 0x61, - 0xa9, 0x36, 0xd9, 0xf1, 0xbf, 0x65, 0xbb, - 0x7c, 0x06, 0x10, 0x15, 0xe5, 0x24, 0x47, - 0xb5, 0x45, 0x7e, 0xbb, 0xdf, 0x59, 0xf4, - 0xf2, 0x59, 0x7d, 0xea, 0xe0, 0x0f, 0x06, - 0x42, 0xd8, 0xb1, 0x9b, 0x62, 0xf9, 0x81, - 0x05, 0xd7, 0xd5, 0x74, 0x7c, 0x39, 0x3b, - 0x6d, 0x57, 0xb7, 0xe9, 0x51, 0x0d, 0xb6, - 0xe5, 0x03, 0xf7, 0xf3, 0xac, 0x1b, 0x66, - 0x96, 0xb3, 0xf8, 0xa1, 0xe1, 0xc7, 0x9c, - 0xc7, 0x52, 0x19, 0x2a, 0x90, 0xe6, 0x1d, - 0xba, 0xf5, 0x15, 0xcb, 0x8b, 0x52, 0x88, - 0xcd, 0xf5, 0x50, 0x33, 0x04, 0xb8, 0x2f, - 0x2c, 0x01, 0x57, 0x82, 0x7c, 0x8a, 0xf0, - 0xa3, 0x73, 0x7e, 0x0c, 0x2d, 0x69, 0xd4, - 0x17, 0xf6, 0xd0, 0x6a, 0x32, 0x95, 0x6a, - 0x69, 0x40, 0xb0, 0x55, 0x4f, 0xf0, 0x1d, - 0xae, 0x3d, 0x5f, 0x01, 0x92, 0x14, 0x3a, - 0x73, 0x69, 0x5a, 0x8e, 0xea, 0x22, 0x52, - 0x44, 0xc2, 0xb8, 0x66, 0x1e, 0x26, 0x1a, - 0x5d, 0x8f, 0x46, 0x6b, 0x8d, 0x3c, 0x71, - 0xcf, 0x1d, 0x72, 0x8d, 0x2f, 0x03, 0x54, - 0xdb, 0xe9, 0x82, 0x60, 0xe5, 0xf6, 0x40, - 0x4b, 0x6b, 0xae, 0x0a, 0xb2, 0x30, 0xba, - 0x1c, 0x45, 0x7e, 0x3f, 0xfd, 0xf7, 0xdc, - 0xa6, 0xbb, 0x98, 0xc4, 0xca, 0xfc, 0x66, - 0xf3, 0x48, 0x47, 0xbf, 0xdb, 0xd7, 0xdc, - 0xff, 0x1d, 0xeb, 0xa0, 0x4e, 0xb6, 0xff, - 0x75, 0xdc, 0x0c, 0x1d, 0x93, 0x9e, 0xd5, - 0xb3, 0x68, 0xe7, 0x07, 0x29, 0x91, 0xf1, - 0xae, 0xfc, 0x7e, 0x3a, 0xea, 0xec, 0x40, - 0xfc, 0x70, 0x7f, 0xf3, 0x36, 0x81, 0xec, - 0x97, 0xa7, 0x0d, 0x71, 0x2c, 0x5c, 0x4f, - 0xd9, 0x00, 0xcf, 0x62, 0x56, 0xfb, 0x09, - 0x2d, 0x1b, 0x04, 0x3c, 0x00, 0xc8, 0x17, - 0xd7, 0x7d, 0x16, 0x20, 0x1e, 0x62, 0x9b, - 0xf4, 0x4f, 0xee, 0xa4, 0xbf, 0x0b, 0xde, - 0x51, 0x7c, 0x01, 0x76, 0x79, 0x73, 0x7d, - 0x7b, 0xec, 0xee, 0x14, 0xec, 0x83, 0xc3, - 0xb4, 0x42, 0x66, 0x19, 0x52, 0x19, 0x04, - 0x02, 0x71, 0x61, 0x5c, 0x78, 0xee, 0x5f, - 0x58, 0x1e, 0x5b, 0x2d, 0xf3, 0x0c, 0x6e, - 0x00, 0x0f, 0xd8, 0xf0, 0x86, 0xa1, 0x11, - 0xfd, 0x04, 0x07, 0xa6, 0xf7, 0x31, 0xb9, - 0xf6, 0x76, 0xfc, 0xea, 0xf0, 0x16, 0x98, - 0x37, 0x48, 0x1b, 0x0c, 0x32, 0x3f, 0x7e, - 0xfa, 0x02, 0x04, 0x2a, 0x48, 0x70, 0xb4, - 0xe3, 0xe0, 0xc1, 0x7f, 0x65, 0x70, 0xd0, - 0x71, 0x74, 0x86, 0xb7, 0x5d, 0xd4, 0x84, - 0xd5, 0x9d, 0x77, 0xf6, 0x72, 0x82, 0x4b, - 0x98, 0x8b, 0x49, 0x3a, 0x0b, 0x1e, 0x94, - 0x42, 0xf7, 0x0b, 0x3f, 0xec, 0xc2, 0x2b, - 0x7f, 0x55, 0xe2, 0x94, 0x48, 0xac, 0x04, - 0xb9, 0xb2, 0xb6, 0xca, 0xb4, 0x09, 0xe3, - 0xba, 0x6a, 0x55, 0x28, 0xf7, 0x8a, 0x73, - 0x4d, 0x21, 0xe1, 0xf4, 0xcd, 0x22, 0x15, - 0x9c, 0xe6, 0xcc, 0x1d, 0x9f, 0x81, 0x88, - 0x4c, 0x5a, 0x17, 0x9f, 0xe5, 0x8c, 0x85, - 0xf1, 0xa3, 0xcf, 0x6c, 0xa1, 0xbf, 0x5e, - 0x02, 0x61, 0xa8, 0x67, 0x6f, 0xb8, 0x20, - 0x1a, 0x4e, 0xf2, 0x05, 0xd7, 0xb4, 0x4b, - 0x3e, 0xca, 0x87, 0x49, 0x10, 0x16, 0xcc, - 0xc9, 0xe0, 0x1c, 0xc1, 0x83, 0xc7, 0xa0, - 0x54, 0x3d, 0x36, 0x17, 0x84, 0xc3, 0x84, - 0x2e, 0x5a, 0xe0, 0x75, 0x45, 0x01, 0xe6, - 0xf0, 0x3d, 0xf9, 0x33, 0x0a, 0xd9, 0x1e, - 0x66, 0x99, 0xb4, 0x21, 0xed, 0x6e, 0xda, - 0x6f, 0x37, 0x33, 0xdd, 0x8f, 0x25, 0x35, - 0x5e, 0x6c, 0x1e, 0x33, 0xc2, 0x41, 0x3f, - 0x58, 0x40, 0xbb, 0xe7, 0x2b, 0x54, 0xdb, - 0xd8, 0xcf, 0x3a, 0xba, 0x0c, 0xf1, 0x19, - 0xec, 0x9d, 0x50, 0xf6, 0x63, 0x22, 0x55, - 0x5e, 0x79, 0xd1, 0x3f, 0x46, 0x0f, 0xf3, - 0x7f -}; - -/* prime - 3072 bits */ -const uint8 diffie_hellman_prime_3072[384] = { - 0xd5, 0x6e, 0xc8, 0x1f, 0xe9, 0x80, 0x9e, - 0x56, 0x35, 0x6d, 0x6d, 0xdb, 0xfa, 0x47, - 0x75, 0xcd, 0xfa, 0x32, 0x52, 0x1a, 0xc8, - 0xad, 0xee, 0xb0, 0xdb, 0xb7, 0x07, 0x58, - 0xa6, 0x42, 0xfe, 0x59, 0xfb, 0xce, 0xe8, - 0x12, 0x63, 0x09, 0x9f, 0x5d, 0x15, 0x25, - 0x49, 0xf2, 0x61, 0x83, 0xd8, 0x5c, 0x81, - 0xdd, 0x4c, 0x26, 0xe6, 0x24, 0xce, 0x6a, - 0xa5, 0x07, 0x80, 0x1c, 0x3d, 0x94, 0xd1, - 0x5d, 0x73, 0xbd, 0x26, 0x48, 0x22, 0x25, - 0xdd, 0x2f, 0x64, 0xe5, 0xed, 0xb3, 0xa9, - 0x94, 0xb3, 0x96, 0x88, 0x5d, 0x06, 0x41, - 0x80, 0xf8, 0xe1, 0x3c, 0x8f, 0xa9, 0x5b, - 0x44, 0x7e, 0x32, 0xbd, 0x62, 0x37, 0xe1, - 0xde, 0x18, 0xe8, 0x12, 0x7d, 0x28, 0x7d, - 0x5c, 0xcf, 0xa9, 0x16, 0x0f, 0xdc, 0xc1, - 0x92, 0xe0, 0x43, 0xac, 0xd0, 0x25, 0x37, - 0x8e, 0x5d, 0x4d, 0x26, 0x46, 0xbc, 0xc5, - 0x22, 0x05, 0x29, 0x41, 0x53, 0x2f, 0x7a, - 0x95, 0xa8, 0x36, 0xed, 0x85, 0xac, 0xf3, - 0xde, 0x0c, 0xbe, 0xa9, 0xfa, 0xc4, 0xa6, - 0x0b, 0x23, 0xfc, 0x7c, 0x77, 0xdc, 0x7c, - 0x94, 0x9b, 0x7c, 0xe0, 0x3b, 0xa1, 0x66, - 0x78, 0x85, 0x99, 0x5a, 0xba, 0x26, 0xa3, - 0xac, 0x97, 0xd4, 0x3a, 0x33, 0xee, 0xa3, - 0x96, 0xe0, 0x16, 0xdf, 0x61, 0xe7, 0x1f, - 0x35, 0xa5, 0x47, 0x54, 0x51, 0xce, 0x93, - 0x40, 0x6f, 0x40, 0x86, 0x3b, 0x17, 0x12, - 0xd3, 0x4d, 0x2e, 0xb3, 0x04, 0xf8, 0x8b, - 0x30, 0xb1, 0x27, 0xd7, 0xeb, 0xde, 0xd7, - 0xa9, 0x06, 0xfe, 0x6b, 0x59, 0x8c, 0x5d, - 0x9f, 0x93, 0x1f, 0x12, 0x65, 0xe6, 0xa6, - 0xeb, 0x5d, 0x4b, 0x9a, 0x16, 0x85, 0xce, - 0x18, 0x16, 0x5a, 0x5c, 0x3c, 0xeb, 0xc0, - 0xe1, 0x58, 0x64, 0x06, 0x38, 0x1c, 0x66, - 0x90, 0x4a, 0x30, 0xbe, 0x82, 0xe9, 0x9b, - 0x40, 0x2e, 0x6a, 0x91, 0x4f, 0x48, 0xc2, - 0x82, 0x40, 0xe9, 0xcd, 0x87, 0x77, 0x24, - 0xa7, 0xdc, 0x26, 0x05, 0x18, 0x9c, 0x8b, - 0x0e, 0x84, 0x29, 0x57, 0x76, 0x66, 0x7d, - 0x1e, 0x39, 0xc2, 0xf6, 0x2f, 0xbb, 0xeb, - 0x6e, 0x58, 0x3b, 0x11, 0x70, 0x75, 0xdb, - 0xe9, 0xf8, 0xcb, 0xd4, 0x4c, 0x84, 0xb3, - 0xcb, 0x66, 0x81, 0x4e, 0x93, 0xd9, 0x2f, - 0xc5, 0x60, 0x53, 0x69, 0x6e, 0xf3, 0x8e, - 0xa5, 0x6a, 0xa0, 0x96, 0xae, 0x31, 0xb6, - 0x12, 0x91, 0x0e, 0xc4, 0xc9, 0xd0, 0x50, - 0xf7, 0xbc, 0xe7, 0x78, 0xc9, 0x97, 0x02, - 0x26, 0x6a, 0xe3, 0x9a, 0x16, 0x63, 0xa2, - 0x5e, 0x1d, 0x4e, 0x71, 0x52, 0xb4, 0x73, - 0x31, 0x27, 0x6c, 0x46, 0xe4, 0x67, 0x02, - 0xde, 0x34, 0x7e, 0x24, 0x3b, 0xb9, 0xfe, - 0x08, 0x7e, 0xe9, 0x0a, 0xdc, 0xe7, 0xc2, - 0xa6, 0xa6, 0xb3, 0x7d, 0xe0, 0xa2, 0xe7, - 0x6d, 0x2e, 0x33, 0xed, 0x47, 0xf7 -}; - -/* prime - 2048 bits */ -const uint8 diffie_hellman_prime_2048[256] = { - 0xf0, 0x49, 0x65, 0x6d, 0x24, 0x61, 0xe6, - 0x86, 0x8e, 0x57, 0x2b, 0x9b, 0x1c, 0x53, - 0x2e, 0xef, 0xd2, 0x6e, 0xe5, 0x6c, 0xc4, - 0x0c, 0x77, 0x1d, 0xce, 0xc7, 0xe0, 0x92, - 0x78, 0x8b, 0x2b, 0x80, 0x9f, 0xc4, 0x59, - 0xb5, 0x2e, 0xeb, 0x81, 0x8b, 0xfa, 0x08, - 0x9f, 0x02, 0x5e, 0x94, 0x85, 0xab, 0xab, - 0x08, 0x8a, 0x71, 0xb5, 0x0c, 0x26, 0x63, - 0x2f, 0x34, 0x10, 0xdf, 0x32, 0x9a, 0xa1, - 0xd5, 0xb5, 0xd7, 0xa1, 0x46, 0x24, 0x9a, - 0xe3, 0x2a, 0xf1, 0x3a, 0x52, 0xc4, 0xa4, - 0xe6, 0xa2, 0x29, 0x5e, 0x49, 0x0e, 0x2a, - 0x4d, 0xad, 0xcd, 0x92, 0xb6, 0xa5, 0x25, - 0xe5, 0x09, 0xae, 0x76, 0xe4, 0x19, 0xec, - 0x29, 0x9b, 0x9b, 0xdb, 0x0c, 0xc8, 0x28, - 0x1c, 0x49, 0x11, 0x45, 0x30, 0x51, 0x73, - 0x31, 0x18, 0x9e, 0xa5, 0x89, 0x7d, 0x17, - 0x22, 0xd5, 0x49, 0xaf, 0xf6, 0xe5, 0x00, - 0x55, 0x7f, 0x2b, 0x33, 0x2d, 0x2f, 0x89, - 0x73, 0x0b, 0x4d, 0x44, 0x72, 0xb1, 0x2e, - 0xa3, 0x68, 0xbe, 0x52, 0x4e, 0x5a, 0x66, - 0x36, 0xf9, 0x2c, 0xe7, 0xce, 0x92, 0x4d, - 0x0c, 0xa3, 0xc7, 0x85, 0x7e, 0xe6, 0x97, - 0x02, 0x8b, 0x0c, 0xcb, 0xf3, 0x6f, 0x2e, - 0x04, 0xed, 0x6e, 0x75, 0xcf, 0xd1, 0xd4, - 0x9f, 0xd3, 0x44, 0x3e, 0x5f, 0x81, 0xaa, - 0xc1, 0xb8, 0xe2, 0xab, 0xed, 0x3b, 0xfc, - 0xeb, 0x47, 0x48, 0xee, 0xe5, 0xfd, 0xc2, - 0x79, 0x7a, 0x01, 0xe9, 0xab, 0xc6, 0x34, - 0x65, 0x6a, 0x0a, 0x6c, 0xe8, 0x89, 0xa6, - 0x96, 0xd2, 0x1e, 0xe5, 0xbe, 0x58, 0xf2, - 0xcf, 0x17, 0xb8, 0x75, 0x43, 0xec, 0x0b, - 0xb2, 0x91, 0x50, 0x93, 0x4c, 0xd2, 0xa3, - 0xa4, 0x8a, 0x67, 0x23, 0x7f, 0x86, 0xac, - 0xe3, 0x56, 0x9b, 0x18, 0x03, 0x03, 0x70, - 0x50, 0x7b, 0x1a, 0x02, 0x22, 0x0b, 0x93, - 0xc8, 0x9b, 0xa8, 0x8f -}; - /* --Example-- @@ -243,29 +46,34 @@ const uint8 diffie_hellman_prime_2048[256] = { * the modulus. * FIXME: This function is not correct */ -static int get_x_size( int bits) { - if (bits <= 2048) return 512; - if (bits <= 4096) return 768; +static int get_x_size(int bits) +{ + if (bits <= 2048) + return 512; + if (bits <= 4096) + return 768; return 1024; } MPI gnutls_calc_dh_secret(MPI * ret_x, MPI g, MPI prime) { MPI e, x; - int x_size = get_x_size( gcry_mpi_get_nbits(prime)); - + int x_size = get_x_size(gcry_mpi_get_nbits(prime)); + x = gcry_mpi_new(x_size); /* FIXME: allocate in secure memory */ - if ( x == NULL) { - if (ret_x) *ret_x = NULL; + if (x == NULL) { + if (ret_x) + *ret_x = NULL; return NULL; } - + gcry_mpi_randomize(x, x_size, GCRY_STRONG_RANDOM); /* fixme: set high bit of x and select a larger one */ e = gcry_mpi_alloc_like(prime); - if (e==NULL) { - if (ret_x) *ret_x = NULL; + if (e == NULL) { + if (ret_x) + *ret_x = NULL; return NULL; } gcry_mpi_powm(e, g, x, prime); @@ -277,106 +85,13 @@ MPI gnutls_calc_dh_secret(MPI * ret_x, MPI g, MPI prime) return e; } -/* returns g and p, depends on the requested bits. - * We only support limited key sizes. - */ -MPI gnutls_get_dh_params(MPI * ret_p, int bits) -{ - MPI g, prime; - size_t n; - - if (bits >= 4096) bits = 4096; - else if (bits<=1024) bits=1024; - else if (bits<=2048) bits=2048; - else if (bits<=3072) bits=3072; - else if (bits<=4096) bits=4096; - - switch (bits) { - case 1024: - n = sizeof diffie_hellman_group1_prime; - - if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, - diffie_hellman_group1_prime, &n) || prime==NULL) { - gnutls_assert(); - return NULL; - } - - g = gcry_mpi_set_ui(NULL, DH_G_1024); - if (g==NULL) - return NULL; - - if (ret_p) - *ret_p = prime; - else - _gnutls_mpi_release(&prime); - return g; - case 2048: - n = sizeof diffie_hellman_prime_2048; - - if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, - diffie_hellman_prime_2048, &n) || prime==NULL) { - gnutls_assert(); - return NULL; - } - - g = gcry_mpi_set_ui(NULL, DH_G_2048); - if (g==NULL) - return NULL; - - if (ret_p) - *ret_p = prime; - else - _gnutls_mpi_release(&prime); - return g; - case 3072: - n = sizeof diffie_hellman_prime_3072; - - if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, - diffie_hellman_prime_3072, &n) || prime==NULL) { - gnutls_assert(); - return NULL; - } - - g = gcry_mpi_set_ui(NULL, DH_G_3072); - if (g==NULL) - return NULL; - - if (ret_p) - *ret_p = prime; - else - _gnutls_mpi_release(&prime); - return g; - case 4096: - n = sizeof diffie_hellman_prime_4096; - - if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, - diffie_hellman_prime_4096, &n) || prime==NULL) { - gnutls_assert(); - return NULL; - } - - g = gcry_mpi_set_ui(NULL, DH_G_4096); - if (g==NULL) - return NULL; - - if (ret_p) - *ret_p = prime; - else - _gnutls_mpi_release(&prime); - return g; - default: - gnutls_assert(); - return NULL; - } -} - MPI gnutls_calc_dh_key(MPI f, MPI x, MPI prime) { MPI k; k = gcry_mpi_alloc_like(prime); - if (k==NULL) + if (k == NULL) return NULL; gcry_mpi_powm(k, f, x, prime); return k; diff --git a/lib/gnutls_dh.h b/lib/gnutls_dh.h index 5bf86da8d5..9426ee2701 100644 --- a/lib/gnutls_dh.h +++ b/lib/gnutls_dh.h @@ -21,5 +21,6 @@ MPI gnutls_get_dh_params(MPI *ret_p, int bits); MPI gnutls_calc_dh_secret( MPI *ret_x, MPI g, MPI prime ); MPI gnutls_calc_dh_key( MPI f, MPI x, MPI prime ); +int _gnutls_dh_generate_prime(MPI *ret_g, MPI* ret_n, int bits); #define DEFAULT_BITS 1024 diff --git a/lib/gnutls_dh_primes.c b/lib/gnutls_dh_primes.c new file mode 100644 index 0000000000..77e640e8ba --- /dev/null +++ b/lib/gnutls_dh_primes.c @@ -0,0 +1,470 @@ +/* + * Copyright (C) 2000,2001 Nikos Mavroyanopoulos + * + * This file is part of GNUTLS. + * + * GNUTLS is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GNUTLS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <gnutls_int.h> +#include <gnutls_errors.h> +#include <gnutls_gcry.h> + +static uint8 DH_G_1024[] = { 0x02 }; +static uint8 DH_G_4096[] = { 0x05 }; +static uint8 DH_G_2048[] = { 0x05 }; +static uint8 DH_G_3072[] = { 0x0D }; + +static uint8 diffie_hellman_group1_prime[130] = { 0x04, + 0x00, 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, 0xE6, 0x53, 0x81, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF +}; + +/* prime - 4096 bits */ +static uint8 diffie_hellman_prime_4096[512] = { + 0x98, 0xb7, 0x3d, 0x66, 0xf1, 0x18, 0x61, + 0xa9, 0x36, 0xd9, 0xf1, 0xbf, 0x65, 0xbb, + 0x7c, 0x06, 0x10, 0x15, 0xe5, 0x24, 0x47, + 0xb5, 0x45, 0x7e, 0xbb, 0xdf, 0x59, 0xf4, + 0xf2, 0x59, 0x7d, 0xea, 0xe0, 0x0f, 0x06, + 0x42, 0xd8, 0xb1, 0x9b, 0x62, 0xf9, 0x81, + 0x05, 0xd7, 0xd5, 0x74, 0x7c, 0x39, 0x3b, + 0x6d, 0x57, 0xb7, 0xe9, 0x51, 0x0d, 0xb6, + 0xe5, 0x03, 0xf7, 0xf3, 0xac, 0x1b, 0x66, + 0x96, 0xb3, 0xf8, 0xa1, 0xe1, 0xc7, 0x9c, + 0xc7, 0x52, 0x19, 0x2a, 0x90, 0xe6, 0x1d, + 0xba, 0xf5, 0x15, 0xcb, 0x8b, 0x52, 0x88, + 0xcd, 0xf5, 0x50, 0x33, 0x04, 0xb8, 0x2f, + 0x2c, 0x01, 0x57, 0x82, 0x7c, 0x8a, 0xf0, + 0xa3, 0x73, 0x7e, 0x0c, 0x2d, 0x69, 0xd4, + 0x17, 0xf6, 0xd0, 0x6a, 0x32, 0x95, 0x6a, + 0x69, 0x40, 0xb0, 0x55, 0x4f, 0xf0, 0x1d, + 0xae, 0x3d, 0x5f, 0x01, 0x92, 0x14, 0x3a, + 0x73, 0x69, 0x5a, 0x8e, 0xea, 0x22, 0x52, + 0x44, 0xc2, 0xb8, 0x66, 0x1e, 0x26, 0x1a, + 0x5d, 0x8f, 0x46, 0x6b, 0x8d, 0x3c, 0x71, + 0xcf, 0x1d, 0x72, 0x8d, 0x2f, 0x03, 0x54, + 0xdb, 0xe9, 0x82, 0x60, 0xe5, 0xf6, 0x40, + 0x4b, 0x6b, 0xae, 0x0a, 0xb2, 0x30, 0xba, + 0x1c, 0x45, 0x7e, 0x3f, 0xfd, 0xf7, 0xdc, + 0xa6, 0xbb, 0x98, 0xc4, 0xca, 0xfc, 0x66, + 0xf3, 0x48, 0x47, 0xbf, 0xdb, 0xd7, 0xdc, + 0xff, 0x1d, 0xeb, 0xa0, 0x4e, 0xb6, 0xff, + 0x75, 0xdc, 0x0c, 0x1d, 0x93, 0x9e, 0xd5, + 0xb3, 0x68, 0xe7, 0x07, 0x29, 0x91, 0xf1, + 0xae, 0xfc, 0x7e, 0x3a, 0xea, 0xec, 0x40, + 0xfc, 0x70, 0x7f, 0xf3, 0x36, 0x81, 0xec, + 0x97, 0xa7, 0x0d, 0x71, 0x2c, 0x5c, 0x4f, + 0xd9, 0x00, 0xcf, 0x62, 0x56, 0xfb, 0x09, + 0x2d, 0x1b, 0x04, 0x3c, 0x00, 0xc8, 0x17, + 0xd7, 0x7d, 0x16, 0x20, 0x1e, 0x62, 0x9b, + 0xf4, 0x4f, 0xee, 0xa4, 0xbf, 0x0b, 0xde, + 0x51, 0x7c, 0x01, 0x76, 0x79, 0x73, 0x7d, + 0x7b, 0xec, 0xee, 0x14, 0xec, 0x83, 0xc3, + 0xb4, 0x42, 0x66, 0x19, 0x52, 0x19, 0x04, + 0x02, 0x71, 0x61, 0x5c, 0x78, 0xee, 0x5f, + 0x58, 0x1e, 0x5b, 0x2d, 0xf3, 0x0c, 0x6e, + 0x00, 0x0f, 0xd8, 0xf0, 0x86, 0xa1, 0x11, + 0xfd, 0x04, 0x07, 0xa6, 0xf7, 0x31, 0xb9, + 0xf6, 0x76, 0xfc, 0xea, 0xf0, 0x16, 0x98, + 0x37, 0x48, 0x1b, 0x0c, 0x32, 0x3f, 0x7e, + 0xfa, 0x02, 0x04, 0x2a, 0x48, 0x70, 0xb4, + 0xe3, 0xe0, 0xc1, 0x7f, 0x65, 0x70, 0xd0, + 0x71, 0x74, 0x86, 0xb7, 0x5d, 0xd4, 0x84, + 0xd5, 0x9d, 0x77, 0xf6, 0x72, 0x82, 0x4b, + 0x98, 0x8b, 0x49, 0x3a, 0x0b, 0x1e, 0x94, + 0x42, 0xf7, 0x0b, 0x3f, 0xec, 0xc2, 0x2b, + 0x7f, 0x55, 0xe2, 0x94, 0x48, 0xac, 0x04, + 0xb9, 0xb2, 0xb6, 0xca, 0xb4, 0x09, 0xe3, + 0xba, 0x6a, 0x55, 0x28, 0xf7, 0x8a, 0x73, + 0x4d, 0x21, 0xe1, 0xf4, 0xcd, 0x22, 0x15, + 0x9c, 0xe6, 0xcc, 0x1d, 0x9f, 0x81, 0x88, + 0x4c, 0x5a, 0x17, 0x9f, 0xe5, 0x8c, 0x85, + 0xf1, 0xa3, 0xcf, 0x6c, 0xa1, 0xbf, 0x5e, + 0x02, 0x61, 0xa8, 0x67, 0x6f, 0xb8, 0x20, + 0x1a, 0x4e, 0xf2, 0x05, 0xd7, 0xb4, 0x4b, + 0x3e, 0xca, 0x87, 0x49, 0x10, 0x16, 0xcc, + 0xc9, 0xe0, 0x1c, 0xc1, 0x83, 0xc7, 0xa0, + 0x54, 0x3d, 0x36, 0x17, 0x84, 0xc3, 0x84, + 0x2e, 0x5a, 0xe0, 0x75, 0x45, 0x01, 0xe6, + 0xf0, 0x3d, 0xf9, 0x33, 0x0a, 0xd9, 0x1e, + 0x66, 0x99, 0xb4, 0x21, 0xed, 0x6e, 0xda, + 0x6f, 0x37, 0x33, 0xdd, 0x8f, 0x25, 0x35, + 0x5e, 0x6c, 0x1e, 0x33, 0xc2, 0x41, 0x3f, + 0x58, 0x40, 0xbb, 0xe7, 0x2b, 0x54, 0xdb, + 0xd8, 0xcf, 0x3a, 0xba, 0x0c, 0xf1, 0x19, + 0xec, 0x9d, 0x50, 0xf6, 0x63, 0x22, 0x55, + 0x5e, 0x79, 0xd1, 0x3f, 0x46, 0x0f, 0xf3, + 0x7f +}; + +/* prime - 3072 bits */ +static uint8 diffie_hellman_prime_3072[384] = { + 0xd5, 0x6e, 0xc8, 0x1f, 0xe9, 0x80, 0x9e, + 0x56, 0x35, 0x6d, 0x6d, 0xdb, 0xfa, 0x47, + 0x75, 0xcd, 0xfa, 0x32, 0x52, 0x1a, 0xc8, + 0xad, 0xee, 0xb0, 0xdb, 0xb7, 0x07, 0x58, + 0xa6, 0x42, 0xfe, 0x59, 0xfb, 0xce, 0xe8, + 0x12, 0x63, 0x09, 0x9f, 0x5d, 0x15, 0x25, + 0x49, 0xf2, 0x61, 0x83, 0xd8, 0x5c, 0x81, + 0xdd, 0x4c, 0x26, 0xe6, 0x24, 0xce, 0x6a, + 0xa5, 0x07, 0x80, 0x1c, 0x3d, 0x94, 0xd1, + 0x5d, 0x73, 0xbd, 0x26, 0x48, 0x22, 0x25, + 0xdd, 0x2f, 0x64, 0xe5, 0xed, 0xb3, 0xa9, + 0x94, 0xb3, 0x96, 0x88, 0x5d, 0x06, 0x41, + 0x80, 0xf8, 0xe1, 0x3c, 0x8f, 0xa9, 0x5b, + 0x44, 0x7e, 0x32, 0xbd, 0x62, 0x37, 0xe1, + 0xde, 0x18, 0xe8, 0x12, 0x7d, 0x28, 0x7d, + 0x5c, 0xcf, 0xa9, 0x16, 0x0f, 0xdc, 0xc1, + 0x92, 0xe0, 0x43, 0xac, 0xd0, 0x25, 0x37, + 0x8e, 0x5d, 0x4d, 0x26, 0x46, 0xbc, 0xc5, + 0x22, 0x05, 0x29, 0x41, 0x53, 0x2f, 0x7a, + 0x95, 0xa8, 0x36, 0xed, 0x85, 0xac, 0xf3, + 0xde, 0x0c, 0xbe, 0xa9, 0xfa, 0xc4, 0xa6, + 0x0b, 0x23, 0xfc, 0x7c, 0x77, 0xdc, 0x7c, + 0x94, 0x9b, 0x7c, 0xe0, 0x3b, 0xa1, 0x66, + 0x78, 0x85, 0x99, 0x5a, 0xba, 0x26, 0xa3, + 0xac, 0x97, 0xd4, 0x3a, 0x33, 0xee, 0xa3, + 0x96, 0xe0, 0x16, 0xdf, 0x61, 0xe7, 0x1f, + 0x35, 0xa5, 0x47, 0x54, 0x51, 0xce, 0x93, + 0x40, 0x6f, 0x40, 0x86, 0x3b, 0x17, 0x12, + 0xd3, 0x4d, 0x2e, 0xb3, 0x04, 0xf8, 0x8b, + 0x30, 0xb1, 0x27, 0xd7, 0xeb, 0xde, 0xd7, + 0xa9, 0x06, 0xfe, 0x6b, 0x59, 0x8c, 0x5d, + 0x9f, 0x93, 0x1f, 0x12, 0x65, 0xe6, 0xa6, + 0xeb, 0x5d, 0x4b, 0x9a, 0x16, 0x85, 0xce, + 0x18, 0x16, 0x5a, 0x5c, 0x3c, 0xeb, 0xc0, + 0xe1, 0x58, 0x64, 0x06, 0x38, 0x1c, 0x66, + 0x90, 0x4a, 0x30, 0xbe, 0x82, 0xe9, 0x9b, + 0x40, 0x2e, 0x6a, 0x91, 0x4f, 0x48, 0xc2, + 0x82, 0x40, 0xe9, 0xcd, 0x87, 0x77, 0x24, + 0xa7, 0xdc, 0x26, 0x05, 0x18, 0x9c, 0x8b, + 0x0e, 0x84, 0x29, 0x57, 0x76, 0x66, 0x7d, + 0x1e, 0x39, 0xc2, 0xf6, 0x2f, 0xbb, 0xeb, + 0x6e, 0x58, 0x3b, 0x11, 0x70, 0x75, 0xdb, + 0xe9, 0xf8, 0xcb, 0xd4, 0x4c, 0x84, 0xb3, + 0xcb, 0x66, 0x81, 0x4e, 0x93, 0xd9, 0x2f, + 0xc5, 0x60, 0x53, 0x69, 0x6e, 0xf3, 0x8e, + 0xa5, 0x6a, 0xa0, 0x96, 0xae, 0x31, 0xb6, + 0x12, 0x91, 0x0e, 0xc4, 0xc9, 0xd0, 0x50, + 0xf7, 0xbc, 0xe7, 0x78, 0xc9, 0x97, 0x02, + 0x26, 0x6a, 0xe3, 0x9a, 0x16, 0x63, 0xa2, + 0x5e, 0x1d, 0x4e, 0x71, 0x52, 0xb4, 0x73, + 0x31, 0x27, 0x6c, 0x46, 0xe4, 0x67, 0x02, + 0xde, 0x34, 0x7e, 0x24, 0x3b, 0xb9, 0xfe, + 0x08, 0x7e, 0xe9, 0x0a, 0xdc, 0xe7, 0xc2, + 0xa6, 0xa6, 0xb3, 0x7d, 0xe0, 0xa2, 0xe7, + 0x6d, 0x2e, 0x33, 0xed, 0x47, 0xf7 +}; + +/* prime - 2048 bits */ +static uint8 diffie_hellman_prime_2048[256] = { + 0xf0, 0x49, 0x65, 0x6d, 0x24, 0x61, 0xe6, + 0x86, 0x8e, 0x57, 0x2b, 0x9b, 0x1c, 0x53, + 0x2e, 0xef, 0xd2, 0x6e, 0xe5, 0x6c, 0xc4, + 0x0c, 0x77, 0x1d, 0xce, 0xc7, 0xe0, 0x92, + 0x78, 0x8b, 0x2b, 0x80, 0x9f, 0xc4, 0x59, + 0xb5, 0x2e, 0xeb, 0x81, 0x8b, 0xfa, 0x08, + 0x9f, 0x02, 0x5e, 0x94, 0x85, 0xab, 0xab, + 0x08, 0x8a, 0x71, 0xb5, 0x0c, 0x26, 0x63, + 0x2f, 0x34, 0x10, 0xdf, 0x32, 0x9a, 0xa1, + 0xd5, 0xb5, 0xd7, 0xa1, 0x46, 0x24, 0x9a, + 0xe3, 0x2a, 0xf1, 0x3a, 0x52, 0xc4, 0xa4, + 0xe6, 0xa2, 0x29, 0x5e, 0x49, 0x0e, 0x2a, + 0x4d, 0xad, 0xcd, 0x92, 0xb6, 0xa5, 0x25, + 0xe5, 0x09, 0xae, 0x76, 0xe4, 0x19, 0xec, + 0x29, 0x9b, 0x9b, 0xdb, 0x0c, 0xc8, 0x28, + 0x1c, 0x49, 0x11, 0x45, 0x30, 0x51, 0x73, + 0x31, 0x18, 0x9e, 0xa5, 0x89, 0x7d, 0x17, + 0x22, 0xd5, 0x49, 0xaf, 0xf6, 0xe5, 0x00, + 0x55, 0x7f, 0x2b, 0x33, 0x2d, 0x2f, 0x89, + 0x73, 0x0b, 0x4d, 0x44, 0x72, 0xb1, 0x2e, + 0xa3, 0x68, 0xbe, 0x52, 0x4e, 0x5a, 0x66, + 0x36, 0xf9, 0x2c, 0xe7, 0xce, 0x92, 0x4d, + 0x0c, 0xa3, 0xc7, 0x85, 0x7e, 0xe6, 0x97, + 0x02, 0x8b, 0x0c, 0xcb, 0xf3, 0x6f, 0x2e, + 0x04, 0xed, 0x6e, 0x75, 0xcf, 0xd1, 0xd4, + 0x9f, 0xd3, 0x44, 0x3e, 0x5f, 0x81, 0xaa, + 0xc1, 0xb8, 0xe2, 0xab, 0xed, 0x3b, 0xfc, + 0xeb, 0x47, 0x48, 0xee, 0xe5, 0xfd, 0xc2, + 0x79, 0x7a, 0x01, 0xe9, 0xab, 0xc6, 0x34, + 0x65, 0x6a, 0x0a, 0x6c, 0xe8, 0x89, 0xa6, + 0x96, 0xd2, 0x1e, 0xe5, 0xbe, 0x58, 0xf2, + 0xcf, 0x17, 0xb8, 0x75, 0x43, 0xec, 0x0b, + 0xb2, 0x91, 0x50, 0x93, 0x4c, 0xd2, 0xa3, + 0xa4, 0x8a, 0x67, 0x23, 0x7f, 0x86, 0xac, + 0xe3, 0x56, 0x9b, 0x18, 0x03, 0x03, 0x70, + 0x50, 0x7b, 0x1a, 0x02, 0x22, 0x0b, 0x93, + 0xc8, 0x9b, 0xa8, 0x8f +}; + +typedef struct { + gnutls_datum generator; + gnutls_datum prime; +} PRIME; + +PRIME dh_prime1024 = { {DH_G_1024, sizeof(DH_G_1024)}, {diffie_hellman_group1_prime, sizeof diffie_hellman_group1_prime}}; +PRIME dh_prime2048 = { {DH_G_2048, sizeof(DH_G_2048)}, {diffie_hellman_prime_2048, sizeof diffie_hellman_prime_2048}}; +PRIME dh_prime4096 = { {DH_G_4096, sizeof(DH_G_4096)}, {diffie_hellman_prime_4096, sizeof diffie_hellman_prime_4096}}; +PRIME dh_prime3072 = { {DH_G_3072, sizeof(DH_G_3072)}, {diffie_hellman_prime_3072, sizeof diffie_hellman_prime_3072}}; + + +/* returns g and p, depends on the requested bits. + * We only support limited key sizes. + */ +MPI gnutls_get_dh_params(MPI * ret_p, int bits) +{ + MPI g, prime; + size_t n; + + if (bits >= 4096) + bits = 4096; + else if (bits <= 1024) + bits = 1024; + else if (bits <= 2048) + bits = 2048; + else if (bits <= 3072) + bits = 3072; + else if (bits <= 4096) + bits = 4096; + + switch (bits) { + case 1024: + n = dh_prime1024.prime.size; + + if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, + dh_prime1024.prime.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + n = dh_prime1024.generator.size; + if (gcry_mpi_scan(&g, GCRYMPI_FMT_USG, + dh_prime1024.generator.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + if (ret_p) + *ret_p = prime; + else + _gnutls_mpi_release(&prime); + return g; + case 2048: + n = dh_prime2048.prime.size; + + if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, + dh_prime2048.prime.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + n = dh_prime2048.generator.size; + if (gcry_mpi_scan(&g, GCRYMPI_FMT_USG, + dh_prime2048.generator.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + if (ret_p) + *ret_p = prime; + else + _gnutls_mpi_release(&prime); + return g; + case 3072: + n = dh_prime3072.prime.size; + + if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, + dh_prime3072.prime.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + n = dh_prime3072.generator.size; + if (gcry_mpi_scan(&g, GCRYMPI_FMT_USG, + dh_prime3072.generator.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + if (ret_p) + *ret_p = prime; + else + _gnutls_mpi_release(&prime); + return g; + case 4096: + n = dh_prime4096.prime.size; + + if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, + dh_prime4096.prime.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + n = dh_prime4096.generator.size; + if (gcry_mpi_scan(&g, GCRYMPI_FMT_USG, + dh_prime4096.generator.data, &n) + || prime == NULL) { + gnutls_assert(); + return NULL; + } + + if (ret_p) + *ret_p = prime; + else + _gnutls_mpi_release(&prime); + return g; + default: + gnutls_assert(); + return NULL; + } +} + +/* These should be added in gcrypt.h */ +MPI _gcry_generate_elg_prime( int mode, unsigned pbits, unsigned qbits, + MPI g, MPI **ret_factors ); + +int _gnutls_dh_generate_prime(MPI *ret_g, MPI* ret_n, int bits) +{ + + MPI g, prime; + int qbits; + + g = mpi_new(16); /* this should be ok */ + if (g==NULL) { + gnutls_assert(); + return GNUTLS_E_MEMORY_ERROR; + } + + /* generate a random prime */ + /* this is an emulation of Michael Wiener's table + * bad emulation. + */ + qbits = 120 + (((bits / 256) - 1) * 20); + if (qbits & 1) /* better have a even one */ + qbits++; + + prime = _gcry_generate_elg_prime(0, bits, qbits, g, NULL); + if (prime==NULL || g==NULL) { + _gnutls_mpi_release( &g); + _gnutls_mpi_release( &prime); + gnutls_assert(); + return GNUTLS_E_MEMORY_ERROR; + } + + if (ret_g) *ret_g = g; + if (ret_n) *ret_n = prime; + + return 0; + +} + +/* Replaces the prime in the static DH parameters. + */ +static int _gnutls_dh_replace_prime( PRIME* sprime, int bits) +{ + + MPI prime, g; + int siz; + + gnutls_free( sprime->prime.data); + + if ( _gnutls_dh_generate_prime(&g, &prime, bits) < 0) { + gnutls_assert(); + return GNUTLS_E_MEMORY_ERROR; + } + + siz = 0; + gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &siz, g); + + sprime->generator.data = gnutls_malloc(siz); + if (sprime->generator.data==NULL) { + _gnutls_mpi_release(&g); + _gnutls_mpi_release(&prime); + return GNUTLS_E_MEMORY_ERROR; + } + + sprime->generator.size = siz; + gcry_mpi_print(GCRYMPI_FMT_USG, sprime->generator.data, &siz, g); + + _gnutls_mpi_release(&g); + + siz = 0; + gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &siz, prime); + + sprime->prime.data = gnutls_malloc(siz); + if (sprime->prime.data==NULL) { + _gnutls_mpi_release(&prime); + return GNUTLS_E_MEMORY_ERROR; + } + sprime->prime.size = siz; + gcry_mpi_print(GCRYMPI_FMT_USG, sprime->prime.data, &siz, prime); + + _gnutls_mpi_release(&prime); + + return 0; + +} + +/** + * gnutls_dh_generate_new_primes - This function will generate new primes + * + * This function will generate new primes for use in the Diffie-Hellman + * key exchange. This function should not be called when a key exchange + * is in progress, and is normally very slow. This function should be + * called in order to replace the included DH primes in the gnutls + * library. + **/ +int gnutls_dh_generate_new_primes() { +int ret; + ret = _gnutls_dh_replace_prime( &dh_prime1024, 1024); + if (ret < 0) { + gnutls_assert(); + return ret; + } + ret = _gnutls_dh_replace_prime( &dh_prime2048, 2048); + if (ret < 0) { + gnutls_assert(); + return ret; + } + ret = _gnutls_dh_replace_prime( &dh_prime3072, 3072); + if (ret < 0) { + gnutls_assert(); + return ret; + } + ret = _gnutls_dh_replace_prime( &dh_prime4096, 4096); + if (ret < 0) { + gnutls_assert(); + return ret; + } + return 0; +} diff --git a/lib/gnutls_record.h b/lib/gnutls_record.h index f2d67ff7e5..48a420dd39 100644 --- a/lib/gnutls_record.h +++ b/lib/gnutls_record.h @@ -1 +1,2 @@ AlertDescription gnutls_get_last_alert( GNUTLS_STATE state); +KXAlgorithm gnutls_get_current_kx( GNUTLS_STATE state); diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c index 2d33cd6d57..354d2e3f6b 100644 --- a/lib/gnutls_srp.c +++ b/lib/gnutls_srp.c @@ -27,109 +27,10 @@ #include <gnutls_gcry.h> #include "debug.h" -/* These should be added in gcrypt.h */ -MPI _gcry_generate_elg_prime( int mode, unsigned pbits, unsigned qbits, - MPI g, MPI **ret_factors ); /* Here functions for SRP (like g^x mod n) are defined */ -/* Taken from gsti -- this is n - */ - -const uint8 diffie_hellman_group1_prime[130] = { 0x04, 0x00, - 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, 0xE6, 0x53, 0x81, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -int _gnutls_srp_gn(opaque ** ret_g, opaque ** ret_n, int bits) -{ - - MPI g, prime; - size_t n; - int siz, qbits; - char *tmp; - - n = sizeof diffie_hellman_group1_prime; - - if (bits == n * 8) { - if (gcry_mpi_scan(&prime, GCRYMPI_FMT_USG, - diffie_hellman_group1_prime, &n)) { - gnutls_assert(); - return GNUTLS_E_MPI_SCAN_FAILED; - } - g = gcry_mpi_set_ui(NULL, SRP_G); - if (g==NULL) { - gnutls_assert(); - return GNUTLS_E_MEMORY_ERROR; - } - } else { - g = mpi_new(16); /* this should be ok */ - if (g==NULL) { - gnutls_assert(); - return GNUTLS_E_MEMORY_ERROR; - } - - /* generate a random prime */ - /* this is an emulation of Michael Wiener's table - * bad emulation. - */ - qbits = 120 + (((bits / 256) - 1) * 20); - if (qbits & 1) /* better have a even one */ - qbits++; - - prime = _gcry_generate_elg_prime(0, bits, qbits, g, NULL); - - } - - - siz = 0; - gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &siz, g); - if (ret_g != NULL) { - tmp = gnutls_malloc(siz); - if (tmp==NULL) return GNUTLS_E_MEMORY_ERROR; - - gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &siz, g); - - if (_gnutls_sbase64_encode(tmp, siz, ret_g) < 0) { - gnutls_free(tmp); - return GNUTLS_E_UNKNOWN_ERROR; - } - gnutls_free(tmp); - } - - siz = 0; - gcry_mpi_print(GCRYMPI_FMT_USG, NULL, &siz, prime); - if (ret_n != NULL) { - tmp = gnutls_malloc(siz); - if (tmp==NULL) return GNUTLS_E_MEMORY_ERROR; - - gcry_mpi_print(GCRYMPI_FMT_USG, tmp, &siz, prime); - if (_gnutls_sbase64_encode(tmp, siz, ret_n) < 0) { - gnutls_free(tmp); - return GNUTLS_E_UNKNOWN_ERROR; - } - - gnutls_free(tmp); - } - - _gnutls_mpi_release(&g); - _gnutls_mpi_release(&prime); - - return 0; - -} - int _gnutls_srp_gx(opaque * text, int textsize, opaque ** result, MPI g, MPI prime) |