From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 11 Jan 2014 10:20:17 +0000 (+0100)
Subject: enhanced set_pkcs12_cred test.
X-Git-Tag: gnutls_3_3_0pre0~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5fee4861dc4e36abf8146c9221a2a8a42abf643;p=thirdparty%2Fgnutls.git

enhanced set_pkcs12_cred test.
---

diff --git a/tests/pkcs12-decode/Makefile.am b/tests/pkcs12-decode/Makefile.am
index c08e4d9ae2..3ccaa1cd8c 100644
--- a/tests/pkcs12-decode/Makefile.am
+++ b/tests/pkcs12-decode/Makefile.am
@@ -20,7 +20,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 EXTRA_DIST = client.p12 noclient.p12 unclient.p12 pkcs12_2certs.p12 \
-	pkcs12_5certs.p12 test-null.p12
+	pkcs12_5certs.p12 test-null.p12 cert-ca.p12
 
 dist_check_SCRIPTS = pkcs12
 
diff --git a/tests/pkcs12-decode/cert-ca.p12 b/tests/pkcs12-decode/cert-ca.p12
new file mode 100644
index 0000000000..cddde704d1
Binary files /dev/null and b/tests/pkcs12-decode/cert-ca.p12 differ
diff --git a/tests/set_pkcs12_cred.c b/tests/set_pkcs12_cred.c
index 9381c3f659..edc4b1061d 100644
--- a/tests/set_pkcs12_cred.c
+++ b/tests/set_pkcs12_cred.c
@@ -34,11 +34,24 @@ static void tls_log_func(int level, const char *str)
 	fprintf(stderr, "<%d>| %s", level, str);
 }
 
-#ifndef ENABLE_FIPS140
+typedef struct {
+	const char *file;
+	const char *pass;
+} files_st;
+
+files_st files[] = {
+	{"client.p12", "foobar"},
+	{"cert-ca.p12", "1234"}, /* 2 certs, one is a CA */
+	{"pkcs12_2certs.p12", ""}, /* 2 certs, on is unrelated */
+	{NULL, NULL}
+};
+
 void doit(void)
 {
 	gnutls_certificate_credentials_t x509cred;
-	const char *file, *password;
+	const char *path;
+	unsigned int i;
+	char file[512];
 	int ret;
 
 	ret = global_init();
@@ -49,74 +62,37 @@ void doit(void)
 	if (debug)
 		gnutls_global_set_log_level(4711);
 
-	ret = gnutls_certificate_allocate_credentials(&x509cred);
-	if (ret < 0)
-		fail("gnutls_certificate_allocate_credentials failed %d\n",
-		     ret);
-
-	file = getenv("PKCS12FILE");
-	password = getenv("PKCS12PASSWORD");
-
-	if (!file)
-		file = "pkcs12-decode/client.p12";
-	if (!password)
-		password = "foobar";
-
-	if (debug)
-		success
-		    ("Reading PKCS#12 blob from `%s' using password `%s'.\n",
-		     file, password);
-	ret =
-	    gnutls_certificate_set_x509_simple_pkcs12_file(x509cred, file,
-							   GNUTLS_X509_FMT_DER,
-							   password);
-	if (ret < 0)
-		fail("x509_pkcs12 failed %d: %s\n", ret,
-		     gnutls_strerror(ret));
-
-	if (debug)
-		success("Read file OK\n");
-
-	gnutls_certificate_free_credentials(x509cred);
+	for (i = 0; files[i].file != NULL; i++) {
 
-	/* try now if we can read correctly from a pkcs12 file that
-	 * contains two certificates (one unrelated with key)
-	 */
-	ret = gnutls_certificate_allocate_credentials(&x509cred);
-	if (ret < 0)
-		fail("gnutls_certificate_allocate_credentials failed %d\n",
-		     ret);
+		ret = gnutls_certificate_allocate_credentials(&x509cred);
+		if (ret < 0)
+			fail("gnutls_certificate_allocate_credentials failed %d\n", ret);
 
-	file = getenv("PKCS12FILE_2");
-	password = getenv("PKCS12PASSWORD_2");
+		path = getenv("PKCS12PATH");
+		if (!path)
+			path = "pkcs12-decode/";
 
-	if (!file)
-		file = "pkcs12-decode/pkcs12_2certs.p12";
-	if (!password)
-		password = "";
+		snprintf(file, sizeof(file), "%s/%s", path, files[i].file);
 
-	if (debug)
-		success
-		    ("Reading PKCS#12 blob from `%s' using password `%s'.\n",
-		     file, password);
-	ret =
-	    gnutls_certificate_set_x509_simple_pkcs12_file(x509cred, file,
-							   GNUTLS_X509_FMT_DER,
-							   password);
-	if (ret < 0)
-		fail("x509_pkcs12 failed %d: %s\n", ret,
-		     gnutls_strerror(ret));
+		if (debug)
+			success
+			    ("Reading PKCS#12 blob from `%s' using password `%s'.\n",
+			     file, files[i].pass);
+		ret =
+		    gnutls_certificate_set_x509_simple_pkcs12_file(x509cred,
+								   file,
+								   GNUTLS_X509_FMT_DER,
+								   files[i].
+								   pass);
+		if (ret < 0)
+			fail("x509_pkcs12 failed %d: %s\n", ret,
+			     gnutls_strerror(ret));
 
-	if (debug)
-		success("Read file OK\n");
+		if (debug)
+			success("Read file OK\n");
 
-	gnutls_certificate_free_credentials(x509cred);
+		gnutls_certificate_free_credentials(x509cred);
+	}
 
 	gnutls_global_deinit();
 }
-#else
-void doit(void)
-{
-	exit(77);
-}
-#endif