Client and server now accept the null cipher option.

diff --git a/src/cli.c b/src/cli.c
index c6156792e102aa0a7c5a90d9b5e592ffd734acfc..0fda8f1b515ee26e1a0e20d099678be4e9251cac 100644 (file)
--- 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 df50e890a5131fda5e2e6cf46e3bf2ac865d8bd8..c256a9eaa1557e7714972e9a755251a210a0b292 100644 (file)
--- 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;
    }