removed all things about exportable algorithms

4 files changed, 5 insertions, 10 deletions

diff --git a/lib/debug.c b/lib/debug.c
index a927e95fe4..700fef9e48 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -70,8 +70,6 @@ void _gnutls_print_state(GNUTLS_STATE state)
 		state->security_parameters.key_size);
 	fprintf(stderr, "Key Material: %d\n",
 		state->security_parameters.key_material_length);
-	fprintf(stderr, "Exportable: %d\n",
-		state->security_parameters.is_exportable);
 	fprintf(stderr, "MAC algorithm: %d\n",
 		state->security_parameters.mac_algorithm);
 	fprintf(stderr, "Hash size: %d\n",
diff --git a/lib/gnutls.h b/lib/gnutls.h
index 2144437b9c..fbb08a6f0c 100644
--- a/lib/gnutls.h
+++ b/lib/gnutls.h
@@ -20,6 +20,7 @@
 
 enum ContentType { GNUTLS_APPLICATION_DATA=23 };
 typedef enum ContentType ContentType;
+#define GNUTLS_AES GNUTLS_RIJNDAEL
 enum BulkCipherAlgorithm { GNUTLS_NULL, GNUTLS_ARCFOUR=1, GNUTLS_3DES = 4, GNUTLS_RIJNDAEL };
 typedef enum BulkCipherAlgorithm BulkCipherAlgorithm;
 enum KXAlgorithm { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_DH_DSS, GNUTLS_KX_DH_RSA, GNUTLS_KX_ANON_DH };
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index 97c4872b06..c3405d1962 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -139,8 +139,7 @@ int _gnutls_set_cipher(GNUTLS_STATE state, BulkCipherAlgorithm algo)
 			state->security_parameters.cipher_type =
 			    CIPHER_STREAM;
 		}
-		state->security_parameters.is_exportable =
-		    EXPORTABLE_FALSE;
+
 		state->security_parameters.key_material_length =
 		    state->security_parameters.key_size =
 		    _gnutls_cipher_get_key_size(algo);
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index ca7623c765..268fbbf30c 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -3,7 +3,7 @@
 #define GNUTLS_INT_H
 
 //#define HANDSHAKE_DEBUG
-//#define HARD_DEBUG
+#define HARD_DEBUG
 //#define READ_DEBUG
 //#define WRITE_DEBUG
 #define DEBUG
@@ -87,7 +87,6 @@ enum BulkCipherAlgorithm { GNUTLS_NULL, GNUTLS_ARCFOUR=1, GNUTLS_3DES = 4, GNUTL
 enum KXAlgorithm { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_DH_DSS, GNUTLS_KX_DH_RSA, GNUTLS_KX_ANON_DH };
 enum KeyExchangeAlgorithm { GNUTLS_RSA, GNUTLS_DIFFIE_HELLMAN };
 enum CipherType { CIPHER_STREAM, CIPHER_BLOCK };
-enum IsExportable { EXPORTABLE_TRUE, EXPORTABLE_FALSE };
 enum MACAlgorithm { GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA };
 enum CompressionMethod { GNUTLS_COMPRESSION_NULL, GNUTLS_ZLIB=224 };
 
@@ -101,7 +100,6 @@ typedef enum ResumableSession ResumableSession;
 typedef enum ConnectionEnd ConnectionEnd;
 typedef enum BulkCipherAlgorithm BulkCipherAlgorithm;
 typedef enum CipherType CipherType;
-typedef enum IsExportable IsExportable;
 typedef enum MACAlgorithm MACAlgorithm;
 typedef enum CompressionMethod CompressionMethod;
 
@@ -112,13 +110,12 @@ typedef struct {
 	ConnectionEnd entity;
 	BulkCipherAlgorithm bulk_cipher_algorithm;
 	CipherType cipher_type;
+	MACAlgorithm mac_algorithm;
+	CompressionMethod compression_algorithm;
 	uint8 IV_size;
 	uint8 key_size;
 	uint8 key_material_length;
-	IsExportable is_exportable;
-	MACAlgorithm mac_algorithm;
 	uint8 hash_size;
-	CompressionMethod compression_algorithm;
 	opaque master_secret[48];
 	opaque client_random[32];
 	opaque server_random[32];