From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 3 Apr 2004 16:31:06 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: gnutls_1_1_8~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc7c92e053ec4b1813b3090a1d3e7ec72d8288bb;p=thirdparty%2Fgnutls.git

*** empty log message ***
---

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index db5876317b..57b9c6e78f 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -194,7 +194,7 @@ gnutls_compression_entry _gnutls_compression_algorithms[MAX_COMP_METHODS] =
 	GNUTLS_COMPRESSION_ENTRY(GNUTLS_COMP_NULL, 0x00, 0, 0, 0),
 #ifdef HAVE_LIBZ
 	/* draft-ietf-tls-compression-02 */
-	GNUTLS_COMPRESSION_ENTRY(GNUTLS_COMP_ZLIB, 0x01, 15, 8, 3),
+	GNUTLS_COMPRESSION_ENTRY(GNUTLS_COMP_DEFLATE, 0x01, 15, 8, 3),
 #endif
 	{0, 0, 0, 0, 0, 0}
 };
diff --git a/lib/gnutls_compress_int.c b/lib/gnutls_compress_int.c
index 3bd2b0d5d3..9b98ca84be 100644
--- a/lib/gnutls_compress_int.c
+++ b/lib/gnutls_compress_int.c
@@ -57,7 +57,7 @@ int err;
 
 	switch( method) {
 #ifdef HAVE_LIBZ
-	    case GNUTLS_COMP_ZLIB: {
+	    case GNUTLS_COMP_DEFLATE: {
 		int window_bits, mem_level;
 		int comp_level;
 		z_stream* zhandle;
@@ -120,7 +120,7 @@ int err;
 			/* case GNUTLS_COMP_LZO:
 				break; */
 #ifdef HAVE_LIBZ
-			case GNUTLS_COMP_ZLIB:
+			case GNUTLS_COMP_DEFLATE:
 				if (d)
 					err = inflateEnd( handle->handle);
 				else
@@ -174,7 +174,7 @@ int err;
 			break;
 		}		
 #ifdef HAVE_LIBZ
-		case GNUTLS_COMP_ZLIB: {
+		case GNUTLS_COMP_DEFLATE: {
 			uLongf size;
 			z_stream *zhandle;
 			
@@ -274,7 +274,7 @@ int cur_pos;
 		}
 
 #ifdef HAVE_LIBZ
-		case GNUTLS_COMP_ZLIB: {
+		case GNUTLS_COMP_DEFLATE: {
 			uLongf out_size;
 			z_stream* zhandle;
 
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index efdc9a09b3..74d90419ad 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1381,7 +1381,7 @@ static int _gnutls_copy_ciphersuites(gnutls_session session,
 
 	datalen += sizeof(uint16) + cipher_num;
 
-	if (datalen > ret_data_size) {
+	if ((size_t)datalen > ret_data_size) {
 		gnutls_assert();
 		return GNUTLS_E_INTERNAL_ERROR;
 	}
@@ -1422,7 +1422,7 @@ static int _gnutls_copy_comp_methods(gnutls_session session,
 	datalen = pos = 0;
 	datalen += comp_num + 1;
 
-	if (datalen > ret_data_size) {
+	if ((size_t)datalen > ret_data_size) {
 		gnutls_assert();
 		return GNUTLS_E_INTERNAL_ERROR;
 	}
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 7d5c8df3f0..a5e5369a26 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -183,7 +183,7 @@ GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, GNUTLS_MAC_RMD160
 } gnutls_mac_algorithm;
 typedef gnutls_mac_algorithm gnutls_digest_algorithm;
 
-typedef enum gnutls_compression_method { GNUTLS_COMP_NULL=1, GNUTLS_COMP_ZLIB,
+typedef enum gnutls_compression_method { GNUTLS_COMP_NULL=1, GNUTLS_COMP_DEFLATE,
 	GNUTLS_COMP_LZO
 } gnutls_compression_method;