[Qemu-devel] [PULL for-2.4 0/1] vnc: fix vnc client authentication

[Qemu-devel] [PULL for-2.4 0/1] vnc: fix vnc client authentication

[Gerd Hoffmann]

  Hi,

Here comes the vnc queue with a single one-line fix.

please pull,
  Gerd

The following changes since commit 6169b60285fe1ff730d840a49527e721bfb30899:

  Update version for v2.4.0-rc0 release (2015-07-09 17:56:56 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/pull-vnc-20150714-1

for you to fetch changes up to a16951375f7669b7faf27f72ca753e25325c5179:

  vnc: fix vnc client authentication (2015-07-14 15:33:48 +0200)

----------------------------------------------------------------
vnc: fix vnc client authentication

----------------------------------------------------------------
Wolfgang Bumiller (1):
      vnc: fix vnc client authentication

 ui/vnc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] vnc: fix vnc client authentication

[Gerd Hoffmann]

From: Wolfgang Bumiller <w.bumiller@proxmox.com>

Commit 800567a61 updated the code to the generic crypto API
and mixed up encrypt and decrypt functions in
procotol_client_auth_vnc.
(Used to be: deskey(key, EN0) which encrypts, and was
changed to qcrypto_cipher_decrypt in 800567a61.)
Changed it to qcrypto_cipher_encrypt now.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/vnc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index 94e4f19..1483958 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2551,7 +2551,7 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len)
         goto reject;
     }
 
-    if (qcrypto_cipher_decrypt(cipher,
+    if (qcrypto_cipher_encrypt(cipher,
                                vs->challenge,
                                response,
                                VNC_AUTH_CHALLENGE_SIZE,
-- 
1.8.3.1

Re: [Qemu-devel] [PULL for-2.4 0/1] vnc: fix vnc client authentication

[Vasiliy Tolstov]

2015-07-14 16:39 GMT+03:00 Gerd Hoffmann <kraxel@redhat.com>:
>
> Here comes the vnc queue with a single one-line fix.
>
> please pull,
>   Gerd
>
> The following changes since commit 6169b60285fe1ff730d840a49527e721bfb30899:
>
>   Update version for v2.4.0-rc0 release (2015-07-09 17:56:56 +0100)


Thanks! This vnc patch fix my issue.

-- 
Vasiliy Tolstov,
e-mail: v.tolstov@selfip.ru

Re: [Qemu-devel] [PULL for-2.4 0/1] vnc: fix vnc client authentication

[Peter Maydell]

On 14 July 2015 at 14:39, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the vnc queue with a single one-line fix.
>
> please pull,
>   Gerd
>
> The following changes since commit 6169b60285fe1ff730d840a49527e721bfb30899:
>
>   Update version for v2.4.0-rc0 release (2015-07-09 17:56:56 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/pull-vnc-20150714-1
>
> for you to fetch changes up to a16951375f7669b7faf27f72ca753e25325c5179:
>
>   vnc: fix vnc client authentication (2015-07-14 15:33:48 +0200)
>
> ----------------------------------------------------------------
> vnc: fix vnc client authentication

Applied, thanks.

-- PMM