summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2002-09-17 17:57:59 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2002-09-17 17:57:59 +0000
commit61d4c25ee8c5c48cc68ff79ce6293da84b798634 (patch)
treeb605220748dffe51d51bcc1105ce0c4eee85de9e /src
parent2629ceb42edbdefe10ca3edfe1cfd96069a81561 (diff)
downloadgnutls-61d4c25ee8c5c48cc68ff79ce6293da84b798634.tar.gz
Added support for the LZO compression library in gnutls-extra. Some fixes in the hello message parsing.
Diffstat (limited to 'src')
-rw-r--r--src/cli.c4
-rw-r--r--src/serv.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/cli.c b/src/cli.c
index d8cef2a912..87938433d2 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -607,8 +607,10 @@ void gaa_parser(int argc, char **argv)
for (j = i = 0; i < info.ncomp; i++) {
if (strncasecmp(info.comp[i], "NUL", 3) == 0)
comp_priority[j++] = GNUTLS_COMP_NULL;
- if (strncasecmp(info.comp[i], "ZLI", 1) == 0)
+ if (strncasecmp(info.comp[i], "ZLI", 3) == 0)
comp_priority[j++] = GNUTLS_COMP_ZLIB;
+ if (strncasecmp(info.comp[i], "LZO", 3) == 0)
+ comp_priority[j++] = GNUTLS_COMP_LZO;
}
comp_priority[j] = 0;
}
diff --git a/src/serv.c b/src/serv.c
index 9b62336fab..d0c6a3c317 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -239,7 +239,7 @@ int cipher_priority[16] =
GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_ARCFOUR_40, 0
};
-int comp_priority[16] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
+int comp_priority[16] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_LZO, GNUTLS_COMP_NULL, 0 };
int mac_priority[16] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
int cert_type_priority[16] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
@@ -994,8 +994,10 @@ void gaa_parser(int argc, char **argv)
for (j = i = 0; i < info.ncomp; i++) {
if (strncasecmp(info.comp[i], "NUL", 3) == 0)
comp_priority[j++] = GNUTLS_COMP_NULL;
- if (strncasecmp(info.comp[i], "ZLI", 1) == 0)
+ if (strncasecmp(info.comp[i], "ZLI", 3) == 0)
comp_priority[j++] = GNUTLS_COMP_ZLIB;
+ if (strncasecmp(info.comp[i], "LZO", 3) == 0)
+ comp_priority[j++] = GNUTLS_COMP_LZO;
}
comp_priority[j] = 0;
}