summaryrefslogtreecommitdiff
path: root/doc/internal/persist-format.txt
diff options
context:
space:
mode:
authorStef Walter <stef@thewalter.net>2014-09-12 15:37:02 +0200
committerStef Walter <stefw@redhat.com>2014-10-09 11:49:59 +0200
commitb3579cb54bd5cd16e9740404408b2505b4b1e26b (patch)
tree78b63008d006071f4173ac8107da5e37a740fde7 /doc/internal/persist-format.txt
parentc1dd399d265f20bd3df4dc76dcf735aba1ffa515 (diff)
downloadp11-kit-b3579cb54bd5cd16e9740404408b2505b4b1e26b.tar.gz
trust: Allow 'BEGIN PUBLIC KEY' PEM blocks in .p11-kit files
These PEM blocks contribute a CKA_PUBLIC_KEY_INFO to the object being read/written. https://bugs.freedesktop.org/show_bug.cgi?id=83799
Diffstat (limited to 'doc/internal/persist-format.txt')
-rw-r--r--doc/internal/persist-format.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/internal/persist-format.txt b/doc/internal/persist-format.txt
index a0a3194..cb863be 100644
--- a/doc/internal/persist-format.txt
+++ b/doc/internal/persist-format.txt
@@ -22,10 +22,15 @@ constants are available.
PEM blocks can be present within an object, and these contribute certain
PKCS#11 attributes to the object. The attributes that come from PEM blocks
-never override those explicitly specified. A 'CERTIFICATE' type PEM block
-contributes the 'value', 'class', 'certificate-type', 'subject', 'issuer'
-'start-date', 'end-date', 'id', 'certificate-category', 'check-value',
-'serial-number' attributes with appropriate values.
+never override those explicitly specified.
+
+A 'CERTIFICATE' type PEM block contributes the 'value', 'class',
+'certificate-type', 'subject', 'issuer' 'start-date', 'end-date', 'id',
+'certificate-category', 'check-value', 'serial-number', 'public-key-info'
+attributes with appropriate values.
+
+A 'PUBLIC KEY' type PEM block contributes the 'public-key-info' attribute
+with an appropriate value.
Comments starting with a '#' and blank lines are ignored.