|
 |
bb8894 |
From a6ef11572ffdfde69c901c8c4903c911f0e27d76 Mon Sep 17 00:00:00 2001
|
|
|
bb8894 |
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
|
bb8894 |
Date: Wed, 31 Jan 2018 11:09:38 +0000
|
|
|
bb8894 |
Subject: [PATCH] Don't short-circuit request for TLS credentials
|
|
|
bb8894 |
MIME-Version: 1.0
|
|
|
bb8894 |
Content-Type: text/plain; charset=UTF-8
|
|
|
bb8894 |
Content-Transfer-Encoding: 8bit
|
|
|
bb8894 |
|
|
|
bb8894 |
Although newer GNUTLS has a default system trust fallback for CA
|
|
|
bb8894 |
certificates, we must still request certificates from the client app. If
|
|
|
bb8894 |
we do not, then the VNC client will never be given the opportunity to
|
|
|
bb8894 |
provide custom certs to override the system trust database.
|
|
|
bb8894 |
|
|
|
bb8894 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
bb8894 |
(cherry picked from commit df656c79467c2595b4a2cd35283c7f5d52adf336)
|
|
|
bb8894 |
---
|
|
|
bb8894 |
src/vncconnection.c | 8 --------
|
|
|
bb8894 |
1 file changed, 8 deletions(-)
|
|
|
bb8894 |
|
|
|
bb8894 |
diff --git a/src/vncconnection.c b/src/vncconnection.c
|
|
|
bb8894 |
index 1ddf38d..e5496ef 100644
|
|
|
bb8894 |
--- a/src/vncconnection.c
|
|
|
bb8894 |
+++ b/src/vncconnection.c
|
|
|
bb8894 |
@@ -3528,16 +3528,8 @@ static gboolean vnc_connection_has_credentials(gpointer data)
|
|
|
bb8894 |
return FALSE;
|
|
|
bb8894 |
if (priv->want_cred_password && !priv->cred_password)
|
|
|
bb8894 |
return FALSE;
|
|
|
bb8894 |
- /*
|
|
|
bb8894 |
- * For x509 we require a minimum of the CA cert
|
|
|
bb8894 |
- * if using GNUTLS < 3.0. With newer GNUTLS we'll
|
|
|
bb8894 |
- * fallback to the system trust, so don't need to
|
|
|
bb8894 |
- * explicitly check for a CA cert.
|
|
|
bb8894 |
- */
|
|
|
bb8894 |
-#if GNUTLS_VERSION_NUMBER < 0x030000
|
|
|
bb8894 |
if (priv->want_cred_x509 && !priv->cred_x509_cacert)
|
|
|
bb8894 |
return FALSE;
|
|
|
bb8894 |
-#endif
|
|
|
bb8894 |
return TRUE;
|
|
|
bb8894 |
}
|
|
|
bb8894 |
|