diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-04-18 17:26:15 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-04-18 18:14:22 +0200 |
commit | 444b5781386f3502c5d2014803cb29dd3c920a63 (patch) | |
tree | b8c7d7f5d3c84e11787070a686402360159cac9b | |
parent | b8efbfd783e2ff85d212772df3286a6824a6d2b2 (diff) | |
download | gnutls-444b5781386f3502c5d2014803cb29dd3c920a63.tar.gz |
Added better sanity checks in Diffie-Hellman key exchange.
-rw-r--r-- | lib/gnutls_dh.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/lib/gnutls_dh.c b/lib/gnutls_dh.c index 79eb062123..48dd092e72 100644 --- a/lib/gnutls_dh.c +++ b/lib/gnutls_dh.c @@ -106,28 +106,46 @@ fail: bigint_t gnutls_calc_dh_key (bigint_t f, bigint_t x, bigint_t prime) { - bigint_t k; + bigint_t k, ff, ret; int bits; - if (_gnutls_mpi_cmp_ui(f, 1) == 0) + ff = _gnutls_mpi_mod(f, prime); + _gnutls_mpi_add_ui(ff, ff, 1); + + /* check if f==0,1,p-1. + * or (ff=f+1) equivalently ff==1,2,p */ + if ((_gnutls_mpi_cmp_ui(ff, 2) == 0) || (_gnutls_mpi_cmp_ui(ff, 1) == 0) || + (_gnutls_mpi_cmp(ff,prime) == 0)) { gnutls_assert(); - return NULL; + ret = NULL; + goto cleanup; } bits = _gnutls_mpi_get_nbits (prime); if (bits <= 0 || bits > MAX_BITS) { gnutls_assert (); - return NULL; + ret = NULL; + goto cleanup; } k = _gnutls_mpi_alloc_like (prime); if (k == NULL) - return NULL; + { + gnutls_assert(); + ret = NULL; + goto cleanup; + } _gnutls_mpi_powm (k, f, x, prime); - return k; + + ret = k; + +cleanup: + _gnutls_mpi_release (&ff); + + return ret; } /*- |