summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@redhat.com>2014-09-04 16:30:17 +0200
committerStef Walter <stefw@redhat.com>2014-09-10 08:15:03 +0200
commitcea1bc82e4c26bce9a10fbf194ac8be88cb84fad (patch)
treebef346dab198bc16140a93ca27aecf0d992925a1
parent7a00596e68b5721dd3f400fe704189e9f1b9cb30 (diff)
Define appropriate PKCS#11 constants for stapled certificate extensions
And use the PKCS#11 v2.40 CKA_PUBLIC_KEY_INFO definition.
-rw-r--r--specs/storing-trust-pkcs11.xml24
1 files changed, 14 insertions, 10 deletions
diff --git a/specs/storing-trust-pkcs11.xml b/specs/storing-trust-pkcs11.xml
index 9c9c7f5..1aff81a 100644
--- a/specs/storing-trust-pkcs11.xml
+++ b/specs/storing-trust-pkcs11.xml
@@ -138,7 +138,7 @@
<variablelist>
<varlistentry>
- <term><literal>CKA_X_PUBLIC_KEY_INFO</literal></term>
+ <term><literal>CKA_PUBLIC_KEY_INFO</literal></term>
<listitem><para>The public key of the anchor, always present. A DER encoded
SubjectPublicKeyInfo sequence as defined in X.509.</para></listitem>
</varlistentry>
@@ -190,7 +190,7 @@
<variablelist>
<varlistentry>
- <term><literal>CKA_X_PUBLIC_KEY_INFO</literal></term>
+ <term><literal>CKA_PUBLIC_KEY_INFO</literal></term>
<listitem><para>The public key of the anchor. A DER encoded
SubjectPublicKeyInfo sequence as defined in X.509. When this
value is not present, set to a zero length value.</para></listitem>
@@ -241,7 +241,7 @@
<variablelist>
<varlistentry>
- <term><literal>CKA_X_PUBLIC_KEY_INFO</literal></term>
+ <term><literal>CKA_PUBLIC_KEY_INFO</literal></term>
<listitem><para>The public key associated with the stapled
extension. A DER encoded SubjectPublicKeyInfo sequence as defined in
X.509.</para></listitem>
@@ -268,13 +268,17 @@
<simplesect id="pkcs11-constants">
<title>Constants</title>
- <note>
- <title>Work Item</title>
- <para>Define vendor extension constants for the above
- new attributes. One of the attributes CKA_PUBLIC_KEY_INFO may be standardized
- by the PKCS#11 TC within the next short while, thus not rushing to do this. Will
- timeout if not done shortly.</para>
- </note>
+ <para>The following constants are defined:</para>
+
+<programlisting>
+<![CDATA[
+#define CKO_X_CERTIFICATE_EXTENSION 0xd84447c8UL
+#define CKA_X_DISTRUSTED 0xd8444764UL
+
+/* The following definition comes from PKCS#11 2.40
+#define CKA_PUBLIC_KEY_INFO 0x00000129UL
+]]>
+</programlisting>
</simplesect>