Added a special error code for cases where the peer (server) supports only export...

diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 882d4603f431591e9b87da6f998ddc833b90e21d..1ce51c758a2b24047382f3925a361a2c7f6273dd 100644 (file)
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -86,6 +86,7 @@ static gnutls_error_entry error_algorithms[] = {
        GNUTLS_ERROR_ENTRY( GNUTLS_E_PARSING_ERROR, 1),
        GNUTLS_ERROR_ENTRY( GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE, 0),
        GNUTLS_ERROR_ENTRY( GNUTLS_E_PULL_ERROR, 1),
+       GNUTLS_ERROR_ENTRY( GNUTLS_E_EXPORT_CIPHER_SUITE, 1),
        GNUTLS_ERROR_ENTRY( GNUTLS_E_PUSH_ERROR, 1),
        GNUTLS_ERROR_ENTRY( GNUTLS_E_RECORD_LIMIT_REACHED, 1),
        GNUTLS_ERROR_ENTRY( GNUTLS_E_X509_CERTIFICATE_ERROR, 1),

diff --git a/lib/gnutls_errors_int.h b/lib/gnutls_errors_int.h
index 2d7a4f0e6ae0a78aba6081f3bee4886be28e131b..e13ee70d67ce40b8c06aaedcf3f716b3ed577879 100644 (file)
--- a/lib/gnutls_errors_int.h
+++ b/lib/gnutls_errors_int.h
@@ -84,6 +84,7 @@
  */
 #define GNUTLS_E_INIT_LIBEXTRA -82
 #define GNUTLS_E_LIBRARY_VERSION_MISMATCH -82
+#define GNUTLS_E_EXPORT_CIPHER_SUITE -83
 
 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -250
 

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index faea7d8e482ada1c85fb430667b9ab9708fd0e42..da9aca55810d767ec8d47de4e63aa086dbb3d1ab 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1055,6 +1055,8 @@ int _gnutls_recv_handshake(GNUTLS_STATE state, uint8 ** data,
        return ret;
 }
 
+const static opaque EXPORT_CIPHERSUITE[2] = { 0x00, 0x03 };
+
 /* This function checks if the given cipher suite is supported, and sets it
  * to the state;
  */
@@ -1066,6 +1068,11 @@ static int _gnutls_client_set_ciphersuite(GNUTLS_STATE state,
        uint16 x;
        int i, err;
 
+       if ( memcmp( suite, EXPORT_CIPHERSUITE, 2)==0) {
+               gnutls_assert();
+               return GNUTLS_E_EXPORT_CIPHER_SUITE;
+       } 
+
        z = 1;
        x = _gnutls_supported_ciphersuites(state, &cipher_suites);
        for (i = 0; i < x; i++) {
@@ -1294,6 +1301,7 @@ static int _gnutls_read_server_hello(GNUTLS_STATE state, char *data,
        return ret;
 }
 
+
 /* This function copies the appropriate ciphersuites, to a localy allocated buffer 
  * Needed in client hello messages. Returns the new data length.
  */
@@ -1329,29 +1337,33 @@ static int _gnutls_copy_ciphersuites(GNUTLS_STATE state,
        }
 
 
-       x = ret;
+       x = ret + 1; /* add 1 for the export cipher suite */
        x *= sizeof(uint16);    /* in order to get bytes */
-
+ 
        datalen = pos = 0;
 
        datalen += sizeof(uint16) + x;
 
        *ret_data = gnutls_malloc(datalen);
-
-
        if (*ret_data == NULL) {
                gnutls_assert();
                return GNUTLS_E_MEMORY_ERROR;
        }
 
 
+        /* add 2 for the export cipher suite 
+         */
        _gnutls_write_uint16(x, *ret_data);
        pos += 2;
 
-       for (i = 0; i < x / 2; i++) {
-               memcpy(&(*ret_data)[pos], cipher_suites[i].CipherSuite, 2);
+       for (i = 0; i < (x / 2) - 1; i++) {
+               memcpy( &(*ret_data)[pos], cipher_suites[i].CipherSuite, 2);
                pos += 2;
        }
+
+       memcpy( &(*ret_data)[pos], EXPORT_CIPHERSUITE, 2);
+       pos += 2;
+
        gnutls_free(cipher_suites);
 
        return datalen;
@@ -1429,9 +1441,7 @@ static int _gnutls_send_client_hello(GNUTLS_STATE state, int again)
                /* 2 for version, (4 for unix time + 28 for random bytes==TLS_RANDOM_SIZE) 
                 */
                 
-               data = gnutls_malloc(datalen + 16);     /* 16 is added to avoid realloc
-                                                        * if no much data are added.
-                                                        */
+               data = gnutls_malloc(datalen);
                if (data == NULL) {
                        gnutls_assert();
                        return GNUTLS_E_MEMORY_ERROR;