summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-04-14 16:45:04 +0000
committerwtchang%redhat.com <devnull@localhost>2005-04-14 16:45:04 +0000
commit2824d00a2560e16ea1d31f245c37612708b250ef (patch)
tree79c1f2c01712563eab742e3469ce75c0f81a7e0e
parentc77f936c1828d184bb48547f2e2217c4c1ac09c8 (diff)
downloadnss-hg-2824d00a2560e16ea1d31f245c37612708b250ef.tar.gz
Bugzilla Bug 258416: trust Sonera Class 1 CA only for S/MIME. r=nelsonb.
Modified files: certdata.c certdata.txt
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.c4
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index ad33038e2..e4d0f30be 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -10548,9 +10548,9 @@ static const NSSItem nss_builtins_items_157 [] = {
, (PRUint32)59 },
{ (void *)"\002\001\044"
, (PRUint32)3 },
+ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+ { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
};
static const NSSItem nss_builtins_items_158 [] = {
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index e98258a00..014f0ee31 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -10789,9 +10789,9 @@ END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\001\044
END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#