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

diff --git a/common/constants.c b/common/constants.c
index f4aa66b1f9036f647273d343e49f1dae43a01962..2d2ca21d95ce25043a2ded634fb2ed14db00aec5 100644 (file)
--- a/common/constants.c
+++ b/common/constants.c
@@ -154,6 +154,7 @@ const p11_constant p11_constant_types[] = {
        CT (CKA_NSS_PQG_H, "nss-pqg-h")
        CT (CKA_NSS_PQG_SEED_BITS, "nss-pqg-seed-bits")
        CT (CKA_NSS_MODULE_SPEC, "nss-module-spec")
+       CT (CKA_NSS_MOZILLA_CA_POLICY, "nss-mozilla-ca-policy")
        CT (CKA_TRUST_DIGITAL_SIGNATURE, "trust-digital-signature")
        CT (CKA_TRUST_NON_REPUDIATION, "trust-non-repudiation")
        CT (CKA_TRUST_KEY_ENCIPHERMENT, "trust-key-encipherment")

diff --git a/common/pkcs11x.h b/common/pkcs11x.h
index 4a89f732d1ef137faec8c540267ccced82f6f4b7..d5e1d7462b6cb48de82f34ce03a3f5fc0120f3d1 100644 (file)
--- a/common/pkcs11x.h
+++ b/common/pkcs11x.h
@@ -74,6 +74,7 @@ extern "C" {
 #define CKA_NSS_PQG_H                   0xce534366UL
 #define CKA_NSS_PQG_SEED_BITS           0xce534367UL
 #define CKA_NSS_MODULE_SPEC             0xce534368UL
+#define CKA_NSS_MOZILLA_CA_POLICY       0xce534372UL
 
 /* NSS trust attributes */
 #define CKA_TRUST_DIGITAL_SIGNATURE     0xce536351UL

diff --git a/trust/builder.c b/trust/builder.c
index e0ce37063d0138e3594ef65d3aee8be268077d27..5b20c7991ed7cb914f1a7fab12feadd000514f9a 100644 (file)
--- 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 de827a6aa7b4bfebd6c7006b54fecc989c421058..63a531ecd276c1bf7f31c7414703606870124a60 100644 (file)
--- 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;