summaryrefslogtreecommitdiff
path: root/trust
diff options
context:
space:
mode:
authorKai Engert <kaie@kuix.de>2017-02-02 16:01:01 +0100
committerDaiki Ueno <ueno@gnu.org>2017-02-16 12:53:54 +0100
commitdbadd5da6ccbb17ec5c4bbb142fdc244b4903bfb (patch)
tree22bed5f0da9cc3d0e6ff8b7578bc85645a79f345 /trust
parentee740e904030c3fb2640f524014474a510dda7eb (diff)
Support loading new NSS attribute CKA_NSS_MOZILLA_CA_POLICY from .p11-kit files.
See also NSS bug https://bugzilla.mozilla.org/show_bug.cgi?id=1334976 and p11-kit bug https://bugs.freedesktop.org/show_bug.cgi?id=99453
Diffstat (limited to 'trust')
-rw-r--r--trust/builder.c1
-rw-r--r--trust/persist.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/trust/builder.c b/trust/builder.c
index e0ce370..5b20c79 100644
--- a/trust/builder.c
+++ b/trust/builder.c
@@ -792,6 +792,7 @@ const static builder_schema certificate_schema = {
{ CKA_CERTIFICATE_TYPE, REQUIRE | CREATE, type_ulong },
{ CKA_TRUSTED, CREATE | WANT, type_bool },
{ CKA_X_DISTRUSTED, CREATE | WANT, type_bool },
+ { CKA_NSS_MOZILLA_CA_POLICY, CREATE | WANT, type_bool },
{ CKA_CERTIFICATE_CATEGORY, CREATE | WANT, type_ulong },
{ CKA_CHECK_VALUE, CREATE | WANT, },
{ CKA_START_DATE, CREATE | MODIFY | WANT, type_date },
diff --git a/trust/persist.c b/trust/persist.c
index de827a6..63a531e 100644
--- a/trust/persist.c
+++ b/trust/persist.c
@@ -200,6 +200,7 @@ format_bool (CK_ATTRIBUTE *attr,
case CKA_HAS_RESET:
case CKA_COLOR:
case CKA_X_DISTRUSTED:
+ case CKA_NSS_MOZILLA_CA_POLICY:
break;
default:
return false;