summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2011-09-11 20:00:29 +0200
committerGernot Tenchio <gernot@tenchio.de>2011-09-19 22:16:29 +0200
commit2046cc9abd284528075abbaa758b148cece62d82 (patch)
tree9c0594c8a8212df0f5b3ab4860b3650b1005b778
parent98a9d49c056a3c5a06cba78888210566c3b65dd6 (diff)
downloadlibvncserver-2046cc9abd284528075abbaa758b148cece62d82.zip
libvncserver-2046cc9abd284528075abbaa758b148cece62d82.tar.gz
Fix libvncserver GnuTLS init.
gnutls_certificate_set_x509_trust_file() returns the number of processed certs and _not_ GNUTLS_E_SUCCESS (0) on success!
-rw-r--r--libvncserver/rfbssl_gnutls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvncserver/rfbssl_gnutls.c b/libvncserver/rfbssl_gnutls.c
index 0689c01..cf60cdc 100644
--- a/libvncserver/rfbssl_gnutls.c
+++ b/libvncserver/rfbssl_gnutls.c
@@ -95,7 +95,7 @@ struct rfbssl_ctx *rfbssl_init_global(char *key, char *cert)
/* */
} else if (!GNUTLS_E_SUCCESS == (ret = gnutls_certificate_allocate_credentials(&ctx->x509_cred))) {
/* */
- } else if (!GNUTLS_E_SUCCESS == (ret = gnutls_certificate_set_x509_trust_file(ctx->x509_cred, cert, GNUTLS_X509_FMT_PEM))) {
+ } else if ((ret = gnutls_certificate_set_x509_trust_file(ctx->x509_cred, cert, GNUTLS_X509_FMT_PEM)) < 0) {
/* */
} else if (!GNUTLS_E_SUCCESS == (ret = gnutls_certificate_set_x509_key_file(ctx->x509_cred, cert, key, GNUTLS_X509_FMT_PEM))) {
/* */
OpenPOWER on IntegriCloud