From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCQJV-00062O-Ni for qemu-devel@nongnu.org; Mon, 13 Jun 2016 07:45:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCQJP-0005w6-L1 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 07:45:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCQJP-0005w0-Ft for qemu-devel@nongnu.org; Mon, 13 Jun 2016 07:45:47 -0400 From: "Daniel P. Berrange" Date: Mon, 13 Jun 2016 12:45:34 +0100 Message-Id: <1465818337-30627-2-git-send-email-berrange@redhat.com> In-Reply-To: <1465818337-30627-1-git-send-email-berrange@redhat.com> References: <1465818337-30627-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PULL v1 1/4] TLS: provide slightly more information when TLS certificate loading fails List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Alex Bligh , "Daniel P. Berrange" From: Alex Bligh Give slightly more information when certification loading fails. Rather than have no information, you now get gnutls's only slightly less unhelpful error messages. Signed-off-by: Alex Bligh Signed-off-by: Daniel P. Berrange --- crypto/tlscredsx509.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index 6a0179c..520d34d 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -392,11 +392,14 @@ qcrypto_tls_creds_load_cert(QCryptoTLSCredsX509 *creds, gsize buflen; GError *gerr; int ret = -1; + int err; trace_qcrypto_tls_creds_x509_load_cert(creds, isServer, certFile); - if (gnutls_x509_crt_init(&cert) < 0) { - error_setg(errp, "Unable to initialize certificate"); + err = gnutls_x509_crt_init(&cert); + if (err < 0) { + error_setg(errp, "Unable to initialize certificate: %s", + gnutls_strerror(err)); goto cleanup; } @@ -410,11 +413,13 @@ qcrypto_tls_creds_load_cert(QCryptoTLSCredsX509 *creds, data.data = (unsigned char *)buf; data.size = strlen(buf); - if (gnutls_x509_crt_import(cert, &data, GNUTLS_X509_FMT_PEM) < 0) { + err = gnutls_x509_crt_import(cert, &data, GNUTLS_X509_FMT_PEM); + if (err < 0) { error_setg(errp, isServer ? - "Unable to import server certificate %s" : - "Unable to import client certificate %s", - certFile); + "Unable to import server certificate %s: %s" : + "Unable to import client certificate %s: %s", + certFile, + gnutls_strerror(err)); goto cleanup; } -- 2.5.5