@@ -759,8 +759,11 @@ init_key_type (struct key_type *kt, const char *ciphername,

 {

   bool aead_cipher = false;

+  ASSERT(ciphername);

+  ASSERT(authname);

+

   CLEAR (*kt);

-  if (ciphername)

+  if (strcmp (ciphername, "none") != 0)

     {

       kt->cipher = cipher_kt_get (translate_cipher_name_from_openvpn(ciphername));

       kt->cipher_length = cipher_kt_key_size (kt->cipher);

@@ -785,7 +788,7 @@ init_key_type (struct key_type *kt, const char *ciphername,

       if (warn)

 	msg (M_WARN, "******* WARNING *******: null cipher specified, no encryption will be used");

     }

-  if (authname)

+  if (strcmp (authname, "none") != 0)

     {

       if (!aead_cipher) { /* Ignore auth for AEAD ciphers */

 	kt->digest = md_kt_get (authname);

@@ -2266,7 +2266,7 @@ do_init_crypto_tls_c1 (struct context *c)

 	  /* Initialize key_type for tls-auth with auth only */

 	  CLEAR (c->c1.ks.tls_auth_key_type);

-	  if (options->authname)

+	  if (!streq (options->authname, "none"))

 	    {

 	      c->c1.ks.tls_auth_key_type.digest = md_kt_get (options->authname);

 	      c->c1.ks.tls_auth_key_type.hmac_length =

@@ -6659,19 +6659,11 @@ add_option (struct options *options,

     {

       VERIFY_PERMISSION (OPT_P_GENERAL);

       options->authname = p[1];

-      if (streq (options->authname, "none"))

-	{

-	  options->authname = NULL;

-	}

     }

   else if (streq (p[0], "cipher") && p[1] && !p[2])

     {

       VERIFY_PERMISSION (OPT_P_NCP);

       options->ciphername = p[1];

-      if (streq (options->ciphername, "none"))

-	{

-	  options->ciphername = NULL;

-	}

     }

   else if (streq (p[0], "ncp-ciphers") && p[1] && !p[2])

     {