diff options
author | Stef Walter <stefw@redhat.com> | 2014-11-14 06:13:10 +0100 |
---|---|---|
committer | Stef Walter <stefw@redhat.com> | 2014-11-14 06:13:10 +0100 |
commit | b65e3148a8ea2d54b17a8be617bbdcb026c49fcd (patch) | |
tree | f37da17e9ec6561672b120f37edf928aa17824ca /p11-kit/uri.c | |
parent | 7c2270eaaaf0e60e204cb81dd017bc89394f4f59 (diff) | |
download | p11-kit-b65e3148a8ea2d54b17a8be617bbdcb026c49fcd.tar.gz |
uri: Accept 'type' in additon to 'object-type' in PKCS#11 URIs
This was a later change to the PKCS#11 specification drafts
Diffstat (limited to 'p11-kit/uri.c')
-rw-r--r-- | p11-kit/uri.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/p11-kit/uri.c b/p11-kit/uri.c index a60974c..970f125 100644 --- a/p11-kit/uri.c +++ b/p11-kit/uri.c @@ -62,7 +62,7 @@ * <code><literallayout> * pkcs11:token=The\%20Software\%20PKCS\#11\%20softtoken; * manufacturer=Snake\%20Oil,\%20Inc.;serial=;object=my-certificate; - * model=1.0;object-type=cert;id=\%69\%95\%3e\%5c\%f4\%bd\%ec\%91 + * model=1.0;type=cert;id=\%69\%95\%3e\%5c\%f4\%bd\%ec\%91 * </literallayout></code> * * You can use p11_kit_uri_parse() to parse such a URI, and p11_kit_uri_format() @@ -902,7 +902,8 @@ parse_class_attribute (const char *name, const char *start, const char *end, assert (start <= end); if (strcmp ("objecttype", name) != 0 && - strcmp ("object-type", name) != 0) + strcmp ("object-type", name) != 0 && + strcmp ("type", name) != 0) return 0; value = key_decode (start, end); |