From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 4 Jul 2014 13:40:58 +0000 (+0200)
Subject: Added test for non-null values in empty ID and label URI parts
X-Git-Tag: 0.20.3~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=840ec0f54daeb7c3bc37e22b6ec09ea7cfede868;p=p11-kit

Added test for non-null values in empty ID and label URI parts
---

diff --git a/p11-kit/tests/test-uri.c b/p11-kit/tests/test-uri.c
index f514f7a..b6de7ad 100644
--- a/p11-kit/tests/test-uri.c
+++ b/p11-kit/tests/test-uri.c
@@ -158,6 +158,70 @@ test_uri_parse_with_label_and_klass (void)
 	p11_kit_uri_free (uri);
 }
 
+static void
+test_uri_parse_with_empty_label (void)
+{
+	CK_ATTRIBUTE_PTR attr;
+	P11KitUri *uri;
+	int ret;
+
+	uri = p11_kit_uri_new ();
+	assert_ptr_not_null (uri);
+
+	ret = p11_kit_uri_parse ("pkcs11:object=;object-type=cert", P11_KIT_URI_FOR_ANY, uri);
+	assert_num_eq (P11_KIT_URI_OK, ret);
+
+	attr = p11_kit_uri_get_attribute (uri, CKA_LABEL);
+	assert_ptr_not_null (attr);
+
+	p11_kit_uri_free (uri);
+
+	/* really empty */
+
+	uri = p11_kit_uri_new ();
+	assert_ptr_not_null (uri);
+
+	ret = p11_kit_uri_parse ("pkcs11:object-type=cert", P11_KIT_URI_FOR_ANY, uri);
+	assert_num_eq (P11_KIT_URI_OK, ret);
+
+	attr = p11_kit_uri_get_attribute (uri, CKA_LABEL);
+	assert (attr == NULL);
+
+	p11_kit_uri_free (uri);
+}
+
+static void
+test_uri_parse_with_empty_id (void)
+{
+	CK_ATTRIBUTE_PTR attr;
+	P11KitUri *uri;
+	int ret;
+
+	uri = p11_kit_uri_new ();
+	assert_ptr_not_null (uri);
+
+	ret = p11_kit_uri_parse ("pkcs11:id=;object-type=cert", P11_KIT_URI_FOR_ANY, uri);
+	assert_num_eq (P11_KIT_URI_OK, ret);
+
+	attr = p11_kit_uri_get_attribute (uri, CKA_ID);
+	assert_ptr_not_null (attr);
+
+	p11_kit_uri_free (uri);
+
+	/* really empty */
+
+	uri = p11_kit_uri_new ();
+	assert_ptr_not_null (uri);
+
+	ret = p11_kit_uri_parse ("pkcs11:object-type=cert", P11_KIT_URI_FOR_ANY, uri);
+	assert_num_eq (P11_KIT_URI_OK, ret);
+
+	attr = p11_kit_uri_get_attribute (uri, CKA_ID);
+	assert (attr == NULL);
+
+	p11_kit_uri_free (uri);
+}
+
 static void
 test_uri_parse_with_id (void)
 {
@@ -1203,6 +1267,8 @@ main (int argc,
 	p11_test (test_uri_parse, "/uri/test_uri_parse");
 	p11_test (test_uri_parse_bad_scheme, "/uri/test_uri_parse_bad_scheme");
 	p11_test (test_uri_parse_with_label, "/uri/test_uri_parse_with_label");
+	p11_test (test_uri_parse_with_empty_label, "/uri/test_uri_parse_with_empty_label");
+	p11_test (test_uri_parse_with_empty_id, "/uri/test_uri_parse_with_empty_id");
 	p11_test (test_uri_parse_with_label_and_klass, "/uri/test_uri_parse_with_label_and_klass");
 	p11_test (test_uri_parse_with_id, "/uri/test_uri_parse_with_id");
 	p11_test (test_uri_parse_with_bad_string_encoding, "/uri/test_uri_parse_with_bad_string_encoding");