35aa5183e5
- Fix yet more qcow2 corruption (#498405) - AIO cancellation fixes (#497170) - Fix VPC image size overflow (#491981) - Fix oops with 2.6.25 virtio guest (#470386) - Enable pulseaudio driver (#495964, #496627) - Fix cpuid initialization - Fix HPET emulation - Fix storage hotplug error handling - Migration fixes - Block range checking fixes - Make PCI config status register read-only - Handle newer Xorg keymap names - Don't leak memory on NIC hot-unplug - Hook up keypad keys for qemu console emulation - Correctly run on kernels lacking mmu notifiers - Support DDIM option ROMs - Fix PCI NIC error handling - Fix in-kernel LAPIC initialization - Fix broken e1000 PCI config space - Drop some patches which have been upstreamed - Drop the make-release script; we have an official tarball now
20 lines
521 B
Diff
20 lines
521 B
Diff
Index: qemu-kvm-0.10.4/vnc.c
|
|
===================================================================
|
|
--- qemu-kvm-0.10.4.orig/vnc.c
|
|
+++ qemu-kvm-0.10.4/vnc.c
|
|
@@ -2096,14 +2096,6 @@ static int protocol_client_vencrypt_auth
|
|
VNC_DEBUG("Failed to complete TLS\n");
|
|
return 0;
|
|
}
|
|
-
|
|
- if (vs->wiremode == VNC_WIREMODE_TLS) {
|
|
- VNC_DEBUG("Starting VeNCrypt subauth\n");
|
|
- return start_auth_vencrypt_subauth(vs);
|
|
- } else {
|
|
- VNC_DEBUG("TLS handshake blocked\n");
|
|
- return 0;
|
|
- }
|
|
}
|
|
return 0;
|
|
}
|