From b3579cb54bd5cd16e9740404408b2505b4b1e26b Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 12 Sep 2014 15:37:02 +0200 Subject: 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 --- doc/internal/persist-format.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'doc/internal') 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. -- cgit v1.1