summaryrefslogtreecommitdiffstats
path: root/libvncclient
diff options
context:
space:
mode:
authordscho <dscho>2004-08-30 15:45:58 +0000
committerdscho <dscho>2004-08-30 15:45:58 +0000
commit97299606daab079cd88a096308487341c113ccec (patch)
treed8f51cfacae63482f330ce20c07dc373c341e893 /libvncclient
parent0d3b958b479e598b081b9848c34bb74aca9ee7fa (diff)
downloadlibtdevnc-97299606daab079cd88a096308487341c113ccec.tar.gz
libtdevnc-97299606daab079cd88a096308487341c113ccec.zip
global structures/functions should have "rfb", "sra" or "zrle" as prefix,
while structure members should not
Diffstat (limited to 'libvncclient')
-rw-r--r--libvncclient/rfbproto.c20
1 files changed, 10 insertions, 10 deletions
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"