[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/25] ui/vnc: Split out authentication_failed
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 08/25] ui/vnc: Split out authentication_failed |
Date: |
Wed, 22 May 2019 14:42:09 -0400 |
There were 3 copies of this code, one of which used the wrong
data size for the failure indicator.
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
ui/vnc.c | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 1871422e1d..785edf3af1 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2535,6 +2535,18 @@ void start_client_init(VncState *vs)
vnc_read_when(vs, protocol_client_init, 1);
}
+static void authentication_failed(VncState *vs)
+{
+ vnc_write_u32(vs, 1); /* Reject auth */
+ if (vs->minor >= 8) {
+ static const char err[] = "Authentication failed";
+ vnc_write_u32(vs, sizeof(err));
+ vnc_write(vs, err, sizeof(err));
+ }
+ vnc_flush(vs);
+ vnc_client_error(vs);
+}
+
static void make_challenge(VncState *vs)
{
int i;
@@ -2609,14 +2621,7 @@ static int protocol_client_auth_vnc(VncState *vs,
uint8_t *data, size_t len)
return 0;
reject:
- vnc_write_u32(vs, 1); /* Reject auth */
- if (vs->minor >= 8) {
- static const char err[] = "Authentication failed";
- vnc_write_u32(vs, sizeof(err));
- vnc_write(vs, err, sizeof(err));
- }
- vnc_flush(vs);
- vnc_client_error(vs);
+ authentication_failed(vs);
qcrypto_cipher_free(cipher);
return 0;
}
@@ -2638,13 +2643,7 @@ static int protocol_client_auth(VncState *vs, uint8_t
*data, size_t len)
* must pick the one we sent. Verify this */
if (data[0] != vs->auth) { /* Reject auth */
trace_vnc_auth_reject(vs, vs->auth, (int)data[0]);
- vnc_write_u32(vs, 1);
- if (vs->minor >= 8) {
- static const char err[] = "Authentication failed";
- vnc_write_u32(vs, sizeof(err));
- vnc_write(vs, err, sizeof(err));
- }
- vnc_client_error(vs);
+ authentication_failed(vs);
} else { /* Accept requested auth */
trace_vnc_auth_start(vs, vs->auth);
switch (vs->auth) {
@@ -2673,13 +2672,7 @@ static int protocol_client_auth(VncState *vs, uint8_t
*data, size_t len)
default: /* Should not be possible, but just in case */
trace_vnc_auth_fail(vs, vs->auth, "Unhandled auth method", "");
- vnc_write_u8(vs, 1);
- if (vs->minor >= 8) {
- static const char err[] = "Authentication failed";
- vnc_write_u32(vs, sizeof(err));
- vnc_write(vs, err, sizeof(err));
- }
- vnc_client_error(vs);
+ authentication_failed(vs);
}
}
return 0;
--
2.17.1
- [Qemu-devel] [PULL 03/25] crypto: Reverse code blocks in random-platform.c, (continued)
- [Qemu-devel] [PULL 03/25] crypto: Reverse code blocks in random-platform.c, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 25/25] target/i386: Implement CPUID_EXT_RDRAND, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 23/25] target/ppc: Use gen_io_start/end around DARN, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 17/25] aspeed/scu: Use qemu_guest_getrandom_nofail, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 11/25] cpus: Initialize pseudo-random seeds for all guest cpus, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 22/25] target/arm: Implement ARMv8.5-RNG, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 15/25] linux-user/aarch64: Use qemu_guest_getrandom for PAUTH keys, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 16/25] linux-user: Remove srand call, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 05/25] crypto: Use O_CLOEXEC in qcrypto_random_init, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 06/25] crypto: Use getrandom for qcrypto_random_bytes, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 08/25] ui/vnc: Split out authentication_failed,
Richard Henderson <=
- [Qemu-devel] [PULL 04/25] crypto: Do not fail for EINTR during qcrypto_random_bytes, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 24/25] target/ppc: Use qemu_guest_getrandom for DARN, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 20/25] hw/misc/exynos4210_rng: Use qemu_guest_getrandom, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 21/25] target/arm: Put all PAC keys into a structure, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 18/25] hw/misc/nrf51_rng: Use qemu_guest_getrandom_nofail, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 14/25] linux-user: Use qemu_guest_getrandom_nofail for AT_RANDOM, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 13/25] linux-user: Call qcrypto_init if not using -seed, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 12/25] linux-user: Initialize pseudo-random seeds for all guest cpus, Richard Henderson, 2019/05/22
- [Qemu-devel] [PULL 10/25] util: Add qemu_guest_getrandom and associated routines, Richard Henderson, 2019/05/22