Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NSS attribute CKA_NSS_MOZILLA_CA_POLICY in p11-kit files #46

Merged
merged 2 commits into from
Feb 16, 2017
Merged

NSS attribute CKA_NSS_MOZILLA_CA_POLICY in p11-kit files #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90e4599
Support loading new NSS attribute CKA_NSS_MOZILLA_CA_POLICY from .p11…
kaie Feb 2, 2017
17dd042
Fix a typo in "x-cetrificate-value", see also https://bugs.freedeskto…
kaie Feb 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion common/constants.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -173,7 +174,7 @@ const p11_constant p11_constant_types[] = {
CT (CKA_CERT_SHA1_HASH, "cert-sha1-hash")
CT (CKA_CERT_MD5_HASH, "cert-md5-hash")
CT (CKA_X_ASSERTION_TYPE, "x-assertion-type")
CT (CKA_X_CERTIFICATE_VALUE, "x-cetrificate-value")
CT (CKA_X_CERTIFICATE_VALUE, "x-certificate-value")
CT (CKA_X_PURPOSE, "x-purpose")
CT (CKA_X_PEER, "x-peer")
CT (CKA_X_DISTRUSTED, "x-distrusted")
Expand Down
1 change: 1 addition & 0 deletions common/pkcs11x.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions trust/builder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
1 change: 1 addition & 0 deletions trust/persist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down