Merge branch 'websockets' of https://github.com/kanaka/libvncserver into websockets

libvncserver/rfbcrypto_included.c

@@ -28,12 +28,12 @@
 
 void digestmd5(const struct iovec *iov, int iovcnt, void *dest)
 {
-    md5_context c;
+    struct md5_ctx c;
     int i;
 
     __md5_init_ctx(&c);
     for (i = 0; i < iovcnt; i++)
-	__md5_process_bytes(&c, iov[i].iov_base, iov[i].iov_len);
+	__md5_process_bytes(iov[i].iov_base, iov[i].iov_len, &c);
     __md5_finish_ctx(&c, dest);
 }
 
@@ -41,7 +41,7 @@ void digestsha1(const struct iovec *iov, int iovcnt, void *dest)
 {
     SHA1Context c;
     int i;
-    
+
     SHA1Reset(&c);
     for (i = 0; i < iovcnt; i++)
 	SHA1Input(&c, iov[i].iov_base, iov[i].iov_len);