summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2004-04-03 16:31:17 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2004-04-03 16:31:17 +0000
commit04f22137403191c24b5fc3f3947a62eb72a2a702 (patch)
treeb2854fd427a6e60a48f6801c9991df05068ff7b2
parent833017d9789d6906eeba16bce0e043aadeacb1c2 (diff)
downloadgnutls-04f22137403191c24b5fc3f3947a62eb72a2a702.tar.gz
*** empty log message ***
-rw-r--r--lib/gnutls_algorithms.c2
-rw-r--r--lib/gnutls_compress_int.c8
-rw-r--r--lib/gnutls_int.h2
3 files changed, 6 insertions, 6 deletions
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_int.h b/lib/gnutls_int.h
index 09d9f6faba..5988a7f2f9 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;