summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2002-07-15 15:29:05 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2002-07-15 15:29:05 +0000
commit099900892bc87e627c01285e75a0c8185eef112b (patch)
tree70a86daa3f914cec5a136717f2d797524b6637bd
parent8ab4c3800725a802d2c010a9d190740b0bfb3d9a (diff)
downloadgnutls-099900892bc87e627c01285e75a0c8185eef112b.tar.gz
Client and server now accept the null cipher option.
-rw-r--r--src/cli.c4
-rw-r--r--src/serv.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/cli.c b/src/cli.c
index c6156792e1..0fda8f1b51 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
}
if (gnutls_global_init_extra() < 0) {
- fprintf(stderr, "global state initialization error\n");
+ fprintf(stderr, "global state (extra) initialization error\n");
exit(1);
}
@@ -558,6 +558,8 @@ void gaa_parser(int argc, char **argv)
cipher_priority[j++] = GNUTLS_CIPHER_3DES_CBC;
if (strncasecmp(info.ciphers[i], "ARC", 3) == 0)
cipher_priority[j++] = GNUTLS_CIPHER_ARCFOUR;
+ if (strncasecmp(info.ciphers[i], "NUL", 3) == 0)
+ cipher_priority[j++] = GNUTLS_CIPHER_NULL;
}
cipher_priority[j] = 0;
}
diff --git a/src/serv.c b/src/serv.c
index df50e890a5..c256a9eaa1 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -455,7 +455,7 @@ int main(int argc, char **argv)
}
if (gnutls_global_init_extra() < 0) {
- fprintf(stderr, "global state initialization error\n");
+ fprintf(stderr, "global state (extra) initialization error\n");
exit(1);
}
@@ -900,6 +900,8 @@ void gaa_parser(int argc, char **argv)
cipher_priority[j++] = GNUTLS_CIPHER_3DES_CBC;
if (strncasecmp(info.ciphers[i], "ARC", 3) == 0)
cipher_priority[j++] = GNUTLS_CIPHER_ARCFOUR;
+ if (strncasecmp(info.ciphers[i], "NUL", 3) == 0)
+ cipher_priority[j++] = GNUTLS_CIPHER_NULL;
}
cipher_priority[j] = 0;
}