Commit 6bffdf0f authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

vnc: auth reject cleanup 



protocol_client_auth_vnc() has two places where the auth can fail,
with identical code sending the reject message to the client.
Move the common code to the end of the function and make both
error paths jump there.  No functional change.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent cb42a870

ui/vnc.c

+13 −17
Original line number Diff line number Diff line
@@ -2085,15 +2085,7 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) 


    if (!vs->vd->password || !vs->vd->password[0]) {

        VNC_DEBUG("No password configured on server");

        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);

        return 0;

        goto reject;

    }



    memcpy(response, vs->challenge, VNC_AUTH_CHALLENGE_SIZE);
@@ -2109,6 +2101,17 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) 
    /* Compare expected vs actual challenge response */

    if (memcmp(response, data, VNC_AUTH_CHALLENGE_SIZE) != 0) {

        VNC_DEBUG("Client challenge reponse did not match\n");

        goto reject;

    } else {

        VNC_DEBUG("Accepting VNC challenge response\n");

        vnc_write_u32(vs, 0); /* Accept auth */

        vnc_flush(vs);



        start_client_init(vs);

    }

    return 0;



reject:

    vnc_write_u32(vs, 1); /* Reject auth */

    if (vs->minor >= 8) {

        static const char err[] = "Authentication failed";
@@ -2117,13 +2120,6 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) 
    }

    vnc_flush(vs);

    vnc_client_error(vs);

    } else {

        VNC_DEBUG("Accepting VNC challenge response\n");

        vnc_write_u32(vs, 0); /* Accept auth */

        vnc_flush(vs);



        start_client_init(vs);

    }

    return 0;

}