From dec2c57079920c551cac9316e2d9a70e72adec0c Mon Sep 17 00:00:00 2001
From: jsorg71 <jsorg71>
Date: Wed, 29 Nov 2006 01:52:43 +0000
Subject: [PATCH] g_ for global variables

---
 libxrdp/xrdp_sec.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index f894e5fb..c80cb844 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -22,17 +22,17 @@
 
 #include "libxrdp.h"
 
-static char pad_54[40] =
+static char g_pad_54[40] =
 { 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
   54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
   54, 54, 54, 54, 54, 54, 54, 54 };
 
-static char pad_92[48] =
+static char g_pad_92[48] =
 { 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
   92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
   92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92 };
 
-static char lic1[322] =
+static char g_lic1[322] =
 { 0x80, 0x00, 0x3e, 0x01, 0x01, 0x02, 0x3e, 0x01,
   0x7b, 0x3c, 0x31, 0xa6, 0xae, 0xe8, 0x74, 0xf6,
   0xb4, 0xa5, 0x03, 0x90, 0xe7, 0xc2, 0xc7, 0x39,
@@ -75,13 +75,13 @@ static char lic1[322] =
   0x6f, 0x73, 0x6f, 0x66, 0x74, 0x2e, 0x63, 0x6f,
   0x6d, 0x00 };
 
-static char lic2[20] =
+static char g_lic2[20] =
 { 0x80, 0x00, 0x10, 0x00, 0xff, 0x02, 0x10, 0x00,
   0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
   0x28, 0x14, 0x00, 0x00 };
 
 /*****************************************************************************/
-static void
+static void APP_CC
 hex_to_bin(char* in, char* out)
 {
   int val;
@@ -301,12 +301,12 @@ xrdp_sec_update(char* key, char* update_key, int key_len)
   rc4_info = ssl_rc4_info_create();
   ssl_sha1_clear(sha1_info);
   ssl_sha1_transform(sha1_info, update_key, key_len);
-  ssl_sha1_transform(sha1_info, pad_54, 40);
+  ssl_sha1_transform(sha1_info, g_pad_54, 40);
   ssl_sha1_transform(sha1_info, key, key_len);
   ssl_sha1_complete(sha1_info, shasig);
   ssl_md5_clear(md5_info);
   ssl_md5_transform(md5_info, update_key, key_len);
-  ssl_md5_transform(md5_info, pad_92, 48);
+  ssl_md5_transform(md5_info, g_pad_92, 48);
   ssl_md5_transform(md5_info, shasig, 20);
   ssl_md5_complete(md5_info, key);
   ssl_rc4_set_key(rc4_info, key, key_len);
@@ -449,7 +449,7 @@ xrdp_sec_send_lic_initial(struct xrdp_sec* self)
     free_stream(s);
     return 1;
   }
-  out_uint8a(s, lic1, 322);
+  out_uint8a(s, g_lic1, 322);
   s_mark_end(s);
   if (xrdp_mcs_send(self->mcs_layer, s) != 0)
   {
@@ -474,7 +474,7 @@ xrdp_sec_send_lic_response(struct xrdp_sec* self)
     free_stream(s);
     return 1;
   }
-  out_uint8a(s, lic2, 20);
+  out_uint8a(s, g_lic2, 20);
   s_mark_end(s);
   if (xrdp_mcs_send(self->mcs_layer, s) != 0)
   {
@@ -665,13 +665,13 @@ xrdp_sec_sign(struct xrdp_sec* self, char* out, int out_len,
   md5_info = ssl_md5_info_create();
   ssl_sha1_clear(sha1_info);
   ssl_sha1_transform(sha1_info, self->sign_key, self->rc4_key_len);
-  ssl_sha1_transform(sha1_info, pad_54, 40);
+  ssl_sha1_transform(sha1_info, g_pad_54, 40);
   ssl_sha1_transform(sha1_info, lenhdr, 4);
   ssl_sha1_transform(sha1_info, data, data_len);
   ssl_sha1_complete(sha1_info, shasig);
   ssl_md5_clear(md5_info);
   ssl_md5_transform(md5_info, self->sign_key, self->rc4_key_len);
-  ssl_md5_transform(md5_info, pad_92, 48);
+  ssl_md5_transform(md5_info, g_pad_92, 48);
   ssl_md5_transform(md5_info, shasig, 20);
   ssl_md5_complete(md5_info, md5sig);
   g_memcpy(out, md5sig, out_len);