Merge tag 'LibVNCServer-0.9.12'

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 5 insertions, 2 deletions

diff --git a/common/vncauth.c b/common/vncauth.c
index 9434ae4..53347d3 100644
--- a/common/vncauth.c
+++ b/common/vncauth.c
@@ -26,7 +26,9 @@
 #endif
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef LIBVNCSERVER_HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <rfb/rfbproto.h>
 #include "d3des.h"
 
@@ -200,8 +202,9 @@ rfbEncryptBytes2(unsigned char *where, const int length, unsigned char *key) {
     where[i] ^= key[i];
   rfbDes(where, where);
   for (i = 8; i < length; i += 8) {
-    for (j = 0; j < 8; j++)
+    for (j = 0; j < 8; j++) {
       where[i + j] ^= where[i + j - 8];
-      rfbDes(where + i, where + i);
+    }
+    rfbDes(where + i, where + i);
   }
 }