Merge pull request #3777 from gpotter2/rename-rdpflags

Rename RDP_INFO flags to spec names

Author: matt335672

common/ms-rdpbcgr.h

@@ -152,13 +152,18 @@
 #define SEC_TAG_KEYSIG                 0x0008 /* BB_SIGNATURE_KEY_BLOB */
 
 /* Info Packet (TS_INFO_PACKET): flags (2.2.1.11.1.1) */
-/* TODO: to be renamed */
-#define RDP_LOGON_AUTO                 0x0008
-#define RDP_LOGON_NORMAL               0x0033
-#define RDP_COMPRESSION                0x0080
-#define RDP_LOGON_BLOB                 0x0100
-#define RDP_LOGON_LEAVE_AUDIO          0x2000
-#define RDP_LOGON_RAIL                 0x8000
+#define INFO_MOUSE                     0x00000001
+#define INFO_DISABLECTRLALTDEL         0x00000002
+#define INFO_AUTOLOGON                 0x00000008
+#define INFO_UNICODE                   0x00000010
+#define INFO_MAXIMIZESHELL             0x00000020
+#define INFO_LOGONNOTIFY               0x00000040
+#define INFO_COMPRESSION               0x00000080
+#define INFO_ENABLEWINDOWSKEY          0x00000100
+#define INFO_REMOTECONSOLEAUDIO        0x00002000
+#define INFO_RAIL                      0x00008000
+/* Windows always sends at least 0x33 */
+#define INFO_LOGON_NORMAL              (INFO_MOUSE | INFO_DISABLECTRLALTDEL | INFO_UNICODE | INFO_MAXIMIZESHELL)
 
 /* Extended Info Packet: clientAddress (2.2.1.11.1.1.1) */
 #define EXTENDED_INFO_MAX_CLIENT_ADDR_LENGTH 80

libxrdp/xrdp_sec.c

@@ -410,30 +410,30 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
     LOG_DEVEL(LOG_LEVEL_TRACE, "Parsing [MS-RDPBCGR] TS_INFO_PACKET");
 
     /* this is the first test that the decrypt is working */
-    if ((flags & RDP_LOGON_NORMAL) != RDP_LOGON_NORMAL) /* 0x33 */
+    if ((flags & INFO_LOGON_NORMAL) != INFO_LOGON_NORMAL) /* 0x33 */
     {
         /* must be or error */
         LOG(LOG_LEVEL_ERROR, "received wrong flags, likely decrypt not working");
         return 1;
     }
 
-    if (flags & RDP_LOGON_LEAVE_AUDIO)
+    if (flags & INFO_REMOTECONSOLEAUDIO)
     {
         self->rdp_layer->client_info.sound_code = 1;
         LOG_DEVEL(LOG_LEVEL_DEBUG, "[MS-RDPBCGR] TS_INFO_PACKET flag INFO_REMOTECONSOLEAUDIO found");
         LOG(LOG_LEVEL_DEBUG,
             "Client requested that audio on the server be played on the server.");
     }
 
-    if (flags & RDP_LOGON_RAIL)
+    if (flags & INFO_RAIL)
     {
         self->rdp_layer->client_info.rail_enable = 1;
         LOG_DEVEL(LOG_LEVEL_DEBUG, "[MS-RDPBCGR] TS_INFO_PACKET flag INFO_RAIL found");
         LOG(LOG_LEVEL_DEBUG,
             "Client requested Remote Application Integrated Locally (RAIL).");
     }
 
-    if (flags & RDP_LOGON_AUTO)
+    if (flags & INFO_AUTOLOGON)
     {
         LOG_DEVEL(LOG_LEVEL_DEBUG, "[MS-RDPBCGR] TS_INFO_PACKET flag INFO_AUTOLOGON found");
         /* todo, for now not allowing autologon and mce both */
@@ -448,7 +448,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
         }
     }
 
-    if (flags & RDP_COMPRESSION)
+    if (flags & INFO_COMPRESSION)
     {
         LOG_DEVEL(LOG_LEVEL_DEBUG, "[MS-RDPBCGR] TS_INFO_PACKET flag INFO_COMPRESSION found, "
                   "CompressionType 0x%1.1x", (flags & 0x00001E00) >> 9);
@@ -574,7 +574,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
     // If we require credentials, don't continue if they're not provided
     if (self->rdp_layer->client_info.require_credentials)
     {
-        if ((flags & RDP_LOGON_AUTO) == 0)
+        if ((flags & INFO_AUTOLOGON) == 0)
         {
             LOG(LOG_LEVEL_ERROR, "Server is configured to require that the "
                 "client enable auto logon with credentials, but the client did "
@@ -590,7 +590,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
         }
     }
 
-    if (flags & RDP_LOGON_AUTO)
+    if (flags & INFO_AUTOLOGON)
     {
         if (ts_info_utf16_in(s, len_password, self->rdp_layer->client_info.password, sizeof(self->rdp_layer->client_info.password)) != 0)
         {
@@ -657,7 +657,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
 
     /* TODO: explain why the windows key flag is used to determine if the
        TS_EXTENDED_INFO_PACKET should be parsed */
-    if (flags & RDP_LOGON_BLOB) /* INFO_ENABLEWINDOWSKEY */
+    if (flags & INFO_ENABLEWINDOWSKEY)
     {
         if (!s_check_rem_and_log(s, 4, "Parsing [MS-RDPBCGR] TS_EXTENDED_INFO_PACKET "
                                  "clientAddressFamily and cbClientAddress"))