Index: new/ui/vnc.c
===================================================================
---- new.orig/ui/vnc.c 2012-02-09 13:22:48.000000000 +0100
-+++ new/ui/vnc.c 2012-02-09 13:23:09.000000000 +0100
+--- new.orig/ui/vnc.c 2012-03-13 07:25:34.000000000 +0100
++++ new/ui/vnc.c 2012-03-13 07:25:44.000000000 +0100
@@ -42,6 +42,125 @@
#include "vnc_keysym.h"
#include "d3des.h"
static VncDisplay *vnc_display; /* needed for info vnc */
static DisplayChangeListener *dcl;
-@@ -1841,7 +1960,7 @@
+@@ -1896,7 +2015,7 @@
static void set_pixel_conversion(VncState *vs)
{
if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
!memcmp(&(vs->clientds.pf), &(vs->ds->surface->pf), sizeof(PixelFormat))) {
vs->write_pixels = vnc_write_pixels_copy;
vnc_hextile_set_pixel_conversion(vs, 0);
-@@ -1927,7 +2046,7 @@
+@@ -1982,7 +2101,7 @@
vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
vnc_write_u8(vs, 0);
vnc_write_u16(vs, 1); /* number of rects */
ds_get_height(vs->ds), VNC_ENCODING_WMVi);
pixel_format_message(vs);
vnc_unlock_output(vs);
-@@ -2754,7 +2873,7 @@
+@@ -2873,7 +2992,7 @@
char *vnc_display_local_addr(DisplayState *ds)
{
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
-@@ -2803,6 +2922,7 @@
+@@ -2923,6 +3042,7 @@
tls = 1; /* Require TLS */
} else if (strncmp(options, "x509", 4) == 0) {
char *start, *end;
x509 = 1; /* Require x509 certificates */
if (strncmp(options, "x509verify", 10) == 0)
vs->tls.x509verify = 1; /* ...and verify client certs */
-@@ -2825,10 +2945,12 @@
+@@ -2945,10 +3065,12 @@
}
g_free(path);
} else {
}
#endif
#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
-@@ -2881,10 +3003,10 @@
+@@ -3014,10 +3136,10 @@
vs->auth = VNC_AUTH_VENCRYPT;
if (x509) {
VNC_DEBUG("Initializing VNC server with x509 password auth\n");
#endif /* CONFIG_VNC_TLS */
Index: new/ui/vnc-auth-vencrypt.c
===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c 2012-02-09 13:15:26.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c 2012-02-09 13:23:09.000000000 +0100
+--- new.orig/ui/vnc-auth-vencrypt.c 2012-03-12 06:44:56.000000000 +0100
++++ new/ui/vnc-auth-vencrypt.c 2012-03-13 07:25:44.000000000 +0100
@@ -25,7 +25,107 @@
*/
VNC_DEBUG("Start TLS auth VNC\n");
Index: new/ui/vnc.h
===================================================================
---- new.orig/ui/vnc.h 2012-02-09 13:15:26.000000000 +0100
-+++ new/ui/vnc.h 2012-02-09 13:23:09.000000000 +0100
-@@ -260,6 +260,8 @@
+--- new.orig/ui/vnc.h 2012-03-12 06:44:56.000000000 +0100
++++ new/ui/vnc.h 2012-03-13 07:25:44.000000000 +0100
+@@ -276,6 +276,8 @@
char challenge[VNC_AUTH_CHALLENGE_SIZE];
#ifdef CONFIG_VNC_TLS
int subauth; /* Used by VeNCrypt */
VncStateTLS tls;
#endif
#ifdef CONFIG_VNC_SASL
-@@ -553,4 +555,6 @@
+@@ -569,4 +571,6 @@
int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
void vnc_zrle_clear(VncState *vs);
#endif /* __QEMU_VNC_H */
Index: new/ui/vnc-tls.c
===================================================================
---- new.orig/ui/vnc-tls.c 2012-02-09 13:15:26.000000000 +0100
-+++ new/ui/vnc-tls.c 2012-02-09 13:23:09.000000000 +0100
+--- new.orig/ui/vnc-tls.c 2012-03-12 06:44:56.000000000 +0100
++++ new/ui/vnc-tls.c 2012-03-13 07:25:44.000000000 +0100
@@ -302,6 +302,14 @@
static int vnc_set_gnutls_priority(gnutls_session_t s, int x509)
const char *certdir)
Index: new/ui/vnc-tls.h
===================================================================
---- new.orig/ui/vnc-tls.h 2012-02-09 13:15:26.000000000 +0100
-+++ new/ui/vnc-tls.h 2012-02-09 13:23:09.000000000 +0100
+--- new.orig/ui/vnc-tls.h 2012-03-12 06:44:56.000000000 +0100
++++ new/ui/vnc-tls.h 2012-03-13 07:25:44.000000000 +0100
@@ -68,6 +68,8 @@
int vnc_tls_validate_certificate(VncState *vs);
Index: new/vl.c
===================================================================
---- new.orig/vl.c 2012-02-09 13:22:39.000000000 +0100
-+++ new/vl.c 2012-02-09 13:23:09.000000000 +0100
-@@ -2929,6 +2929,7 @@
+--- new.orig/vl.c 2012-03-13 07:25:22.000000000 +0100
++++ new/vl.c 2012-03-13 07:25:44.000000000 +0100
+@@ -3028,6 +3028,7 @@
break;
case QEMU_OPTION_id:
fairsched_id = atoi(optarg);
exit(1);
Index: new/console.h
===================================================================
---- new.orig/console.h 2012-02-09 13:30:11.000000000 +0100
-+++ new/console.h 2012-02-09 13:30:20.000000000 +0100
+--- new.orig/console.h 2012-03-12 06:44:55.000000000 +0100
++++ new/console.h 2012-03-13 07:25:44.000000000 +0100
@@ -371,6 +371,7 @@
void cocoa_display_init(DisplayState *ds, int full_screen);