From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 15 Jul 2002 15:29:05 +0000 (+0000)
Subject: Client and server now accept the null cipher option.
X-Git-Tag: gnutls_0_5_1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=099900892bc87e627c01285e75a0c8185eef112b;p=thirdparty%2Fgnutls.git

Client and server now accept the null cipher option.
---

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;
    }