diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-12-23 09:12:49 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@redhat.com> | 2015-02-20 21:22:09 +0100 |
| commit | e49fba71493408305b297df7eb4e64d882b778ee (patch) | |
| tree | d793894af2dd9bdcc6d5710e3b5550592f454607 /p11-kit/test-uri.c | |
| parent | 6fb74150b8c8f957e96fd423beeccd36cf04e1bc (diff) | |
| download | p11-kit-e49fba71493408305b297df7eb4e64d882b778ee.tar.gz | |
Generate URIs compliant to the PKCS#11 URI draft in LC
We continue to accept both the older style 'object-type' field
in addition to the new 'type' field. However we start generating
URIs in the new form.
In other words we have backwards compatibility, but not forwards
compatibility. Given the fact that PKCS#11 URIs are now standardizing
this is an acceptable compromise.
https://bugs.freedesktop.org/show_bug.cgi?id=86474
Diffstat (limited to 'p11-kit/test-uri.c')
| -rw-r--r-- | p11-kit/test-uri.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/p11-kit/test-uri.c b/p11-kit/test-uri.c index e2817b4..e3e8dfb 100644 --- a/p11-kit/test-uri.c +++ b/p11-kit/test-uri.c @@ -194,7 +194,7 @@ test_uri_parse_with_empty_label (void) 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); + 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); @@ -207,7 +207,7 @@ test_uri_parse_with_empty_label (void) 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); + ret = p11_kit_uri_parse ("pkcs11: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); @@ -226,7 +226,7 @@ test_uri_parse_with_empty_id (void) 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); + ret = p11_kit_uri_parse ("pkcs11:id=;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); @@ -239,7 +239,7 @@ test_uri_parse_with_empty_id (void) 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); + ret = p11_kit_uri_parse ("pkcs11: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); @@ -605,7 +605,7 @@ test_uri_build_with_attributes (void) p11_kit_uri_free (check); assert (strstr (string, "object=The%20Label") != NULL); - assert (strstr (string, "object-type=data") != NULL); + assert (strstr (string, "type=data") != NULL); assert (strstr (string, "id=%48%45%4c%4c%4f") != NULL); free (string); @@ -622,7 +622,7 @@ test_uri_parse_private_key (void) uri = p11_kit_uri_new (); assert_ptr_not_null (uri); - ret = p11_kit_uri_parse ("pkcs11:object-type=private", P11_KIT_URI_FOR_OBJECT, uri); + ret = p11_kit_uri_parse ("pkcs11:type=private", P11_KIT_URI_FOR_OBJECT, uri); assert_num_eq (P11_KIT_URI_OK, ret); attr = p11_kit_uri_get_attribute (uri, CKA_CLASS); @@ -643,7 +643,7 @@ test_uri_parse_secret_key (void) uri = p11_kit_uri_new (); assert_ptr_not_null (uri); - ret = p11_kit_uri_parse ("pkcs11:object-type=secret-key", P11_KIT_URI_FOR_OBJECT, uri); + ret = p11_kit_uri_parse ("pkcs11:type=secret-key", P11_KIT_URI_FOR_OBJECT, uri); assert_num_eq (P11_KIT_URI_OK, ret); attr = p11_kit_uri_get_attribute (uri, CKA_CLASS); @@ -706,7 +706,7 @@ test_uri_parse_parse_unknown_object_type (void) uri = p11_kit_uri_new (); assert_ptr_not_null (uri); - ret = p11_kit_uri_parse ("pkcs11:object-type=unknown", P11_KIT_URI_FOR_OBJECT, uri); + ret = p11_kit_uri_parse ("pkcs11:type=unknown", P11_KIT_URI_FOR_OBJECT, uri); assert_num_eq (P11_KIT_URI_OK, ret); attr = p11_kit_uri_get_attribute (uri, CKA_CLASS); @@ -774,7 +774,7 @@ test_uri_build_object_type_cert (void) ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_ANY, &string); assert_num_eq (P11_KIT_URI_OK, ret); - assert (strstr (string, "object-type=cert") != NULL); + assert (strstr (string, "type=cert") != NULL); p11_kit_uri_free (uri); free (string); @@ -800,7 +800,7 @@ test_uri_build_object_type_private (void) ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_ANY, &string); assert_num_eq (P11_KIT_URI_OK, ret); - assert (strstr (string, "object-type=private") != NULL); + assert (strstr (string, "type=private") != NULL); p11_kit_uri_free (uri); free (string); @@ -826,7 +826,7 @@ test_uri_build_object_type_public (void) ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_ANY, &string); assert_num_eq (P11_KIT_URI_OK, ret); - assert (strstr (string, "object-type=public") != NULL); + assert (strstr (string, "type=public") != NULL); p11_kit_uri_free (uri); free (string); @@ -852,7 +852,7 @@ test_uri_build_object_type_secret (void) ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_ANY, &string); assert_num_eq (P11_KIT_URI_OK, ret); - assert (strstr (string, "object-type=secret-key") != NULL); + assert (strstr (string, "type=secret-key") != NULL); p11_kit_uri_free (uri); free (string); @@ -1060,7 +1060,7 @@ test_uri_match_attributes (void) uri = p11_kit_uri_new (); assert_ptr_not_null (uri); - ret = p11_kit_uri_parse ("pkcs11:object=Fancy;id=Blah;object-type=data", P11_KIT_URI_FOR_ANY, uri); + ret = p11_kit_uri_parse ("pkcs11:object=Fancy;id=Blah;type=data", P11_KIT_URI_FOR_ANY, uri); assert_num_eq (P11_KIT_URI_OK, ret); ret = p11_kit_uri_match_attributes (uri, attrs, 4); |