security change for none

libxrdp/xrdp_sec.c

@@ -1281,7 +1281,7 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan)
         {
             xrdp_sec_fips_establish_keys(self);
         }
-        else
+        else if (self->crypt_method != CRYPT_METHOD_NONE)
         {
             xrdp_sec_establish_keys(self);
         }
@@ -2178,7 +2178,8 @@ xrdp_sec_incoming(struct xrdp_sec *self)
             DEBUG(("xrdp_sec_incoming: xrdp_sec_init_rdp_security failed"));
             return 1;
         }
-
+        if (self->crypt_method != CRYPT_METHOD_NONE)
+        {
             g_memset(key_file, 0, sizeof(char) * 256);
             g_random(self->server_random, 32);
             items = list_create();
@@ -2223,10 +2224,10 @@ xrdp_sec_incoming(struct xrdp_sec *self)
                     hex_str_to_bin(value, self->pri_exp, self->rsa_key_bytes);
                 }
             }
-
             list_delete(items);
             list_delete(values);
         }
+    }
 
     /* negotiate mcs layer */
     if (xrdp_mcs_incoming(self->mcs_layer) != 0)