From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 16 Jun 2014 09:30:13 +0000 (+0200)
Subject: Test the return code of gnutls_x509_trust_list_add_trust_file() when loading a PKCS... 
X-Git-Tag: gnutls_3_3_5~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59f02ca6a59b32e2dc4e492aa82bb6a33fc729f3;p=thirdparty%2Fgnutls.git

Test the return code of gnutls_x509_trust_list_add_trust_file() when loading a PKCS #11 token.

Check whether the return code of gnutls_x509_trust_list_add_trust_file() is non-zero
when certificates are present.
---

diff --git a/tests/suite/pkcs11-chainverify.c b/tests/suite/pkcs11-chainverify.c
index 2aebcf5967..4c1106cded 100644
--- a/tests/suite/pkcs11-chainverify.c
+++ b/tests/suite/pkcs11-chainverify.c
@@ -225,7 +225,9 @@ void doit(void)
 		}
 
 		/* write CA certificate to softhsm */
-		ret = gnutls_pkcs11_copy_x509_crt(URL, ca, "test-ca", GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED|GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO);
+		ret = gnutls_pkcs11_copy_x509_crt(URL, ca, "test-ca", GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED|
+			GNUTLS_PKCS11_OBJ_FLAG_MARK_CA|
+			GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO);
 		if (ret < 0) {
 			fail("gnutls_pkcs11_copy_x509_crt: %s\n", gnutls_strerror(ret));
 			exit(1);
@@ -235,7 +237,12 @@ void doit(void)
 
 		ret = gnutls_x509_trust_list_add_trust_file(tl, URL, NULL, 0, 0, 0);
 		if (ret < 0) {
-			fail("gnutls_x509_trust_list_add_trust_file\n");
+			fail("gnutls_x509_trust_list_add_trust_file: %s\n", gnutls_strerror(ret));
+			exit(1);
+		}
+
+		if (ret < 1) {
+			fail("gnutls_x509_trust_list_add_trust_file returned zero!\n");
 			exit(1);
 		}