[pkg-opensc-commit] [pkcs11-helper] 100/253: Fixed GnuTLS compilation

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit 8c3401b6a11d370e8e57b744e56821e663006737
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Mon May 14 07:26:33 2007 +0000

    Fixed GnuTLS compilation
---
 ChangeLog            | 3 +++
 lib/pkcs11h-crypto.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 092ccf9..2a2e74f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@ $Id$
 
 * Block signals for own threads using pthread calls.
 
+* Fixup compilation error when using GnuTLS only environment, thank to
+  Simon Josefsson.
+
 2007-10-05 - Version 1.02
 
 * Switch to free implementation of PKCS#11 headers.
diff --git a/lib/pkcs11h-crypto.c b/lib/pkcs11h-crypto.c
index 18e29b7..4c241fd 100644
--- a/lib/pkcs11h-crypto.c
+++ b/lib/pkcs11h-crypto.c
@@ -687,12 +687,12 @@ __pkcs11h_crypto_gnutls_certificate_is_issuer (
 	_PKCS11H_ASSERT (issuer_blob!=NULL);
 	_PKCS11H_ASSERT (cert_blob!=NULL);
 
-	if (ok && gnutls_x509_crt_init (&cert_issuer) != GNUTLS_E_SUCCESS) {
+	if (gnutls_x509_crt_init (&cert_issuer) != GNUTLS_E_SUCCESS) {
 		/* gnutls sets output */
 		cert_issuer = NULL;
 		goto cleanup;
 	}
-	if (ok && gnutls_x509_crt_init (&cert_cert) != GNUTLS_E_SUCCESS) {
+	if (gnutls_x509_crt_init (&cert_cert) != GNUTLS_E_SUCCESS) {
 		/* gnutls sets output */
 		cert_cert = NULL;
 		goto cleanup;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git