Corrected bug in gnutls_dh_params_set(). Corrected bug in session resuming code of...

diff --git a/NEWS b/NEWS
index 75913f8d298d30e832b1a577db19deeb26dd21ec..4b97eb7d4e3675f7a78f949b124b0125f8b26b88 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ Version 0.5.7
 - Some fixes in the memory allocation functions (realloc).
 - Improved the string functions used in XML certificate generation.
 - Removed dependency on libgdbm.
+- Corrected bug in gnutls_dh_params_set()
+- Corrected bug in session resuming code in server side.
 
 Version 0.5.6 (6/09/2002)
 - Corrected bugs in SRP implementation, which prevented gnutls 

diff --git a/lib/gnutls_db.c b/lib/gnutls_db.c
index 770d935e82beea61aaa4b92f8b54a7bf74f1b302..3b7290da27b5a7c27263792278732d867d04933a 100644 (file)
--- a/lib/gnutls_db.c
+++ b/lib/gnutls_db.c
@@ -225,6 +225,7 @@ int ret;
        ret = gnutls_session_set_data( session, data.data, data.size);
        if (ret < 0) {
                gnutls_assert();
+               return ret;
        }
        
        /* Note: Data is not allocated with gnutls_malloc

diff --git a/lib/gnutls_dh_primes.c b/lib/gnutls_dh_primes.c
index 292639b231c2e8ba30b30ed0dde35c97a1f7369b..c9a84b5a69cc00d9fcf7f4e2bf5761eedcdb91c9 100644 (file)
--- a/lib/gnutls_dh_primes.c
+++ b/lib/gnutls_dh_primes.c
@@ -582,15 +582,15 @@ int gnutls_dh_params_set(gnutls_dh_params dh_params, gnutls_datum prime,
        sprime->_prime = tmp_prime;
        sprime->_generator = tmp_g;
 
-/*     sprime->_prime = _gnutls_mpi_copy(tmp_prime);
-       sprime->_generator = _gnutls_mpi_copy(tmp_g);
-*/
+       sprime->generator.data = NULL;
+       sprime->prime.data = NULL;
+
        if (gnutls_set_datum(&sprime->prime, prime.data, prime.size) < 0) {
                gnutls_assert();
                return GNUTLS_E_MEMORY_ERROR;
        }
        if (gnutls_set_datum
-           (&sprime->prime, generator.data, generator.size) < 0) {
+           (&sprime->generator, generator.data, generator.size) < 0) {
                gnutls_assert();
                return GNUTLS_E_MEMORY_ERROR;
        }

diff --git a/lib/gnutls_rsa_export.c b/lib/gnutls_rsa_export.c
index cd79fcc1d55c1c69be1fda53eced75a10a03d374..48336c1ebaf2f6609f09ab0368a7f17a5846e67b 100644 (file)
--- a/lib/gnutls_rsa_export.c
+++ b/lib/gnutls_rsa_export.c
@@ -150,7 +150,7 @@ int _gnutls_rsa_generate_params(GNUTLS_MPI* resarr, int bits)
 
 }
 
-/* returns a negative value if the bits is not supported 
+/* returns a negative value if the bits size is not supported 
  */
 static int check_bits(int bits)
 {