From 97299606daab079cd88a096308487341c113ccec Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Mon, 30 Aug 2004 15:45:58 +0000
Subject: global structures/functions should have "rfb", "sra" or "zrle" as
 prefix, while structure members should not

---
 libvncclient/rfbproto.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'libvncclient/rfbproto.c')

diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 4517b07..cc4da85 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -246,7 +246,7 @@ ConnectToRFBServer(rfbClient* client,const char *hostname, int port)
   return SetNonBlocking(client->sock);
 }
 
-static void rfbEncryptBytes(unsigned char *bytes, char *passwd);
+extern void rfbClientEncryptBytes(unsigned char* bytes, char* passwd);
 
 /*
  * InitialiseRFBConnection.
@@ -327,7 +327,7 @@ InitialiseRFBConnection(rfbClient* client)
         passwd[8] = '\0';
       }
 
-      rfbEncryptBytes(challenge, passwd);
+      rfbClientEncryptBytes(challenge, passwd);
 
       /* Lose the password from memory */
       for (i = strlen(passwd); i >= 0; i--) {
@@ -1136,14 +1136,14 @@ JpegSetSrcManager(j_decompress_ptr cinfo, uint8_t *compressedData,
 
 /* avoid name clashes with LibVNCServer */
 
-#define vncEncryptBytes rfbEncryptBytes
-#define vncEncryptAndStorePasswd rfbEncryptAndStorePasswdUnused
-#define vncDecryptPasswdFromFile rfbDecryptPasswdFromFileUnused
-#define vncRandomBytes rfbRandomBytesUnused
-#define des rfbDES
-#define deskey rfbDESKey
-#define usekey rfbUseKey
-#define cpkey rfbCPKey
+#define rfbEncryptBytes rfbClientEncryptBytes
+#define rfbEncryptAndStorePasswd rfbClientEncryptAndStorePasswdUnused
+#define rfbDecryptPasswdFromFile rfbClientDecryptPasswdFromFileUnused
+#define rfbRandomBytes rfbClientRandomBytesUnused
+#define rfbDes rfbClientDes
+#define rfbDesKey rfbClientDesKey
+#define rfbUseKey rfbClientUseKey
+#define rfbCPKey rfbClientCPKey
 
 #include "../libvncserver/vncauth.c"
 #include "../libvncserver/d3des.c"
-- 
cgit v1.2.1