diff options
author | mcgreer%netscape.com <devnull@localhost> | 2001-08-30 19:12:52 +0000 |
---|---|---|
committer | mcgreer%netscape.com <devnull@localhost> | 2001-08-30 19:12:52 +0000 |
commit | 94db6034ab94a6fce0001cea9bc14912f64c180a (patch) | |
tree | ed2a91ddb7a8dfc46f737afc2aff2dbe3bdfc045 | |
parent | 7d41a8a7612e70f0eb17e899ea6cb6c6ec2b16ec (diff) | |
download | nss-hg-94db6034ab94a6fce0001cea9bc14912f64c180a.tar.gz |
make e-certify certs trusted
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.c | 14 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.txt | 13 |
2 files changed, 14 insertions, 13 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index 392e922f8..7917c959e 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -598,7 +598,7 @@ static const NSSItem nss_builtins_items_0 [] = { { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, { (void *)"CVS ID", (PRUint32)7 }, { (void *)"NSS", (PRUint32)4 }, - { (void *)"@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)178 } + { (void *)"@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)179 } }; #endif /* DEBUG */ static const NSSItem nss_builtins_items_1 [] = { @@ -9864,9 +9864,9 @@ static const NSSItem nss_builtins_items_177 [] = { , (PRUint32)20 }, { (void *)"\260\367\377\277\260\331\000\100\001\000\000\000\240\344\004\010" , (PRUint32)16 }, - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (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) } }; static const NSSItem nss_builtins_items_178 [] = { { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, @@ -9955,9 +9955,9 @@ static const NSSItem nss_builtins_items_179 [] = { , (PRUint32)20 }, { (void *)"\260\367\377\277\260\331\000\100\001\000\000\000\240\344\004\010" , (PRUint32)16 }, - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (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) } }; PR_IMPLEMENT_DATA(const builtinsInternalObject) diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index ca30f12bb..fb956bc2e 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -9962,6 +9962,7 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR + # # Certificate "E-Certify CA" # @@ -10057,9 +10058,9 @@ END CKA_CERT_MD5_HASH MULTILINE_OCTAL \260\367\377\277\260\331\000\100\001\000\000\000\240\344\004\010 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR # # Certificate "E-Certify RA" @@ -10156,6 +10157,6 @@ END CKA_CERT_MD5_HASH MULTILINE_OCTAL \260\367\377\277\260\331\000\100\001\000\000\000\240\344\004\010 END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR |