|
 |
d1efb8 |
From a820d8623e5eae48cb08b624c85fc846a198df16 Mon Sep 17 00:00:00 2001
|
|
|
d1efb8 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
d1efb8 |
Date: Fri, 11 Jan 2019 16:34:30 +0100
|
|
|
d1efb8 |
Subject: [PATCH] vnc_connection_start_tls: add deinit label
|
|
|
d1efb8 |
MIME-Version: 1.0
|
|
|
d1efb8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d1efb8 |
Content-Transfer-Encoding: 8bit
|
|
|
d1efb8 |
|
|
|
d1efb8 |
Introduce a deinit label to unify cleanup paths which call gnutls_deinit.
|
|
|
d1efb8 |
|
|
|
d1efb8 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d1efb8 |
(cherry picked from commit e62d010777eecda47829e9da54bad3387f4d6231)
|
|
|
d1efb8 |
Resolves: rhbz#1665837
|
|
|
d1efb8 |
---
|
|
|
d1efb8 |
src/vncconnection.c | 19 +++++++++----------
|
|
|
d1efb8 |
1 file changed, 9 insertions(+), 10 deletions(-)
|
|
|
d1efb8 |
|
|
|
d1efb8 |
diff --git a/src/vncconnection.c b/src/vncconnection.c
|
|
|
d1efb8 |
index bbf4373..7b15211 100644
|
|
|
d1efb8 |
--- a/src/vncconnection.c
|
|
|
d1efb8 |
+++ b/src/vncconnection.c
|
|
|
d1efb8 |
@@ -4445,22 +4445,19 @@ static gboolean vnc_connection_start_tls(VncConnection *conn, int anonTLS)
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
|
|
|
d1efb8 |
if (gnutls_priority_set_direct(priv->tls_session, priority, NULL) < 0) {
|
|
|
d1efb8 |
- gnutls_deinit(priv->tls_session);
|
|
|
d1efb8 |
vnc_connection_set_error(conn, "%s", "Failed to set priority");
|
|
|
d1efb8 |
- return FALSE;
|
|
|
d1efb8 |
+ goto deinit;
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
|
|
|
d1efb8 |
if (anonTLS) {
|
|
|
d1efb8 |
gnutls_anon_client_credentials anon_cred = vnc_connection_tls_initialize_anon_cred();
|
|
|
d1efb8 |
if (!anon_cred) {
|
|
|
d1efb8 |
- gnutls_deinit(priv->tls_session);
|
|
|
d1efb8 |
vnc_connection_set_error(conn, "%s", "Failed to allocate credentials");
|
|
|
d1efb8 |
- return FALSE;
|
|
|
d1efb8 |
+ goto deinit;
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
if (gnutls_credentials_set(priv->tls_session, GNUTLS_CRD_ANON, anon_cred) < 0) {
|
|
|
d1efb8 |
- gnutls_deinit(priv->tls_session);
|
|
|
d1efb8 |
vnc_connection_set_error(conn, "%s", "Failed to initialize credentials");
|
|
|
d1efb8 |
- return FALSE;
|
|
|
d1efb8 |
+ goto deinit;
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
} else {
|
|
|
d1efb8 |
priv->want_cred_password = FALSE;
|
|
|
d1efb8 |
@@ -4471,14 +4468,12 @@ static gboolean vnc_connection_start_tls(VncConnection *conn, int anonTLS)
|
|
|
d1efb8 |
|
|
|
d1efb8 |
gnutls_certificate_credentials_t x509_cred = vnc_connection_tls_initialize_cert_cred(conn);
|
|
|
d1efb8 |
if (!x509_cred) {
|
|
|
d1efb8 |
- gnutls_deinit(priv->tls_session);
|
|
|
d1efb8 |
vnc_connection_set_error(conn, "%s", "Failed to allocate credentials");
|
|
|
d1efb8 |
- return FALSE;
|
|
|
d1efb8 |
+ goto deinit;
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
if (gnutls_credentials_set(priv->tls_session, GNUTLS_CRD_CERTIFICATE, x509_cred) < 0) {
|
|
|
d1efb8 |
- gnutls_deinit(priv->tls_session);
|
|
|
d1efb8 |
vnc_connection_set_error(conn, "%s", "Failed to initialize credentials");
|
|
|
d1efb8 |
- return FALSE;
|
|
|
d1efb8 |
+ goto deinit;
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
|
|
|
d1efb8 |
@@ -4514,6 +4509,10 @@ static gboolean vnc_connection_start_tls(VncConnection *conn, int anonTLS)
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
return TRUE;
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
+
|
|
|
d1efb8 |
+ deinit:
|
|
|
d1efb8 |
+ gnutls_deinit(priv->tls_session);
|
|
|
d1efb8 |
+ return FALSE;
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
|
|
|
d1efb8 |
static gboolean vnc_connection_has_auth_subtype(gpointer data)
|