diff --git a/.abf.yml b/.abf.yml index 70a8781..718ad79 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "nss-3.12.11.tar.gz": 187ae83a8368512bb8729c206da2ed34db1725ad + "nss-3.13.1.tar.gz": d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 diff --git a/nss-3.12.11-new_certdata.txt_format.diff b/nss-3.12.11-new_certdata.txt_format.diff deleted file mode 100644 index a2de1be..0000000 --- a/nss-3.12.11-new_certdata.txt_format.diff +++ /dev/null @@ -1,8418 +0,0 @@ -diff -Naurp nss-3.12.11/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c nss-3.12.11.oden/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c ---- nss-3.12.11/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c 2011-03-23 21:07:57.000000000 +0100 -+++ nss-3.12.11.oden/mozilla/security/nss/cmd/addbuiltin/addbuiltin.c 2011-08-12 09:57:58.646164811 +0200 -@@ -68,22 +68,22 @@ char *getTrustString(unsigned int trust) - { - if (trust & CERTDB_TRUSTED) { - if (trust & CERTDB_TRUSTED_CA) { -- return "CKT_NETSCAPE_TRUSTED_DELEGATOR|CKT_NETSCAPE_TRUSTED"; -+ return "CKT_NSS_TRUSTED_DELEGATOR"; - } else { -- return "CKT_NETSCAPE_TRUSTED"; -+ return "CKT_NSS_TRUSTED"; - } - } else { - if (trust & CERTDB_TRUSTED_CA) { -- return "CKT_NETSCAPE_TRUSTED_DELEGATOR"; -+ return "CKT_NSS_TRUSTED_DELEGATOR"; - } else if (trust & CERTDB_VALID_CA) { -- return "CKT_NETSCAPE_VALID_DELEGATOR"; -- } else if (trust & CERTDB_VALID_PEER) { -- return "CKT_NETSCAPE_VALID"; -+ return "CKT_NSS_VALID_DELEGATOR"; -+ } else if (trust & CERTDB_TERMINAL_RECORD) { -+ return "CKT_NSS_NOT_TRUSTED"; - } else { -- return "CKT_NETSCAPE_TRUST_UNKNOWN"; -+ return "CKT_NSS_MUST_VERIFY_TRUST"; - } - } -- return "CKT_NETSCAPE_TRUST_UNKNOWN"; /* not reached */ -+ return "CKT_NSS_TRUST_UNKNOWN"; /* not reached */ - } - - static const SEC_ASN1Template serialTemplate[] = { -@@ -133,7 +133,7 @@ ConvertCertificate(SECItem *sdder, char - PK11_HashBuf(SEC_OID_SHA1, sha1_hash, sdder->data, sdder->len); - PK11_HashBuf(SEC_OID_MD5, md5_hash, sdder->data, sdder->len); - printf("\n# Trust for Certificate \"%s\"\n",nickname); -- printf("CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST\n"); -+ printf("CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST\n"); - printf("CKA_TOKEN CK_BBOOL CK_TRUE\n"); - printf("CKA_PRIVATE CK_BBOOL CK_FALSE\n"); - printf("CKA_MODIFIABLE CK_BBOOL CK_FALSE\n"); -@@ -159,13 +159,13 @@ ConvertCertificate(SECItem *sdder, char - printf("CKA_TRUST_CODE_SIGNING CK_TRUST %s\n", - getTrustString(trust->objectSigningFlags)); - #ifdef notdef -- printf("CKA_TRUST_CLIENT_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED\n");*/ -- printf("CKA_TRUST_DIGITAL_SIGNATURE CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR\n"); -- printf("CKA_TRUST_NON_REPUDIATION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR\n"); -- printf("CKA_TRUST_KEY_ENCIPHERMENT CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR\n"); -- printf("CKA_TRUST_DATA_ENCIPHERMENT CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR\n"); -- printf("CKA_TRUST_KEY_AGREEMENT CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR\n"); -- printf("CKA_TRUST_KEY_CERT_SIGN CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR\n"); -+ printf("CKA_TRUST_CLIENT_AUTH CK_TRUST CKT_NSS_TRUSTED\n"); -+ printf("CKA_TRUST_DIGITAL_SIGNATURE CK_TRUST CKT_NSS_TRUSTED_DELEGATOR\n"); -+ printf("CKA_TRUST_NON_REPUDIATION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR\n"); -+ printf("CKA_TRUST_KEY_ENCIPHERMENT CK_TRUST CKT_NSS_TRUSTED_DELEGATOR\n"); -+ printf("CKA_TRUST_DATA_ENCIPHERMENT CK_TRUST CKT_NSS_TRUSTED_DELEGATOR\n"); -+ printf("CKA_TRUST_KEY_AGREEMENT CK_TRUST CKT_NSS_TRUSTED_DELEGATOR\n"); -+ printf("CKA_TRUST_KEY_CERT_SIGN CK_TRUST CKT_NSS_TRUSTED_DELEGATOR\n"); - #endif - printf("CKA_TRUST_STEP_UP_APPROVED CK_BBOOL %s\n", - trust->sslFlags & CERTDB_GOVT_APPROVED_CA ? -@@ -239,7 +239,7 @@ void printheader() { - "# CKA_ISSUER DER+base64 (varies)\n" - "# CKA_SERIAL_NUMBER DER+base64 (varies)\n" - "# CKA_VALUE DER+base64 (varies)\n" -- "# CKA_NETSCAPE_EMAIL ASCII7 (unused here)\n" -+ "# CKA_NSS_EMAIL ASCII7 (unused here)\n" - "#\n" - "# Trust\n" - "#\n" -@@ -276,7 +276,7 @@ void printheader() { - "# have to go looking for others.\n" - "#\n" - "BEGINDATA\n" -- "CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_BUILTIN_ROOT_LIST\n" -+ "CKA_CLASS CK_OBJECT_CLASS CKO_NSS_BUILTIN_ROOT_LIST\n" - "CKA_TOKEN CK_BBOOL CK_TRUE\n" - "CKA_PRIVATE CK_BBOOL CK_FALSE\n" - "CKA_MODIFIABLE CK_BBOOL CK_FALSE\n" -diff -Naurp nss-3.12.11/mozilla/security/nss/cmd/lib/pk11table.c nss-3.12.11.oden/mozilla/security/nss/cmd/lib/pk11table.c ---- nss-3.12.11/mozilla/security/nss/cmd/lib/pk11table.c 2009-03-31 01:40:51.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/cmd/lib/pk11table.c 2011-08-12 09:57:58.647164814 +0200 -@@ -155,10 +155,10 @@ const Constant _consts[] = { - mkEntry(CKO_HW_FEATURE, Object), - mkEntry(CKO_DOMAIN_PARAMETERS, Object), - mkEntry(CKO_KG_PARAMETERS, Object), -- mkEntry(CKO_NETSCAPE_CRL, Object), -- mkEntry(CKO_NETSCAPE_SMIME, Object), -- mkEntry(CKO_NETSCAPE_TRUST, Object), -- mkEntry(CKO_NETSCAPE_BUILTIN_ROOT_LIST, Object), -+ mkEntry(CKO_NSS_CRL, Object), -+ mkEntry(CKO_NSS_SMIME, Object), -+ mkEntry(CKO_NSS_TRUST, Object), -+ mkEntry(CKO_NSS_BUILTIN_ROOT_LIST, Object), - - mkEntry(CKH_MONOTONIC_COUNTER, Hardware), - mkEntry(CKH_CLOCK, Hardware), -@@ -188,7 +188,7 @@ const Constant _consts[] = { - mkEntry(CKK_CDMF, KeyType), - mkEntry(CKK_AES, KeyType), - mkEntry(CKK_CAMELLIA, KeyType), -- mkEntry(CKK_NETSCAPE_PKCS8, KeyType), -+ mkEntry(CKK_NSS_PKCS8, KeyType), - - mkEntry(CKC_X_509, CertType), - mkEntry(CKC_X_509_ATTR_CERT, CertType), -@@ -252,18 +252,18 @@ const Constant _consts[] = { - mkEntry2(CKA_HW_FEATURE_TYPE, Attribute, Hardware), - mkEntry2(CKA_RESET_ON_INIT, Attribute, Bool), - mkEntry2(CKA_HAS_RESET, Attribute, Bool), -- mkEntry2(CKA_NETSCAPE_URL, Attribute, None), -- mkEntry2(CKA_NETSCAPE_EMAIL, Attribute, None), -- mkEntry2(CKA_NETSCAPE_SMIME_INFO, Attribute, None), -- mkEntry2(CKA_NETSCAPE_SMIME_TIMESTAMP, Attribute, None), -- mkEntry2(CKA_NETSCAPE_PKCS8_SALT, Attribute, None), -- mkEntry2(CKA_NETSCAPE_PASSWORD_CHECK, Attribute, None), -- mkEntry2(CKA_NETSCAPE_EXPIRES, Attribute, None), -- mkEntry2(CKA_NETSCAPE_KRL, Attribute, None), -- mkEntry2(CKA_NETSCAPE_PQG_COUNTER, Attribute, None), -- mkEntry2(CKA_NETSCAPE_PQG_SEED, Attribute, None), -- mkEntry2(CKA_NETSCAPE_PQG_H, Attribute, None), -- mkEntry2(CKA_NETSCAPE_PQG_SEED_BITS, Attribute, None), -+ mkEntry2(CKA_NSS_URL, Attribute, None), -+ mkEntry2(CKA_NSS_EMAIL, Attribute, None), -+ mkEntry2(CKA_NSS_SMIME_INFO, Attribute, None), -+ mkEntry2(CKA_NSS_SMIME_TIMESTAMP, Attribute, None), -+ mkEntry2(CKA_NSS_PKCS8_SALT, Attribute, None), -+ mkEntry2(CKA_NSS_PASSWORD_CHECK, Attribute, None), -+ mkEntry2(CKA_NSS_EXPIRES, Attribute, None), -+ mkEntry2(CKA_NSS_KRL, Attribute, None), -+ mkEntry2(CKA_NSS_PQG_COUNTER, Attribute, None), -+ mkEntry2(CKA_NSS_PQG_SEED, Attribute, None), -+ mkEntry2(CKA_NSS_PQG_H, Attribute, None), -+ mkEntry2(CKA_NSS_PQG_SEED_BITS, Attribute, None), - mkEntry2(CKA_TRUST_DIGITAL_SIGNATURE, Attribute, Trust), - mkEntry2(CKA_TRUST_NON_REPUDIATION, Attribute, Trust), - mkEntry2(CKA_TRUST_KEY_ENCIPHERMENT, Attribute, Trust), -@@ -492,8 +492,8 @@ const Constant _consts[] = { - mkEntry(CKM_SEED_CBC_ENCRYPT_DATA, Mechanism), - mkEntry(CKM_DSA_PARAMETER_GEN, Mechanism), - mkEntry(CKM_DH_PKCS_PARAMETER_GEN, Mechanism), -- mkEntry(CKM_NETSCAPE_AES_KEY_WRAP, Mechanism), -- mkEntry(CKM_NETSCAPE_AES_KEY_WRAP_PAD, Mechanism), -+ mkEntry(CKM_NSS_AES_KEY_WRAP, Mechanism), -+ mkEntry(CKM_NSS_AES_KEY_WRAP_PAD, Mechanism), - mkEntry(CKM_NETSCAPE_PBE_SHA1_DES_CBC, Mechanism), - mkEntry(CKM_NETSCAPE_PBE_SHA1_TRIPLE_DES_CBC, Mechanism), - mkEntry(CKM_NETSCAPE_PBE_SHA1_40_BIT_RC2_CBC, Mechanism), -@@ -593,13 +593,12 @@ const Constant _consts[] = { - mkEntry(CKR_MUTEX_NOT_LOCKED, Result), - mkEntry(CKR_VENDOR_DEFINED, Result), - -- mkEntry(CKT_NETSCAPE_TRUSTED, Trust), -- mkEntry(CKT_NETSCAPE_TRUSTED_DELEGATOR, Trust), -- mkEntry(CKT_NETSCAPE_UNTRUSTED, Trust), -- mkEntry(CKT_NETSCAPE_MUST_VERIFY, Trust), -- mkEntry(CKT_NETSCAPE_TRUST_UNKNOWN, Trust), -- mkEntry(CKT_NETSCAPE_VALID, Trust), -- mkEntry(CKT_NETSCAPE_VALID_DELEGATOR, Trust), -+ mkEntry(CKT_NSS_TRUSTED, Trust), -+ mkEntry(CKT_NSS_TRUSTED_DELEGATOR, Trust), -+ mkEntry(CKT_NSS_NOT_TRUSTED, Trust), -+ mkEntry(CKT_NSS_MUST_VERIFY_TRUST, Trust), -+ mkEntry(CKT_NSS_TRUST_UNKNOWN, Trust), -+ mkEntry(CKT_NSS_VALID_DELEGATOR, Trust), - - mkEntry(CK_EFFECTIVELY_INFINITE, AvailableSizes), - mkEntry(CK_UNAVAILABLE_INFORMATION, CurrentSize), -diff -Naurp nss-3.12.11/mozilla/security/nss/cmd/lib/secutil.c nss-3.12.11.oden/mozilla/security/nss/cmd/lib/secutil.c ---- nss-3.12.11/mozilla/security/nss/cmd/lib/secutil.c 2011-05-07 20:30:45.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/cmd/lib/secutil.c 2011-08-12 09:57:58.649164822 +0200 -@@ -2384,7 +2384,7 @@ printflags(char *trusts, unsigned int fl - if (!(flags & CERTDB_TRUSTED_CA) && - !(flags & CERTDB_TRUSTED_CLIENT_CA)) - PORT_Strcat(trusts, "c"); -- if (flags & CERTDB_VALID_PEER) -+ if (flags & CERTDB_TERMINAL_RECORD) - if (!(flags & CERTDB_TRUSTED)) - PORT_Strcat(trusts, "p"); - if (flags & CERTDB_TRUSTED_CA) -@@ -3209,7 +3209,7 @@ SECU_PrintPKCS7ContentInfo(FILE *out, SE - void - printFlags(FILE *out, unsigned int flags, int level) - { -- if ( flags & CERTDB_VALID_PEER ) { -+ if ( flags & CERTDB_TERMINAL_RECORD ) { - SECU_Indent(out, level); fprintf(out, "Valid Peer\n"); - } - if ( flags & CERTDB_TRUSTED ) { -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/certdb/certdb.c nss-3.12.11.oden/mozilla/security/nss/lib/certdb/certdb.c ---- nss-3.12.11/mozilla/security/nss/lib/certdb/certdb.c 2011-08-05 03:16:27.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/certdb/certdb.c 2011-08-12 09:57:58.651164835 +0200 -@@ -2181,7 +2181,7 @@ cert_ComputeTrustOverrides(CERTCertifica - trust->emailFlags | - trust->objectSigningFlags)) { - -- if (trust->sslFlags & (CERTDB_VALID_PEER|CERTDB_TRUSTED)) -+ if (trust->sslFlags & (CERTDB_TERMINAL_RECORD|CERTDB_TRUSTED)) - cType |= NS_CERT_TYPE_SSL_SERVER|NS_CERT_TYPE_SSL_CLIENT; - if (trust->sslFlags & (CERTDB_VALID_CA|CERTDB_TRUSTED_CA)) - cType |= NS_CERT_TYPE_SSL_CA; -@@ -2190,7 +2190,7 @@ cert_ComputeTrustOverrides(CERTCertifica - cType &= ~(NS_CERT_TYPE_SSL_SERVER|NS_CERT_TYPE_SSL_CLIENT| - NS_CERT_TYPE_SSL_CA); - #endif -- if (trust->emailFlags & (CERTDB_VALID_PEER|CERTDB_TRUSTED)) -+ if (trust->emailFlags & (CERTDB_TERMINAL_RECORD|CERTDB_TRUSTED)) - cType |= NS_CERT_TYPE_EMAIL; - if (trust->emailFlags & (CERTDB_VALID_CA|CERTDB_TRUSTED_CA)) - cType |= NS_CERT_TYPE_EMAIL_CA; -@@ -2198,7 +2198,7 @@ cert_ComputeTrustOverrides(CERTCertifica - if (trust->emailFlags & CERTDB_NOT_TRUSTED) - cType &= ~(NS_CERT_TYPE_EMAIL|NS_CERT_TYPE_EMAIL_CA); - #endif -- if (trust->objectSigningFlags & (CERTDB_VALID_PEER|CERTDB_TRUSTED)) -+ if (trust->objectSigningFlags & (CERTDB_TERMINAL_RECORD|CERTDB_TRUSTED)) - cType |= NS_CERT_TYPE_OBJECT_SIGNING; - if (trust->objectSigningFlags & (CERTDB_VALID_CA|CERTDB_TRUSTED_CA)) - cType |= NS_CERT_TYPE_OBJECT_SIGNING_CA; -@@ -2449,11 +2449,11 @@ CERT_DecodeTrustString(CERTCertTrust *tr - for (i=0; i < PORT_Strlen(trusts); i++) { - switch (trusts[i]) { - case 'p': -- *pflags = *pflags | CERTDB_VALID_PEER; -+ *pflags = *pflags | CERTDB_TERMINAL_RECORD; - break; - - case 'P': -- *pflags = *pflags | CERTDB_TRUSTED | CERTDB_VALID_PEER; -+ *pflags = *pflags | CERTDB_TRUSTED | CERTDB_TERMINAL_RECORD; - break; - - case 'w': -@@ -2505,7 +2505,7 @@ EncodeFlags(char *trusts, unsigned int f - if (!(flags & CERTDB_TRUSTED_CA) && - !(flags & CERTDB_TRUSTED_CLIENT_CA)) - PORT_Strcat(trusts, "c"); -- if (flags & CERTDB_VALID_PEER) -+ if (flags & CERTDB_TERMINAL_RECORD) - if (!(flags & CERTDB_TRUSTED)) - PORT_Strcat(trusts, "p"); - if (flags & CERTDB_TRUSTED_CA) -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/certdb/certdb.h nss-3.12.11.oden/mozilla/security/nss/lib/certdb/certdb.h ---- nss-3.12.11/mozilla/security/nss/lib/certdb/certdb.h 2009-05-29 21:16:54.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/certdb/certdb.h 2011-08-12 09:57:58.652164842 +0200 -@@ -39,7 +39,7 @@ - - - /* common flags for all types of certificates */ --#define CERTDB_VALID_PEER (1<<0) -+#define CERTDB_TERMINAL_RECORD (1<<0) - #define CERTDB_TRUSTED (1<<1) - #define CERTDB_SEND_WARN (1<<2) - #define CERTDB_VALID_CA (1<<3) -@@ -50,6 +50,24 @@ - #define CERTDB_INVISIBLE_CA (1<<8) /* don't show in UI */ - #define CERTDB_GOVT_APPROVED_CA (1<<9) /* can do strong crypto in export ver */ - -+/* old usage, to keep old programs compiling */ -+/* On Windows, Mac, and Linux (and other gcc platforms), we can give compile -+ * time deprecation warnings when applications use the old CERTDB_VALID_PEER -+ * define */ -+#if __GNUC__ > 3 -+#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5) -+typedef unsigned int __CERTDB_VALID_PEER __attribute__((deprecated)); -+#else -+typedef unsigned int __CERTDB_VALID_PEER __attribute__((deprecated -+ ("CERTDB_VALID_PEER is now CERTDB_TERMINAL_RECORD"))); -+#endif -+#define CERTDB_VALID_PEER ((__CERTDB_VALID_PEER) CERTDB_TERMINAL_RECORD) -+#else -+#ifdef _WIN32 -+#pragma deprecated(CERTDB_VALID_PEER) -+#endif -+#define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD -+#endif - - SEC_BEGIN_PROTOS - -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/certhigh/certvfy.c nss-3.12.11.oden/mozilla/security/nss/lib/certhigh/certvfy.c ---- nss-3.12.11/mozilla/security/nss/lib/certhigh/certvfy.c 2011-08-05 14:27:50.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/certhigh/certvfy.c 2011-08-12 09:57:58.653164848 +0200 -@@ -1016,7 +1016,8 @@ CERT_VerifyCertificate(CERTCertDBHandle - flags = cert->trust->sslFlags; - - /* is the cert directly trusted or not trusted ? */ -- if ( flags & CERTDB_VALID_PEER ) {/*the trust record is valid*/ -+ if ( flags & CERTDB_TERMINAL_RECORD ) { /* the trust record is -+ * authoritative*/ - if ( flags & CERTDB_TRUSTED ) { /* trust this cert */ - VALID_USAGE(); - } else { /* don't trust this cert */ -@@ -1038,8 +1039,8 @@ CERT_VerifyCertificate(CERTCertDBHandle - flags = cert->trust->emailFlags; - - /* is the cert directly trusted or not trusted ? */ -- if ( ( flags & ( CERTDB_VALID_PEER | CERTDB_TRUSTED ) ) == -- ( CERTDB_VALID_PEER | CERTDB_TRUSTED ) ) { -+ if ( ( flags & ( CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED ) ) == -+ ( CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED ) ) { - VALID_USAGE(); - } - break; -@@ -1047,7 +1048,8 @@ CERT_VerifyCertificate(CERTCertDBHandle - flags = cert->trust->objectSigningFlags; - - /* is the cert directly trusted or not trusted ? */ -- if ( flags & CERTDB_VALID_PEER ) {/*the trust record is valid*/ -+ if ( flags & CERTDB_TERMINAL_RECORD ) { /* the trust record is -+ * authoritative */ - if ( flags & CERTDB_TRUSTED ) { /* trust this cert */ - VALID_USAGE(); - } else { /* don't trust this cert */ -@@ -1220,7 +1222,8 @@ CERT_VerifyCert(CERTCertDBHandle *handle - flags = cert->trust->sslFlags; - - /* is the cert directly trusted or not trusted ? */ -- if ( flags & CERTDB_VALID_PEER ) {/*the trust record is valid*/ -+ if ( flags & CERTDB_TERMINAL_RECORD) { /* the trust record is -+ * authoritative */ - if ( flags & CERTDB_TRUSTED ) { /* trust this cert */ - goto winner; - } else { /* don't trust this cert */ -@@ -1239,8 +1242,8 @@ CERT_VerifyCert(CERTCertDBHandle *handle - flags = cert->trust->emailFlags; - - /* is the cert directly trusted or not trusted ? */ -- if ( ( flags & ( CERTDB_VALID_PEER | CERTDB_TRUSTED ) ) == -- ( CERTDB_VALID_PEER | CERTDB_TRUSTED ) ) { -+ if ( ( flags & ( CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED ) ) == -+ ( CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED ) ) { - goto winner; - } - break; -@@ -1248,7 +1251,8 @@ CERT_VerifyCert(CERTCertDBHandle *handle - flags = cert->trust->objectSigningFlags; - - /* is the cert directly trusted or not trusted ? */ -- if ( flags & CERTDB_VALID_PEER ) {/*the trust record is valid*/ -+ if ( flags & CERTDB_TERMINAL_RECORD ) { /* the trust record is -+ * authoritative */ - if ( flags & CERTDB_TRUSTED ) { /* trust this cert */ - goto winner; - } else { /* don't trust this cert */ -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c nss-3.12.11.oden/mozilla/security/nss/lib/ckfw/builtins/certdata.c ---- nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-01 08:40:03.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-12 10:03:42.557097662 +0200 -@@ -47,12 +47,11 @@ static const CK_BBOOL ck_true = CK_TRUE; - static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509; - static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE; - static const CK_OBJECT_CLASS cko_data = CKO_DATA; --static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST; --static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST; --static const CK_TRUST ckt_netscape_trust_unknown = CKT_NETSCAPE_TRUST_UNKNOWN; --static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR; --static const CK_TRUST ckt_netscape_untrusted = CKT_NETSCAPE_UNTRUSTED; --static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID; -+static const CK_OBJECT_CLASS cko_nss_builtin_root_list = CKO_NSS_BUILTIN_ROOT_LIST; -+static const CK_OBJECT_CLASS cko_nss_trust = CKO_NSS_TRUST; -+static const CK_TRUST ckt_nss_not_trusted = CKT_NSS_NOT_TRUSTED; -+static const CK_TRUST ckt_nss_trust_unknown = CKT_NSS_TRUST_UNKNOWN; -+static const CK_TRUST ckt_nss_trusted_delegator = CKT_NSS_TRUSTED_DELEGATOR; - #ifdef DEBUG - static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_APPLICATION, CKA_VALUE -@@ -1057,7 +1056,7 @@ static const NSSItem nss_builtins_items_ - }; - #endif /* DEBUG */ - static const NSSItem nss_builtins_items_1 [] = { -- { (void *)&cko_netscape_builtin_root_list, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_builtin_root_list, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1132,7 +1131,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)606 } - }; - static const NSSItem nss_builtins_items_3 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1153,9 +1152,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)119 }, - { (void *)"\002\002\001\245" - , (PRUint32)4 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_4 [] = { -@@ -1249,7 +1248,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)791 } - }; - static const NSSItem nss_builtins_items_5 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1275,9 +1274,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)199 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_6 [] = { -@@ -1374,7 +1373,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)811 } - }; - static const NSSItem nss_builtins_items_7 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1401,9 +1400,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)209 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_8 [] = { -@@ -1482,7 +1481,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)804 } - }; - static const NSSItem nss_builtins_items_9 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1500,9 +1499,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)80 }, - { (void *)"\002\004\065\336\364\317" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_10 [] = { -@@ -1581,7 +1580,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)813 } - }; - static const NSSItem nss_builtins_items_11 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1599,9 +1598,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)72 }, - { (void *)"\002\004\066\160\025\226" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_12 [] = { -@@ -1680,7 +1679,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)813 } - }; - static const NSSItem nss_builtins_items_13 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1698,9 +1697,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)72 }, - { (void *)"\002\004\066\156\323\316" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_14 [] = { -@@ -1770,7 +1769,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)577 } - }; - static const NSSItem nss_builtins_items_15 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1791,9 +1790,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263" - "\162\252\125" - , (PRUint32)19 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_16 [] = { -@@ -1862,7 +1861,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)576 } - }; - static const NSSItem nss_builtins_items_17 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1883,9 +1882,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105" - "\276\013" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_18 [] = { -@@ -1954,7 +1953,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)576 } - }; - static const NSSItem nss_builtins_items_19 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -1975,9 +1974,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314" - "\272\277" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_20 [] = { -@@ -2071,7 +2070,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)774 } - }; - static const NSSItem nss_builtins_items_21 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2098,9 +2097,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211" - "\221\222" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_22 [] = { -@@ -2194,7 +2193,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)775 } - }; - static const NSSItem nss_builtins_items_23 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2221,9 +2220,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160" - "\154\212\257" - , (PRUint32)19 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_24 [] = { -@@ -2317,7 +2316,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)774 } - }; - static const NSSItem nss_builtins_items_25 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2344,9 +2343,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211" - "\064\306" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_26 [] = { -@@ -2440,7 +2439,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)774 } - }; - static const NSSItem nss_builtins_items_27 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2467,9 +2466,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067" - "\045\370" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_28 [] = { -@@ -2555,7 +2554,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)889 } - }; - static const NSSItem nss_builtins_items_29 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2574,9 +2573,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)89 }, - { (void *)"\002\013\004\000\000\000\000\001\025\113\132\303\224" - , (PRUint32)13 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_30 [] = { -@@ -2664,7 +2663,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)958 } - }; - static const NSSItem nss_builtins_items_31 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2682,9 +2681,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)78 }, - { (void *)"\002\013\004\000\000\000\000\001\017\206\046\346\015" - , (PRUint32)13 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_32 [] = { -@@ -2773,7 +2772,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)747 } - }; - static const NSSItem nss_builtins_items_33 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2798,9 +2797,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)190 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_34 [] = { -@@ -2889,7 +2888,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)747 } - }; - static const NSSItem nss_builtins_items_35 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -2914,9 +2913,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)190 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_36 [] = { -@@ -3005,7 +3004,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)747 } - }; - static const NSSItem nss_builtins_items_37 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3030,9 +3029,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)190 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_38 [] = { -@@ -3143,7 +3142,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1054 } - }; - static const NSSItem nss_builtins_items_39 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3170,9 +3169,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110" - "\316\261\244" - , (PRUint32)19 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_40 [] = { -@@ -3283,7 +3282,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1053 } - }; - static const NSSItem nss_builtins_items_41 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3310,9 +3309,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120" - "\133\172" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_42 [] = { -@@ -3423,7 +3422,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1054 } - }; - static const NSSItem nss_builtins_items_43 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3450,9 +3449,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161" - "\051\357\127" - , (PRUint32)19 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_44 [] = { -@@ -3563,7 +3562,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1054 } - }; - static const NSSItem nss_builtins_items_45 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3590,9 +3589,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057" - "\224\136\327" - , (PRUint32)19 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_46 [] = { -@@ -3714,7 +3713,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1244 } - }; - static const NSSItem nss_builtins_items_47 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3740,9 +3739,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)198 }, - { (void *)"\002\004\067\112\322\103" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_48 [] = { -@@ -3854,7 +3853,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1120 } - }; - static const NSSItem nss_builtins_items_49 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3879,9 +3878,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)183 }, - { (void *)"\002\004\070\143\271\146" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_50 [] = { -@@ -3967,7 +3966,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)891 } - }; - static const NSSItem nss_builtins_items_51 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -3986,9 +3985,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)92 }, - { (void *)"\002\004\002\000\000\271" - , (PRUint32)6 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_52 [] = { -@@ -4060,7 +4059,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)660 } - }; - static const NSSItem nss_builtins_items_53 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4079,9 +4078,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)92 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_54 [] = { -@@ -4152,7 +4151,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)646 } - }; - static const NSSItem nss_builtins_items_55 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4171,9 +4170,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)85 }, - { (void *)"\002\001\004" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_56 [] = { -@@ -4252,7 +4251,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)804 } - }; - static const NSSItem nss_builtins_items_57 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4270,9 +4269,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)80 }, - { (void *)"\002\004\067\160\317\265" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_58 [] = { -@@ -4370,7 +4369,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1052 } - }; - static const NSSItem nss_builtins_items_59 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4390,9 +4389,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)103 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_60 [] = { -@@ -4494,7 +4493,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1082 } - }; - static const NSSItem nss_builtins_items_61 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4515,9 +4514,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)113 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_62 [] = { -@@ -4615,7 +4614,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1049 } - }; - static const NSSItem nss_builtins_items_63 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4635,9 +4634,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)102 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_64 [] = { -@@ -4736,7 +4735,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1058 } - }; - static const NSSItem nss_builtins_items_65 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4756,9 +4755,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)105 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_66 [] = { -@@ -4874,7 +4873,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1173 } - }; - static const NSSItem nss_builtins_items_67 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -4899,9 +4898,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)179 }, - { (void *)"\002\004\105\153\120\124" - , (PRUint32)6 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_68 [] = { -@@ -4983,7 +4982,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)869 } - }; - static const NSSItem nss_builtins_items_69 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5001,9 +5000,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000" - "\000\002" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_70 [] = { -@@ -5085,7 +5084,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)856 } - }; - static const NSSItem nss_builtins_items_71 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5103,9 +5102,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)68 }, - { (void *)"\002\003\002\064\126" - , (PRUint32)5 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_72 [] = { -@@ -5188,7 +5187,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)874 } - }; - static const NSSItem nss_builtins_items_73 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5206,9 +5205,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)70 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_74 [] = { -@@ -5323,7 +5322,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1388 } - }; - static const NSSItem nss_builtins_items_75 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5341,9 +5340,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)71 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_76 [] = { -@@ -5458,7 +5457,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1392 } - }; - static const NSSItem nss_builtins_items_77 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5476,9 +5475,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)73 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_78 [] = { -@@ -5590,7 +5589,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1128 } - }; - static const NSSItem nss_builtins_items_79 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5615,9 +5614,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300" - "\063\167" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_80 [] = { -@@ -5708,7 +5707,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)936 } - }; - static const NSSItem nss_builtins_items_81 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5728,9 +5727,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)101 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_82 [] = { -@@ -5853,7 +5852,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1448 } - }; - static const NSSItem nss_builtins_items_83 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5873,9 +5872,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)101 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_84 [] = { -@@ -5967,7 +5966,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)934 } - }; - static const NSSItem nss_builtins_items_85 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -5988,9 +5987,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\023\206\065\115\035\077\006\362\301\371\145\005\325\220" - "\034\142" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_86 [] = { -@@ -6086,7 +6085,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)864 } - }; - static const NSSItem nss_builtins_items_87 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -6111,9 +6110,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)191 }, - { (void *)"\002\002\003\352" - , (PRUint32)4 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_88 [] = { -@@ -6209,7 +6208,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)864 } - }; - static const NSSItem nss_builtins_items_89 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -6234,9 +6233,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)191 }, - { (void *)"\002\002\003\353" - , (PRUint32)4 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_90 [] = { -@@ -6311,7 +6310,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)784 } - }; - static const NSSItem nss_builtins_items_91 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -6328,9 +6327,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)64 }, - { (void *)"\002\003\001\000\040" - , (PRUint32)5 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_92 [] = { -@@ -6432,7 +6431,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1078 } - }; - static const NSSItem nss_builtins_items_93 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -6453,9 +6452,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)125 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_94 [] = { -@@ -6558,7 +6557,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1091 } - }; - static const NSSItem nss_builtins_items_95 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -6579,9 +6578,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)128 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_96 [] = { -@@ -6686,7 +6685,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1095 } - }; - static const NSSItem nss_builtins_items_97 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -6708,9 +6707,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)129 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_98 [] = { -@@ -6840,7 +6839,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1492 } - }; - static const NSSItem nss_builtins_items_99 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -6862,9 +6861,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)129 }, - { (void *)"\002\004\072\266\120\213" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_100 [] = { -@@ -6984,7 +6983,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1467 } - }; - static const NSSItem nss_builtins_items_101 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7002,9 +7001,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)71 }, - { (void *)"\002\002\005\011" - , (PRUint32)4 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_102 [] = { -@@ -7139,7 +7138,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1697 } - }; - static const NSSItem nss_builtins_items_103 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7157,9 +7156,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)71 }, - { (void *)"\002\002\005\306" - , (PRUint32)4 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_104 [] = { -@@ -7243,7 +7242,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)862 } - }; - static const NSSItem nss_builtins_items_105 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7262,9 +7261,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)82 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_106 [] = { -@@ -7341,7 +7340,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)804 } - }; - static const NSSItem nss_builtins_items_107 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7358,9 +7357,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)59 }, - { (void *)"\002\001\044" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_108 [] = { -@@ -7437,7 +7436,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)804 } - }; - static const NSSItem nss_builtins_items_109 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7454,9 +7453,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)59 }, - { (void *)"\002\001\035" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_110 [] = { -@@ -7546,7 +7545,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)958 } - }; - static const NSSItem nss_builtins_items_111 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7565,9 +7564,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)87 }, - { (void *)"\002\004\000\230\226\212" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_112 [] = { -@@ -7662,7 +7661,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1071 } - }; - static const NSSItem nss_builtins_items_113 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7680,9 +7679,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)69 }, - { (void *)"\002\004\072\314\245\114" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_114 [] = { -@@ -7790,7 +7789,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1309 } - }; - static const NSSItem nss_builtins_items_115 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7807,9 +7806,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)51 }, - { (void *)"\002\004\076\110\275\304" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_116 [] = { -@@ -7919,7 +7918,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1122 } - }; - static const NSSItem nss_builtins_items_117 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -7943,9 +7942,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\104\276\014\213\120\000\041\264\021\323\052\150\006\251" - "\255\151" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_118 [] = { -@@ -8063,7 +8062,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1190 } - }; - static const NSSItem nss_builtins_items_119 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -8089,9 +8088,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\045\045\147" - "\311\211" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_120 [] = { -@@ -8202,7 +8201,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1144 } - }; - static const NSSItem nss_builtins_items_121 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -8226,9 +8225,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\052\376\145" - "\012\375" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_122 [] = { -@@ -8338,7 +8337,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1130 } - }; - static const NSSItem nss_builtins_items_123 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -8362,9 +8361,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\055\340\263" - "\137\033" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_124 [] = { -@@ -8477,7 +8476,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1217 } - }; - static const NSSItem nss_builtins_items_125 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -8499,9 +8498,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)129 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_126 [] = { -@@ -8612,7 +8611,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1225 } - }; - static const NSSItem nss_builtins_items_127 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -8633,9 +8632,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)127 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_128 [] = { -@@ -8789,7 +8788,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1749 } - }; - static const NSSItem nss_builtins_items_129 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -8815,9 +8814,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)204 }, - { (void *)"\002\001\173" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_130 [] = { -@@ -8964,7 +8963,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1665 } - }; - static const NSSItem nss_builtins_items_131 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -8989,9 +8988,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)178 }, - { (void *)"\002\002\001\003" - , (PRUint32)4 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_132 [] = { -@@ -9114,7 +9113,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1359 } - }; - static const NSSItem nss_builtins_items_133 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -9137,9 +9136,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)156 }, - { (void *)"\002\001\151" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_134 [] = { -@@ -9263,7 +9262,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1363 } - }; - static const NSSItem nss_builtins_items_135 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -9286,9 +9285,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)158 }, - { (void *)"\002\001\150" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_136 [] = { -@@ -9393,7 +9392,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1076 } - }; - static const NSSItem nss_builtins_items_137 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -9416,9 +9415,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\120\224\154\354\030\352\325\234\115\325\227\357\165\217" - "\240\255" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_138 [] = { -@@ -9515,7 +9514,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1028 } - }; - static const NSSItem nss_builtins_items_139 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -9535,9 +9534,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)101 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_140 [] = { -@@ -9635,7 +9634,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1043 } - }; - static const NSSItem nss_builtins_items_141 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -9655,9 +9654,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)106 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_142 [] = { -@@ -9816,7 +9815,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1997 } - }; - static const NSSItem nss_builtins_items_143 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -9837,9 +9836,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)127 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_144 [] = { -@@ -9956,7 +9955,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1398 } - }; - static const NSSItem nss_builtins_items_145 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -9975,9 +9974,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\037\235\131\132\327\057\302\006\104\245\200\010\151\343" - "\136\366" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_146 [] = { -@@ -10085,7 +10084,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1115 } - }; - static const NSSItem nss_builtins_items_147 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10108,9 +10107,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)160 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_148 [] = { -@@ -10209,7 +10208,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1001 } - }; - static const NSSItem nss_builtins_items_149 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10231,9 +10230,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)133 }, - { (void *)"\002\004\071\344\227\236" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_150 [] = { -@@ -10360,7 +10359,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1501 } - }; - static const NSSItem nss_builtins_items_151 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10381,9 +10380,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\134\013\205\134\013\347\131\101\337\127\314\077\177\235" - "\250\066" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_152 [] = { -@@ -10476,7 +10475,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)955 } - }; - static const NSSItem nss_builtins_items_153 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10497,9 +10496,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\014\347\340\345\027\330\106\376\217\345\140\374\033\360" - "\060\071" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_154 [] = { -@@ -10592,7 +10591,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)947 } - }; - static const NSSItem nss_builtins_items_155 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10613,9 +10612,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\010\073\340\126\220\102\106\261\241\165\152\311\131\221" - "\307\112" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_156 [] = { -@@ -10709,7 +10708,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)969 } - }; - static const NSSItem nss_builtins_items_157 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10730,9 +10729,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\002\254\134\046\152\013\100\233\217\013\171\362\256\106" - "\045\167" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_158 [] = { -@@ -10817,7 +10816,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)918 } - }; - static const NSSItem nss_builtins_items_159 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10835,9 +10834,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\205\275\113\363\330\332\343\151\366\224\327\137\303" - "\245\104\043" - , (PRUint32)19 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_160 [] = { -@@ -10919,7 +10918,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)846 } - }; - static const NSSItem nss_builtins_items_161 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -10938,9 +10937,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\104\257\260\200\326\243\047\272\211\060\071\206\056\370" - "\100\153" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_162 [] = { -@@ -11036,7 +11035,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1037 } - }; - static const NSSItem nss_builtins_items_163 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11056,9 +11055,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\015\136\231\012\326\235\267\170\354\330\007\126\073\206" - "\025\331" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_164 [] = { -@@ -11164,7 +11163,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1023 } - }; - static const NSSItem nss_builtins_items_165 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11189,9 +11188,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)186 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_166 [] = { -@@ -11303,7 +11302,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1088 } - }; - static const NSSItem nss_builtins_items_167 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11329,9 +11328,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)193 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_168 [] = { -@@ -11452,7 +11451,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1477 } - }; - static const NSSItem nss_builtins_items_169 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11470,9 +11469,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)75 }, - { (void *)"\002\010\116\262\000\147\014\003\135\117" - , (PRUint32)10 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_170 [] = { -@@ -11592,7 +11591,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1470 } - }; - static const NSSItem nss_builtins_items_171 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11610,9 +11609,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)71 }, - { (void *)"\002\011\000\273\100\034\103\365\136\117\260" - , (PRUint32)11 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_172 [] = { -@@ -11733,7 +11732,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1473 } - }; - static const NSSItem nss_builtins_items_173 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11751,9 +11750,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)73 }, - { (void *)"\002\010\117\033\324\057\124\273\057\113" - , (PRUint32)10 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_174 [] = { -@@ -11840,7 +11839,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)896 } - }; - static const NSSItem nss_builtins_items_175 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11860,9 +11859,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\030\254\265\152\375\151\266\025\072\143\154\257\332\372" - "\304\241" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_176 [] = { -@@ -11970,7 +11969,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1060 } - }; - static const NSSItem nss_builtins_items_177 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -11995,9 +11994,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\064\116\325\127\040\325\355\354\111\364\057\316\067\333" - "\053\155" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_178 [] = { -@@ -12120,7 +12119,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1239 } - }; - static const NSSItem nss_builtins_items_179 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12147,9 +12146,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\030\332\321\236\046\175\350\273\112\041\130\315\314\153" - "\073\112" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_180 [] = { -@@ -12238,7 +12237,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)956 } - }; - static const NSSItem nss_builtins_items_181 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12257,9 +12256,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030" - "\131\320" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_182 [] = { -@@ -12348,7 +12347,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)960 } - }; - static const NSSItem nss_builtins_items_183 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12367,9 +12366,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370" - "\352\245" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_184 [] = { -@@ -12473,7 +12472,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1057 } - }; - static const NSSItem nss_builtins_items_185 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12496,9 +12495,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106" - "\345\075" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_186 [] = { -@@ -12620,7 +12619,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1422 } - }; - static const NSSItem nss_builtins_items_187 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12641,9 +12640,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" - "\074\114" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_188 [] = { -@@ -12739,7 +12738,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1002 } - }; - static const NSSItem nss_builtins_items_189 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12760,9 +12759,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061" - "\150\340" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_190 [] = { -@@ -12875,7 +12874,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1217 } - }; - static const NSSItem nss_builtins_items_191 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12897,9 +12896,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)136 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_192 [] = { -@@ -12977,7 +12976,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)653 } - }; - static const NSSItem nss_builtins_items_193 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13000,9 +12999,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143" - "\231\052" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_194 [] = { -@@ -13098,7 +13097,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1078 } - }; - static const NSSItem nss_builtins_items_195 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13117,9 +13116,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)92 }, - { (void *)"\002\001\102" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_196 [] = { -@@ -13220,7 +13219,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1030 } - }; - static const NSSItem nss_builtins_items_197 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13242,9 +13241,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)136 }, - { (void *)"\002\005\071\021\105\020\224" - , (PRUint32)7 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_198 [] = { -@@ -13333,7 +13332,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)897 } - }; - static const NSSItem nss_builtins_items_199 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13353,9 +13352,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)98 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_200 [] = { -@@ -13456,7 +13455,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1013 } - }; - static const NSSItem nss_builtins_items_201 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13479,9 +13478,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124" - "\337\232" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_202 [] = { -@@ -13596,7 +13595,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1151 } - }; - static const NSSItem nss_builtins_items_203 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13622,9 +13621,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\067\031\030\346\123\124\174\032\265\270\313\131\132\333" - "\065\267" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_204 [] = { -@@ -13782,7 +13781,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1964 } - }; - static const NSSItem nss_builtins_items_205 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13804,9 +13803,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\314\270\347\277\116\051\032\375\242\334\146\245\034" - "\054\017\021" - , (PRUint32)19 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_206 [] = { -@@ -13891,7 +13890,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)940 } - }; - static const NSSItem nss_builtins_items_207 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13908,9 +13907,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)54 }, - { (void *)"\002\011\000\376\334\343\001\017\311\110\377" - , (PRUint32)11 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_208 [] = { -@@ -14048,7 +14047,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1642 } - }; - static const NSSItem nss_builtins_items_209 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14070,9 +14069,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\017\007\176\122\223\173\340\025\343\127\360\151\214\313\354" - "\014" - , (PRUint32)17 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_210 [] = { -@@ -14181,7 +14180,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1198 } - }; - static const NSSItem nss_builtins_items_211 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14202,9 +14201,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)120 }, - { (void *)"\002\016\056\152\000\001\000\002\037\327\122\041\054\021\134\073" - , (PRUint32)16 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_212 [] = { -@@ -14313,7 +14312,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1198 } - }; - static const NSSItem nss_builtins_items_213 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14334,9 +14333,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)120 }, - { (void *)"\002\016\112\107\000\001\000\002\345\240\135\326\077\000\121\277" - , (PRUint32)16 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_214 [] = { -@@ -14433,7 +14432,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)993 } - }; - static const NSSItem nss_builtins_items_215 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14454,9 +14453,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)123 }, - { (void *)"\002\016\035\242\000\001\000\002\354\267\140\200\170\215\266\006" - , (PRUint32)16 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_216 [] = { -@@ -14549,7 +14548,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)931 } - }; - static const NSSItem nss_builtins_items_217 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14570,9 +14569,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)115 }, - { (void *)"\002\001\046" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_218 [] = { -@@ -14657,7 +14656,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)919 } - }; - static const NSSItem nss_builtins_items_219 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14675,9 +14674,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\024\023\226\203\024\125\214\352\173\143\345\374\064\207" - "\167\104" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_220 [] = { -@@ -14763,7 +14762,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)943 } - }; - static const NSSItem nss_builtins_items_221 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14781,9 +14780,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\307\050\107\011\263\270\154\105\214\035\372\044\365" - "\066\116\351" - , (PRUint32)19 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_222 [] = { -@@ -14868,7 +14867,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)933 } - }; - static const NSSItem nss_builtins_items_223 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14885,9 +14884,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)61 }, - { (void *)"\002\013\004\000\000\000\000\001\017\205\252\055\110" - , (PRUint32)13 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_224 [] = { -@@ -15010,7 +15009,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1460 } - }; - static const NSSItem nss_builtins_items_225 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15030,9 +15029,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322" - "\274\235" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_226 [] = { -@@ -15170,7 +15169,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1307 } - }; - static const NSSItem nss_builtins_items_227 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15202,9 +15201,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)303 }, - { (void *)"\002\001\021" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_228 [] = { -@@ -15286,7 +15285,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)855 } - }; - static const NSSItem nss_builtins_items_229 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15304,9 +15303,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)77 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_230 [] = { -@@ -15388,7 +15387,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)855 } - }; - static const NSSItem nss_builtins_items_231 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15406,9 +15405,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)77 }, - { (void *)"\002\001\002" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_232 [] = { -@@ -15539,7 +15538,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1515 } - }; - static const NSSItem nss_builtins_items_233 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15561,9 +15560,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)131 }, - { (void *)"\002\010\114\257\163\102\034\216\164\002" - , (PRUint32)10 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_234 [] = { -@@ -15641,7 +15640,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)828 } - }; - static const NSSItem nss_builtins_items_235 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15658,9 +15657,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)61 }, - { (void *)"\002\006\040\006\005\026\160\002" - , (PRUint32)8 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_236 [] = { -@@ -15740,7 +15739,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)857 } - }; - static const NSSItem nss_builtins_items_237 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15757,9 +15756,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)52 }, - { (void *)"\002\004\111\063\000\001" - , (PRUint32)6 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_238 [] = { -@@ -15846,7 +15845,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)932 } - }; - static const NSSItem nss_builtins_items_239 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15864,9 +15863,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)69 }, - { (void *)"\002\001\061" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_240 [] = { -@@ -15970,7 +15969,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1026 } - }; - static const NSSItem nss_builtins_items_241 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15994,9 +15993,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030" - "\017\037" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_242 [] = { -@@ -16074,7 +16073,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)652 } - }; - static const NSSItem nss_builtins_items_243 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16097,9 +16096,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256" - "\327\126" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_244 [] = { -@@ -16209,7 +16208,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1070 } - }; - static const NSSItem nss_builtins_items_245 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16235,9 +16234,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367" - "\220\373" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_246 [] = { -@@ -16320,7 +16319,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)690 } - }; - static const NSSItem nss_builtins_items_247 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16344,9 +16343,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076" - "\303\153" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_248 [] = { -@@ -16465,7 +16464,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1213 } - }; - static const NSSItem nss_builtins_items_249 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16491,9 +16490,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032" - "\305\035" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_250 [] = { -@@ -16595,7 +16594,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)904 } - }; - static const NSSItem nss_builtins_items_251 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16622,9 +16621,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207" - "\254\263" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_252 [] = { -@@ -16730,7 +16729,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1049 } - }; - static const NSSItem nss_builtins_items_253 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16754,9 +16753,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)170 }, - { (void *)"\002\006\111\101\054\344\000\020" - , (PRUint32)8 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_254 [] = { -@@ -16879,7 +16878,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1486 } - }; - static const NSSItem nss_builtins_items_255 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16898,9 +16897,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)92 }, - { (void *)"\002\004\000\230\226\214" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_256 [] = { -@@ -16994,7 +16993,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1043 } - }; - static const NSSItem nss_builtins_items_257 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17012,9 +17011,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)76 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_258 [] = { -@@ -17123,7 +17122,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1258 } - }; - static const NSSItem nss_builtins_items_259 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17142,9 +17141,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)95 }, - { (void *)"\002\004\073\216\113\374" - , (PRUint32)6 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_260 [] = { -@@ -17224,7 +17223,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)820 } - }; - static const NSSItem nss_builtins_items_261 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17242,9 +17241,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)73 }, - { (void *)"\002\002\003\350" - , (PRUint32)4 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_262 [] = { -@@ -17330,7 +17329,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)881 } - }; - static const NSSItem nss_builtins_items_263 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17349,9 +17348,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)90 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_264 [] = { -@@ -17471,7 +17470,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1465 } - }; - static const NSSItem nss_builtins_items_265 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17489,9 +17488,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)70 }, - { (void *)"\002\010\141\215\307\206\073\001\202\005" - , (PRUint32)10 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_266 [] = { -@@ -17560,7 +17559,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)576 } - }; - static const NSSItem nss_builtins_items_267 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17581,9 +17580,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242" - "\344\335" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_268 [] = { -@@ -17652,7 +17651,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)576 } - }; - static const NSSItem nss_builtins_items_269 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17673,9 +17672,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277" - "\022\276" - , (PRUint32)18 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_270 [] = { -@@ -17776,7 +17775,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1038 } - }; - static const NSSItem nss_builtins_items_271 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17798,9 +17797,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)133 }, - { (void *)"\002\011\000\302\176\103\004\116\107\077\031" - , (PRUint32)11 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_272 [] = { -@@ -17895,7 +17894,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)954 } - }; - static const NSSItem nss_builtins_items_273 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17917,9 +17916,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333" - "\254\265" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_274 [] = { -@@ -18002,7 +18001,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)867 } - }; - static const NSSItem nss_builtins_items_275 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18020,9 +18019,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)78 }, - { (void *)"\002\013\004\000\000\000\000\001\041\130\123\010\242" - , (PRUint32)13 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_276 [] = { -@@ -18119,7 +18118,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)997 } - }; - static const NSSItem nss_builtins_items_277 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18140,9 +18139,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)125 }, - { (void *)"\002\016\143\045\000\001\000\002\024\215\063\025\002\344\154\364" - , (PRUint32)16 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_278 [] = { -@@ -18270,7 +18269,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1560 } - }; - static const NSSItem nss_builtins_items_279 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18289,9 +18288,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)83 }, - { (void *)"\002\010\123\354\073\356\373\262\110\137" - , (PRUint32)10 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_280 [] = { -@@ -18414,7 +18413,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1525 } - }; - static const NSSItem nss_builtins_items_281 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18432,9 +18431,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\000\260\267\132\026\110\137\277\341\313\365\213\327\031" - "\346\175" - , (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_282 [] = { -@@ -18594,7 +18593,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1875 } - }; - static const NSSItem nss_builtins_items_283 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18619,9 +18618,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)177 }, - { (void *)"\002\011\000\243\332\102\176\244\261\256\332" - , (PRUint32)11 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_284 [] = { -@@ -18778,7 +18777,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1869 } - }; - static const NSSItem nss_builtins_items_285 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18802,9 +18801,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)175 }, - { (void *)"\002\011\000\311\315\323\351\325\175\043\316" - , (PRUint32)11 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_286 [] = { -@@ -18944,7 +18943,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1532 } - }; - static const NSSItem nss_builtins_items_287 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18968,9 +18967,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341" - "\362\077\103" - , (PRUint32)19 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_288 [] = { -@@ -19125,7 +19124,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1761 } - }; - static const NSSItem nss_builtins_items_289 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19149,9 +19148,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025" - "\070\057\260" - , (PRUint32)19 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_290 [] = { -@@ -19291,7 +19290,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1522 } - }; - static const NSSItem nss_builtins_items_291 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19315,9 +19314,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014" - "\256\036" - , (PRUint32)18 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_292 [] = { -@@ -19456,7 +19455,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1512 } - }; - static const NSSItem nss_builtins_items_293 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19480,9 +19479,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311" - "\130\174\006" - , (PRUint32)19 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_294 [] = { -@@ -19622,7 +19621,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1523 } - }; - static const NSSItem nss_builtins_items_295 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19646,9 +19645,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210" - "\025\104\107" - , (PRUint32)19 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_296 [] = { -@@ -19788,7 +19787,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1523 } - }; - static const NSSItem nss_builtins_items_297 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19812,9 +19811,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160" - "\167\051\243" - , (PRUint32)19 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_298 [] = { -@@ -19952,7 +19951,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1501 } - }; - static const NSSItem nss_builtins_items_299 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19976,9 +19975,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340" - "\302\051" - , (PRUint32)18 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_300 [] = { -@@ -20116,7 +20115,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1501 } - }; - static const NSSItem nss_builtins_items_301 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20140,9 +20139,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250" - "\052\161" - , (PRUint32)18 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_302 [] = { -@@ -20281,7 +20280,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1520 } - }; - static const NSSItem nss_builtins_items_303 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20305,9 +20304,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164" - "\275\072\300" - , (PRUint32)19 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_304 [] = { -@@ -20439,7 +20438,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1392 } - }; - static const NSSItem nss_builtins_items_305 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20463,9 +20462,9 @@ static const NSSItem nss_builtins_items_ - { (void *)"\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376" - "\350\260" - , (PRUint32)18 }, -- { (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_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_306 [] = { -@@ -20562,7 +20561,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)969 } - }; - static const NSSItem nss_builtins_items_307 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20584,9 +20583,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)134 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_308 [] = { -@@ -20687,7 +20686,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)993 } - }; - static const NSSItem nss_builtins_items_309 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20710,9 +20709,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)146 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_310 [] = { -@@ -20814,7 +20813,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1011 } - }; - static const NSSItem nss_builtins_items_311 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20837,9 +20836,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)155 }, - { (void *)"\002\001\000" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_312 [] = { -@@ -20920,7 +20919,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)848 } - }; - static const NSSItem nss_builtins_items_313 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20938,9 +20937,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)70 }, - { (void *)"\002\010\167\167\006\047\046\251\261\174" - , (PRUint32)10 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_314 [] = { -@@ -21021,7 +21020,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)848 } - }; - static const NSSItem nss_builtins_items_315 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21039,9 +21038,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)70 }, - { (void *)"\002\010\174\117\004\071\034\324\231\055" - , (PRUint32)10 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_316 [] = { -@@ -21154,7 +21153,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1354 } - }; - static const NSSItem nss_builtins_items_317 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21172,9 +21171,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)67 }, - { (void *)"\002\010\155\214\024\106\261\246\012\356" - , (PRUint32)10 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_318 [] = { -@@ -21235,7 +21234,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)514 } - }; - static const NSSItem nss_builtins_items_319 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21253,9 +21252,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)71 }, - { (void *)"\002\010\164\227\045\212\307\077\172\124" - , (PRUint32)10 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_320 [] = { -@@ -21349,7 +21348,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)959 } - }; - static const NSSItem nss_builtins_items_321 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21370,9 +21369,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)128 }, - { (void *)"\002\003\004\104\300" - , (PRUint32)5 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_322 [] = { -@@ -21494,7 +21493,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1440 } - }; - static const NSSItem nss_builtins_items_323 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21514,9 +21513,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)101 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_324 [] = { -@@ -21653,7 +21652,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)1679 } - }; - static const NSSItem nss_builtins_items_325 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21673,9 +21672,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)106 }, - { (void *)"\002\004\073\105\345\150" - , (PRUint32)6 }, -- { (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_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_326 [] = { -@@ -21773,7 +21772,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)979 } - }; - static const NSSItem nss_builtins_items_327 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21795,9 +21794,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)144 }, - { (void *)"\002\003\001\154\036" - , (PRUint32)5 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - static const NSSItem nss_builtins_items_328 [] = { -@@ -21885,7 +21884,7 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)895 } - }; - static const NSSItem nss_builtins_items_329 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21905,9 +21904,9 @@ static const NSSItem nss_builtins_items_ - , (PRUint32)97 }, - { (void *)"\002\001\001" - , (PRUint32)3 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; - -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt nss-3.12.11.oden/mozilla/security/nss/lib/ckfw/builtins/certdata.txt ---- nss-3.12.11/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-01 08:40:04.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-12 10:06:00.598879723 +0200 -@@ -58,7 +58,7 @@ CVS_ID "@(#) $RCSfile: certdata.txt,v $ - # CKA_ISSUER DER+base64 (varies) - # CKA_SERIAL_NUMBER DER+base64 (varies) - # CKA_VALUE DER+base64 (varies) --# CKA_NETSCAPE_EMAIL ASCII7 (unused here) -+# CKA_NSS_EMAIL ASCII7 (unused here) - # - # Trust - # -@@ -96,7 +96,7 @@ CVS_ID "@(#) $RCSfile: certdata.txt,v $ - # have to go looking for others. - # - BEGINDATA --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_BUILTIN_ROOT_LIST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_BUILTIN_ROOT_LIST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -177,7 +177,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GTE CyberTrust Global Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -202,9 +202,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\002\001\245 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -304,7 +304,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Thawte Server CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -334,9 +334,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -439,7 +439,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Thawte Premium Server CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -470,9 +470,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -557,7 +557,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Equifax Secure CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -579,9 +579,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\065\336\364\317 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -666,7 +666,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Digital Signature Trust Co. Global CA 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -688,9 +688,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\066\160\025\226 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -775,7 +775,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Digital Signature Trust Co. Global CA 3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -797,9 +797,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\066\156\323\316 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -875,7 +875,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 1 Public Primary Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -900,9 +900,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263 - \162\252\125 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -977,7 +977,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 2 Public Primary Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1002,9 +1002,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105 - \276\013 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1079,7 +1079,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 3 Public Primary Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1104,9 +1104,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314 - \272\277 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1206,7 +1206,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 1 Public Primary Certification Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1237,9 +1237,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211 - \221\222 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1339,7 +1339,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 2 Public Primary Certification Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1370,9 +1370,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160 - \154\212\257 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1472,7 +1472,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 3 Public Primary Certification Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1503,9 +1503,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211 - \064\306 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1605,7 +1605,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 4 Public Primary Certification Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1636,9 +1636,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067 - \045\370 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1730,7 +1730,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GlobalSign Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1753,9 +1753,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\013\004\000\000\000\000\001\025\113\132\303\224 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1849,7 +1849,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GlobalSign Root CA - R2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1871,9 +1871,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\013\004\000\000\000\000\001\017\206\046\346\015 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -1968,7 +1968,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "ValiCert Class 1 VA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -1997,9 +1997,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -2094,7 +2094,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "ValiCert Class 2 VA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -2123,9 +2123,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -2220,7 +2220,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "RSA Root Certificate 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -2249,9 +2249,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -2368,7 +2368,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 1 Public Primary Certification Authority - G3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -2399,9 +2399,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110 - \316\261\244 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -2518,7 +2518,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 2 Public Primary Certification Authority - G3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -2549,9 +2549,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120 - \133\172 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -2668,7 +2668,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 3 Public Primary Certification Authority - G3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -2699,9 +2699,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161 - \051\357\127 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -2818,7 +2818,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 4 Public Primary Certification Authority - G3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -2849,9 +2849,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057 - \224\136\327 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -2979,7 +2979,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Entrust.net Secure Server CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3009,9 +3009,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\067\112\322\103 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3129,7 +3129,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Entrust.net Premium 2048 Secure Server CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3158,9 +3158,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\070\143\271\146 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3252,7 +3252,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Baltimore CyberTrust Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3275,9 +3275,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\002\000\000\271 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3355,7 +3355,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Equifax Secure Global eBusiness CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3378,9 +3378,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3457,7 +3457,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Equifax Secure eBusiness CA 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3480,9 +3480,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\004 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3567,7 +3567,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Equifax Secure eBusiness CA 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3589,9 +3589,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\067\160\317\265 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3695,7 +3695,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AddTrust Low-Value Services Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3719,9 +3719,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3829,7 +3829,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AddTrust External Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3854,9 +3854,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -3960,7 +3960,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AddTrust Public Services Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -3984,9 +3984,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -4091,7 +4091,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AddTrust Qualified Certificates Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -4115,9 +4115,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -4239,7 +4239,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Entrust Root Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -4268,9 +4268,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\105\153\120\124 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -4358,7 +4358,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "RSA Security 2048 v3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -4380,9 +4380,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000 - \000\002 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -4470,7 +4470,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GeoTrust Global CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -4492,9 +4492,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\003\002\064\126 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -4583,7 +4583,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GeoTrust Global CA 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -4605,9 +4605,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -4728,7 +4728,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GeoTrust Universal CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -4750,9 +4750,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -4873,7 +4873,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GeoTrust Universal CA 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -4895,9 +4895,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5015,7 +5015,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "UTN-USER First-Network Applications" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5044,9 +5044,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300 - \063\167 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5143,7 +5143,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "America Online Root Certification Authority 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5167,9 +5167,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5298,7 +5298,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "America Online Root Certification Authority 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5322,9 +5322,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5422,7 +5422,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Visa eCommerce Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5447,9 +5447,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\023\206\065\115\035\077\006\362\301\371\145\005\325\220 - \034\142 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5551,7 +5551,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TC TrustCenter, Germany, Class 2 CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5580,9 +5580,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\002\003\352 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5684,7 +5684,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TC TrustCenter, Germany, Class 3 CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5713,9 +5713,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\002\003\353 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5796,7 +5796,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Certum Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5817,9 +5817,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\003\001\000\040 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -5927,7 +5927,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Comodo AAA Services root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -5952,9 +5952,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -6063,7 +6063,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Comodo Secure Services root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -6088,9 +6088,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -6201,7 +6201,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Comodo Trusted Services root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -6227,9 +6227,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -6365,7 +6365,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "QuoVadis Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -6391,9 +6391,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\072\266\120\213 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -6519,7 +6519,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "QuoVadis Root CA 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -6541,9 +6541,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\002\005\011 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -6684,7 +6684,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "QuoVadis Root CA 3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -6706,9 +6706,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\002\005\306 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -6798,7 +6798,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Security Communication Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -6821,9 +6821,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -6906,7 +6906,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Sonera Class 1 Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -6927,9 +6927,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\044 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7012,7 +7012,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Sonera Class 2 Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -7033,9 +7033,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\035 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7131,7 +7131,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Staat der Nederlanden Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -7154,9 +7154,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\000\230\226\212 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7257,7 +7257,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TDC Internet Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -7279,9 +7279,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\072\314\245\114 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7395,7 +7395,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TDC OCES Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -7416,9 +7416,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\076\110\275\304 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7534,7 +7534,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "UTN DATACorp SGC Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -7562,9 +7562,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\104\276\014\213\120\000\041\264\021\323\052\150\006\251 - \255\151 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7688,7 +7688,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "UTN USERFirst Email Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -7718,9 +7718,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\104\276\014\213\120\000\044\264\021\323\066\045\045\147 - \311\211 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7837,7 +7837,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "UTN USERFirst Hardware Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -7865,9 +7865,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\104\276\014\213\120\000\044\264\021\323\066\052\376\145 - \012\375 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -7983,7 +7983,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "UTN USERFirst Object Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -8011,9 +8011,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\104\276\014\213\120\000\044\264\021\323\066\055\340\263 - \137\033 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -8132,7 +8132,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Camerfirma Chambers of Commerce Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -8158,9 +8158,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -8277,7 +8277,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Camerfirma Global Chambersign Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -8302,9 +8302,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -8464,7 +8464,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "NetLock Qualified (Class QA) Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -8494,9 +8494,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\173 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -8649,7 +8649,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "NetLock Notary (Class A) Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -8678,9 +8678,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\002\001\003 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -8809,7 +8809,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "NetLock Business (Class B) Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -8836,9 +8836,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\151 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -8968,7 +8968,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "NetLock Express (Class C) Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -8995,9 +8995,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\150 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -9108,7 +9108,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "XRamp Global CA Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -9135,9 +9135,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\120\224\154\354\030\352\325\234\115\325\227\357\165\217 - \240\255 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -9240,7 +9240,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Go Daddy Class 2 CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -9264,9 +9264,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -9370,7 +9370,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Starfield Class 2 CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -9394,9 +9394,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -9561,7 +9561,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "StartCom Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -9586,9 +9586,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -9711,7 +9711,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Taiwan GRCA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -9734,9 +9734,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\037\235\131\132\327\057\302\006\104\245\200\010\151\343 - \136\366 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -9850,7 +9850,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Firmaprofesional Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -9877,9 +9877,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -9984,7 +9984,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Wells Fargo Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10010,9 +10010,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\071\344\227\236 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -10145,7 +10145,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Swisscom Root CA 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10170,9 +10170,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\134\013\205\134\013\347\131\101\337\127\314\077\177\235 - \250\066 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -10271,7 +10271,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "DigiCert Assured ID Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10296,9 +10296,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\014\347\340\345\027\330\106\376\217\345\140\374\033\360 - \060\071 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -10397,7 +10397,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "DigiCert Global Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10422,9 +10422,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\010\073\340\126\220\102\106\261\241\165\152\311\131\221 - \307\112 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -10524,7 +10524,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "DigiCert High Assurance EV Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10549,9 +10549,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\002\254\134\046\152\013\100\233\217\013\171\362\256\106 - \045\167 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -10642,7 +10642,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Certplus Class 2 Primary CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10664,9 +10664,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\205\275\113\363\330\332\343\151\366\224\327\137\303 - \245\104\043 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -10754,7 +10754,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "DST Root CA X3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10777,9 +10777,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\104\257\260\200\326\243\047\272\211\060\071\206\056\370 - \100\153 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -10881,7 +10881,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "DST ACES CA X6" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -10905,9 +10905,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\015\136\231\012\326\235\267\170\354\330\007\126\073\206 - \025\331 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -11019,7 +11019,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TURKTRUST Certificate Services Provider Root 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -11048,9 +11048,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -11168,7 +11168,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TURKTRUST Certificate Services Provider Root 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -11198,9 +11198,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -11327,7 +11327,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "SwissSign Platinum CA - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -11349,9 +11349,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\116\262\000\147\014\003\135\117 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -11477,7 +11477,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "SwissSign Gold CA - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -11499,9 +11499,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\011\000\273\100\034\103\365\136\117\260 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -11628,7 +11628,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "SwissSign Silver CA - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -11650,9 +11650,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\117\033\324\057\124\273\057\113 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -11745,7 +11745,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GeoTrust Primary Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -11769,9 +11769,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\030\254\265\152\375\151\266\025\072\143\154\257\332\372 - \304\241 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -11885,7 +11885,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "thawte Primary Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -11914,9 +11914,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\064\116\325\127\040\325\355\354\111\364\057\316\067\333 - \053\155 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12045,7 +12045,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G5" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12076,9 +12076,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\030\332\321\236\046\175\350\273\112\041\130\315\314\153 - \073\112 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12173,7 +12173,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "SecureTrust CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12196,9 +12196,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030 - \131\320 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12293,7 +12293,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Secure Global CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12316,9 +12316,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370 - \352\245 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12428,7 +12428,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "COMODO Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12455,9 +12455,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106 - \345\075 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12585,7 +12585,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "DigiNotar Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12610,9 +12610,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 - \074\114 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12714,7 +12714,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Network Solutions Certificate Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12739,9 +12739,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061 - \150\340 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12860,7 +12860,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "WellsSecure Public Root Certificate Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12886,9 +12886,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -12972,7 +12972,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "COMODO ECC Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -12999,9 +12999,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143 - \231\052 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -13103,7 +13103,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "MD5 Collisions Forged Rogue CA 25c3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -13126,9 +13126,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\102 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -13235,7 +13235,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "IGC/A" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -13261,9 +13261,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\005\071\021\105\020\224 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -13358,7 +13358,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Security Communication EV RootCA1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -13382,9 +13382,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -13491,7 +13491,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "OISTE WISeKey Global Root GA CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -13518,9 +13518,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124 - \337\232 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -13641,7 +13641,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "S-TRUST Authentication and Encryption Root CA 2005 PN" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -13671,9 +13671,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\067\031\030\346\123\124\174\032\265\270\313\131\132\333 - \065\267 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -13837,7 +13837,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Microsec e-Szigno Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -13863,9 +13863,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\314\270\347\277\116\051\032\375\242\334\146\245\034 - \054\017\021 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -13956,7 +13956,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Certigna" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -13977,9 +13977,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\011\000\376\334\343\001\017\311\110\377 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -14123,7 +14123,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AC Raiz Certicamara S.A." --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -14149,9 +14149,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\017\007\176\122\223\173\340\025\343\127\360\151\214\313\354 - \014 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -14266,7 +14266,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TC TrustCenter Class 2 CA II" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -14291,9 +14291,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\016\056\152\000\001\000\002\037\327\122\041\054\021\134\073 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -14408,7 +14408,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TC TrustCenter Class 3 CA II" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -14433,9 +14433,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\016\112\107\000\001\000\002\345\240\135\326\077\000\121\277 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -14538,7 +14538,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TC TrustCenter Universal CA I" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -14563,9 +14563,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\016\035\242\000\001\000\002\354\267\140\200\170\215\266\006 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -14664,7 +14664,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Deutsche Telekom Root CA 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -14689,9 +14689,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\046 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -14782,7 +14782,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "ComSign CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -14804,9 +14804,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\024\023\226\203\024\125\214\352\173\143\345\374\064\207 - \167\104 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -14898,7 +14898,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "ComSign Secured CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -14920,9 +14920,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\307\050\107\011\263\270\154\105\214\035\372\044\365 - \066\116\351 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15013,7 +15013,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Cybertrust Global Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15034,9 +15034,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\013\004\000\000\000\000\001\017\205\252\055\110 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15165,7 +15165,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "ePKI Root Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15189,9 +15189,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322 - \274\235 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15335,7 +15335,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15371,9 +15371,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\021 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15461,7 +15461,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Buypass Class 2 CA 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15483,9 +15483,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15573,7 +15573,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Buypass Class 3 CA 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15595,9 +15595,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\002 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15734,7 +15734,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "EBG Elektronik Sertifika Hizmet Saglayicisi" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15760,9 +15760,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\114\257\163\102\034\216\164\002 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15846,7 +15846,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "certSIGN ROOT CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15867,9 +15867,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\006\040\006\005\026\160\002 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -15955,7 +15955,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "CNNIC ROOT" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -15976,9 +15976,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\111\063\000\001 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -16071,7 +16071,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "ApplicationCA - Japanese Government" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -16093,9 +16093,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\061 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -16205,7 +16205,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GeoTrust Primary Certification Authority - G3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -16233,9 +16233,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030 - \017\037 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -16319,7 +16319,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "thawte Primary Root CA - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -16346,9 +16346,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256 - \327\126 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -16464,7 +16464,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "thawte Primary Root CA - G3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -16494,9 +16494,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367 - \220\373 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -16585,7 +16585,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GeoTrust Primary Certification Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -16613,9 +16613,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\074\262\364\110\012\000\342\376\353\044\073\136\140\076 - \303\153 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -16740,7 +16740,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "VeriSign Universal Root Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -16770,9 +16770,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\100\032\304\144\041\263\023\041\003\016\273\344\022\032 - \305\035 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -16880,7 +16880,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G4" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -16911,9 +16911,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207 - \254\263 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -17025,7 +17025,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "NetLock Arany (Class Gold) Főtanúsítvány" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17053,9 +17053,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\006\111\101\054\344\000\020 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -17184,7 +17184,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Staat der Nederlanden Root CA - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17207,9 +17207,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\000\230\226\214 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -17309,7 +17309,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "CA Disig" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17331,9 +17331,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -17448,7 +17448,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Juur-SK" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17471,9 +17471,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\073\216\113\374 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -17559,7 +17559,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Hongkong Post Root CA 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17581,9 +17581,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\002\003\350 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -17675,7 +17675,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "SecureSign RootCA11" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17698,9 +17698,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -17826,7 +17826,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "ACEDICOM Root" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17848,9 +17848,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\141\215\307\206\073\001\202\005 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - -@@ -17926,7 +17926,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 1 Public Primary Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -17951,9 +17951,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 - \344\335 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -18028,7 +18028,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Verisign Class 3 Public Primary Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -18053,9 +18053,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 - \022\276 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -18162,7 +18162,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Microsec e-Szigno Root CA 2009" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -18188,9 +18188,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\011\000\302\176\103\004\116\107\077\031 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -18291,7 +18291,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -18317,9 +18317,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 - \254\265 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -18408,7 +18408,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "GlobalSign Root CA - R3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -18430,9 +18430,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\013\004\000\000\000\000\001\041\130\123\010\242 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -18535,7 +18535,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TC TrustCenter Universal CA III" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -18560,9 +18560,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\016\143\045\000\001\000\002\024\215\063\025\002\344\154\364 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -18696,7 +18696,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Autoridad de Certificacion Firmaprofesional CIF A62634068" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -18719,9 +18719,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\123\354\073\356\373\262\110\137 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -18850,7 +18850,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Izenpe.com" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -18872,9 +18872,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\000\260\267\132\026\110\137\277\341\313\365\213\327\031 - \346\175 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -19040,7 +19040,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Chambers of Commerce Root - 2008" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -19069,9 +19069,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\011\000\243\332\102\176\244\261\256\332 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -19234,7 +19234,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Global Chambersign Root - 2008" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -19262,9 +19262,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\011\000\311\315\323\351\325\175\043\316 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -19410,7 +19410,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus Mozilla Addons" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -19438,9 +19438,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341 - \362\077\103 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -19601,7 +19601,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus Global Trustee" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -19629,9 +19629,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025 - \070\057\260 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -19777,7 +19777,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus GMail" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -19805,9 +19805,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014 - \256\036 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -19952,7 +19952,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus Google" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -19980,9 +19980,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311 - \130\174\006 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -20128,7 +20128,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus Skype" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -20156,9 +20156,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210 - \025\104\107 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -20304,7 +20304,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus Yahoo 1" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -20332,9 +20332,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160 - \167\051\243 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -20478,7 +20478,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus Yahoo 2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -20506,9 +20506,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340 - \302\051 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -20652,7 +20652,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus Yahoo 3" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -20680,9 +20680,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250 - \052\161 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -20827,7 +20827,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus live.com" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -20855,9 +20855,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164 - \275\072\300 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -20995,7 +20995,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Bogus kuix.de" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21023,9 +21023,9 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376 - \350\260 - 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_NSS_VALID -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_VALID -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_VALID - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21128,7 +21128,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Go Daddy Root Certificate Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21154,9 +21154,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21263,7 +21263,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Starfield Root Certificate Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21290,9 +21290,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21400,7 +21400,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Starfield Services Root Certificate Authority - G2" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21427,9 +21427,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\000 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21516,7 +21516,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AffirmTrust Commercial" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21538,9 +21538,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\167\167\006\047\046\251\261\174 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21627,7 +21627,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AffirmTrust Networking" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21649,9 +21649,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\174\117\004\071\034\324\231\055 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21770,7 +21770,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AffirmTrust Premium" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21792,9 +21792,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\155\214\024\106\261\246\012\356 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21861,7 +21861,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "AffirmTrust Premium ECC" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -21883,9 +21883,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\010\164\227\045\212\307\077\172\124 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -21985,7 +21985,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Certum Trusted Network CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -22010,9 +22010,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\003\004\104\300 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -22140,7 +22140,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Certinomis - Autorité Racine" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -22164,9 +22164,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -22309,7 +22309,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "Root CA Generalitat Valenciana" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -22333,9 +22333,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\004\073\105\345\150 - END --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 -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -22439,7 +22439,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "A-Trust-nQual-03" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -22465,9 +22465,9 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\003\001\154\036 - END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUST_UNKNOWN -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # -@@ -22561,7 +22561,7 @@ CKA_VALUE MULTILINE_OCTAL - END - - # Trust for Certificate "TWCA Root Certification Authority" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST - CKA_TOKEN CK_BBOOL CK_TRUE - CKA_PRIVATE CK_BBOOL CK_FALSE - CKA_MODIFIABLE CK_BBOOL CK_FALSE -@@ -22585,7 +22585,7 @@ END - CKA_SERIAL_NUMBER MULTILINE_OCTAL - \002\001\001 - END --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_TRUST_UNKNOWN -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/dev/ckhelper.c nss-3.12.11.oden/mozilla/security/nss/lib/dev/ckhelper.c ---- nss-3.12.11/mozilla/security/nss/lib/dev/ckhelper.c 2010-01-08 03:00:58.000000000 +0100 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/dev/ckhelper.c 2011-08-12 09:57:58.690165052 +0200 -@@ -78,7 +78,7 @@ is_string_attribute ( - PRBool isString; - switch (aType) { - case CKA_LABEL: -- case CKA_NETSCAPE_EMAIL: -+ case CKA_NSS_EMAIL: - isString = PR_TRUE; - break; - default: -@@ -401,14 +401,13 @@ get_nss_trust ( - { - nssTrustLevel t; - switch (ckt) { -- case CKT_NETSCAPE_UNTRUSTED: t = nssTrustLevel_NotTrusted; break; -- case CKT_NETSCAPE_TRUSTED_DELEGATOR: t = nssTrustLevel_TrustedDelegator; -+ case CKT_NSS_NOT_TRUSTED: t = nssTrustLevel_NotTrusted; break; -+ case CKT_NSS_TRUSTED_DELEGATOR: t = nssTrustLevel_TrustedDelegator; - break; -- case CKT_NETSCAPE_VALID_DELEGATOR: t = nssTrustLevel_ValidDelegator; break; -- case CKT_NETSCAPE_TRUSTED: t = nssTrustLevel_Trusted; break; -- case CKT_NETSCAPE_VALID: t = nssTrustLevel_Valid; break; -- case CKT_NETSCAPE_MUST_VERIFY: -- case CKT_NETSCAPE_TRUST_UNKNOWN: -+ case CKT_NSS_VALID_DELEGATOR: t = nssTrustLevel_ValidDelegator; break; -+ case CKT_NSS_TRUSTED: t = nssTrustLevel_Trusted; break; -+ case CKT_NSS_MUST_VERIFY_TRUST: t = nssTrustLevel_MustVerify; break; -+ case CKT_NSS_TRUST_UNKNOWN: - default: - t = nssTrustLevel_Unknown; break; - } -@@ -432,10 +431,10 @@ nssCryptokiTrust_GetAttributes ( - nssSession *session; - CK_BBOOL isToken = PR_FALSE; - CK_BBOOL stepUp = PR_FALSE; -- CK_TRUST saTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -- CK_TRUST caTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -- CK_TRUST epTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -- CK_TRUST csTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -+ CK_TRUST saTrust = CKT_NSS_TRUST_UNKNOWN; -+ CK_TRUST caTrust = CKT_NSS_TRUST_UNKNOWN; -+ CK_TRUST epTrust = CKT_NSS_TRUST_UNKNOWN; -+ CK_TRUST csTrust = CKT_NSS_TRUST_UNKNOWN; - CK_ATTRIBUTE_PTR attr; - CK_ATTRIBUTE trust_template[7]; - CK_ULONG trust_size; -@@ -453,7 +452,7 @@ nssCryptokiTrust_GetAttributes ( - - status = nssToken_GetCachedObjectAttributes(trustObject->token, NULL, - trustObject, -- CKO_NETSCAPE_TRUST, -+ CKO_NSS_TRUST, - trust_template, trust_size); - if (status != PR_SUCCESS) { - session = sessionOpt ? -@@ -510,10 +509,10 @@ nssCryptokiCRL_GetAttributes ( - NSS_CK_SET_ATTRIBUTE_NULL(attr, CKA_VALUE); - } - if (urlOpt) { -- NSS_CK_SET_ATTRIBUTE_NULL(attr, CKA_NETSCAPE_URL); -+ NSS_CK_SET_ATTRIBUTE_NULL(attr, CKA_NSS_URL); - } - if (isKRLOpt) { -- NSS_CK_SET_ATTRIBUTE_NULL(attr, CKA_NETSCAPE_KRL); -+ NSS_CK_SET_ATTRIBUTE_NULL(attr, CKA_NSS_KRL); - } - if (subjectOpt) { - NSS_CK_SET_ATTRIBUTE_NULL(attr, CKA_SUBJECT); -@@ -522,7 +521,7 @@ nssCryptokiCRL_GetAttributes ( - - status = nssToken_GetCachedObjectAttributes(crlObject->token, NULL, - crlObject, -- CKO_NETSCAPE_CRL, -+ CKO_NSS_CRL, - crl_template, crl_size); - if (status != PR_SUCCESS) { - session = sessionOpt ? -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/dev/devt.h nss-3.12.11.oden/mozilla/security/nss/lib/dev/devt.h ---- nss-3.12.11/mozilla/security/nss/lib/dev/devt.h 2010-01-08 03:00:58.000000000 +0100 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/dev/devt.h 2011-08-12 09:57:58.690165052 +0200 -@@ -143,7 +143,7 @@ typedef enum { - nssTrustLevel_NotTrusted = 1, - nssTrustLevel_Trusted = 2, - nssTrustLevel_TrustedDelegator = 3, -- nssTrustLevel_Valid = 4, -+ nssTrustLevel_MustVerify = 4, - nssTrustLevel_ValidDelegator = 5 - } nssTrustLevel; - -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/dev/devtoken.c nss-3.12.11.oden/mozilla/security/nss/lib/dev/devtoken.c ---- nss-3.12.11/mozilla/security/nss/lib/dev/devtoken.c 2010-04-03 20:27:30.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/dev/devtoken.c 2011-08-12 09:57:58.691165057 +0200 -@@ -522,7 +522,7 @@ nssToken_ImportCertificate ( - NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_SUBJECT, subject); - NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_SERIAL_NUMBER, serial); - if (email) { -- NSS_CK_SET_ATTRIBUTE_UTF8(attr, CKA_NETSCAPE_EMAIL, email); -+ NSS_CK_SET_ATTRIBUTE_UTF8(attr, CKA_NSS_EMAIL, email); - } - NSS_CK_TEMPLATE_FINISH(cert_tmpl, attr, ctsize); - /* see if the cert is already there */ -@@ -714,7 +714,7 @@ nssToken_FindCertificatesByNickname ( - - /* XXX - * This function *does not* use the token object cache, because not even -- * the softoken will return a value for CKA_NETSCAPE_EMAIL from a call -+ * the softoken will return a value for CKA_NSS_EMAIL from a call - * to GetAttributes. The softoken does allow searches with that attribute, - * it just won't return a value for it. - */ -@@ -733,7 +733,7 @@ nssToken_FindCertificatesByEmail ( - CK_ULONG etsize; - nssCryptokiObject **objects; - NSS_CK_TEMPLATE_START(email_template, attr, etsize); -- NSS_CK_SET_ATTRIBUTE_UTF8(attr, CKA_NETSCAPE_EMAIL, email); -+ NSS_CK_SET_ATTRIBUTE_UTF8(attr, CKA_NSS_EMAIL, email); - /* Set the search to token/session only if provided */ - if (searchType == nssTokenSearchType_SessionOnly) { - NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false); -@@ -1071,14 +1071,14 @@ get_ck_trust ( - { - CK_TRUST t; - switch (nssTrust) { -- case nssTrustLevel_NotTrusted: t = CKT_NETSCAPE_UNTRUSTED; break; -- case nssTrustLevel_TrustedDelegator: t = CKT_NETSCAPE_TRUSTED_DELEGATOR; -+ case nssTrustLevel_NotTrusted: t = CKT_NSS_NOT_TRUSTED; break; -+ case nssTrustLevel_TrustedDelegator: t = CKT_NSS_TRUSTED_DELEGATOR; - break; -- case nssTrustLevel_ValidDelegator: t = CKT_NETSCAPE_VALID_DELEGATOR; break; -- case nssTrustLevel_Trusted: t = CKT_NETSCAPE_TRUSTED; break; -- case nssTrustLevel_Valid: t = CKT_NETSCAPE_VALID; break; -+ case nssTrustLevel_ValidDelegator: t = CKT_NSS_VALID_DELEGATOR; break; -+ case nssTrustLevel_Trusted: t = CKT_NSS_TRUSTED; break; -+ case nssTrustLevel_MustVerify: t = CKT_NSS_MUST_VERIFY_TRUST; break; - case nssTrustLevel_Unknown: -- default: t = CKT_NETSCAPE_TRUST_UNKNOWN; break; -+ default: t = CKT_NSS_TRUST_UNKNOWN; break; - } - return t; - } -@@ -1099,7 +1099,7 @@ nssToken_ImportTrust ( - ) - { - nssCryptokiObject *object; -- CK_OBJECT_CLASS tobjc = CKO_NETSCAPE_TRUST; -+ CK_OBJECT_CLASS tobjc = CKO_NSS_TRUST; - CK_TRUST ckSA, ckCA, ckCS, ckEP; - CK_ATTRIBUTE_PTR attr; - CK_ATTRIBUTE trust_tmpl[11]; -@@ -1158,7 +1158,7 @@ nssToken_FindTrustForCertificate ( - nssTokenSearchType searchType - ) - { -- CK_OBJECT_CLASS tobjc = CKO_NETSCAPE_TRUST; -+ CK_OBJECT_CLASS tobjc = CKO_NSS_TRUST; - CK_ATTRIBUTE_PTR attr; - CK_ATTRIBUTE tobj_template[5]; - CK_ULONG tobj_size; -@@ -1203,7 +1203,7 @@ nssToken_ImportCRL ( - ) - { - nssCryptokiObject *object; -- CK_OBJECT_CLASS crlobjc = CKO_NETSCAPE_CRL; -+ CK_OBJECT_CLASS crlobjc = CKO_NSS_CRL; - CK_ATTRIBUTE_PTR attr; - CK_ATTRIBUTE crl_tmpl[6]; - CK_ULONG crlsize; -@@ -1217,11 +1217,11 @@ nssToken_ImportCRL ( - NSS_CK_SET_ATTRIBUTE_VAR( attr, CKA_CLASS, crlobjc); - NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_SUBJECT, subject); - NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_VALUE, encoding); -- NSS_CK_SET_ATTRIBUTE_UTF8(attr, CKA_NETSCAPE_URL, url); -+ NSS_CK_SET_ATTRIBUTE_UTF8(attr, CKA_NSS_URL, url); - if (isKRL) { -- NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_NETSCAPE_KRL, &g_ck_true); -+ NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_NSS_KRL, &g_ck_true); - } else { -- NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_NETSCAPE_KRL, &g_ck_false); -+ NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_NSS_KRL, &g_ck_false); - } - NSS_CK_TEMPLATE_FINISH(crl_tmpl, attr, crlsize); - -@@ -1244,7 +1244,7 @@ nssToken_FindCRLsBySubject ( - PRStatus *statusOpt - ) - { -- CK_OBJECT_CLASS crlobjc = CKO_NETSCAPE_CRL; -+ CK_OBJECT_CLASS crlobjc = CKO_NSS_CRL; - CK_ATTRIBUTE_PTR attr; - CK_ATTRIBUTE crlobj_template[3]; - CK_ULONG crlobj_size; -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/pk11wrap/debug_module.c nss-3.12.11.oden/mozilla/security/nss/lib/pk11wrap/debug_module.c ---- nss-3.12.11/mozilla/security/nss/lib/pk11wrap/debug_module.c 2011-01-19 20:29:18.000000000 +0100 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/pk11wrap/debug_module.c 2011-08-12 09:57:58.692165063 +0200 -@@ -163,18 +163,18 @@ static void get_attr_type_str(CK_ATTRIBU - CASE(CKA_RESET_ON_INIT); - CASE(CKA_HAS_RESET); - CASE(CKA_VENDOR_DEFINED); -- CASE(CKA_NETSCAPE_URL); -- CASE(CKA_NETSCAPE_EMAIL); -- CASE(CKA_NETSCAPE_SMIME_INFO); -- CASE(CKA_NETSCAPE_SMIME_TIMESTAMP); -- CASE(CKA_NETSCAPE_PKCS8_SALT); -- CASE(CKA_NETSCAPE_PASSWORD_CHECK); -- CASE(CKA_NETSCAPE_EXPIRES); -- CASE(CKA_NETSCAPE_KRL); -- CASE(CKA_NETSCAPE_PQG_COUNTER); -- CASE(CKA_NETSCAPE_PQG_SEED); -- CASE(CKA_NETSCAPE_PQG_H); -- CASE(CKA_NETSCAPE_PQG_SEED_BITS); -+ CASE(CKA_NSS_URL); -+ CASE(CKA_NSS_EMAIL); -+ CASE(CKA_NSS_SMIME_INFO); -+ CASE(CKA_NSS_SMIME_TIMESTAMP); -+ CASE(CKA_NSS_PKCS8_SALT); -+ CASE(CKA_NSS_PASSWORD_CHECK); -+ CASE(CKA_NSS_EXPIRES); -+ CASE(CKA_NSS_KRL); -+ CASE(CKA_NSS_PQG_COUNTER); -+ CASE(CKA_NSS_PQG_SEED); -+ CASE(CKA_NSS_PQG_H); -+ CASE(CKA_NSS_PQG_SEED_BITS); - CASE(CKA_TRUST); - CASE(CKA_TRUST_DIGITAL_SIGNATURE); - CASE(CKA_TRUST_NON_REPUDIATION); -@@ -216,10 +216,10 @@ static void get_obj_class(CK_OBJECT_CLAS - CASE(CKO_SECRET_KEY); - CASE(CKO_HW_FEATURE); - CASE(CKO_DOMAIN_PARAMETERS); -- CASE(CKO_NETSCAPE_CRL); -- CASE(CKO_NETSCAPE_SMIME); -- CASE(CKO_NETSCAPE_TRUST); -- CASE(CKO_NETSCAPE_BUILTIN_ROOT_LIST); -+ CASE(CKO_NSS_CRL); -+ CASE(CKO_NSS_SMIME); -+ CASE(CKO_NSS_TRUST); -+ CASE(CKO_NSS_BUILTIN_ROOT_LIST); - default: break; - } - if (a) -@@ -233,13 +233,12 @@ static void get_trust_val(CK_TRUST trust - const char * a = NULL; - - switch (trust) { -- CASE(CKT_NETSCAPE_TRUSTED); -- CASE(CKT_NETSCAPE_TRUSTED_DELEGATOR); -- CASE(CKT_NETSCAPE_UNTRUSTED); -- CASE(CKT_NETSCAPE_MUST_VERIFY); -- CASE(CKT_NETSCAPE_TRUST_UNKNOWN); -- CASE(CKT_NETSCAPE_VALID); -- CASE(CKT_NETSCAPE_VALID_DELEGATOR); -+ CASE(CKT_NSS_TRUSTED); -+ CASE(CKT_NSS_TRUSTED_DELEGATOR); -+ CASE(CKT_NSS_NOT_TRUSTED); -+ CASE(CKT_NSS_MUST_VERIFY_TRUST); -+ CASE(CKT_NSS_TRUST_UNKNOWN); -+ CASE(CKT_NSS_VALID_DELEGATOR); - default: break; - } - if (a) -@@ -688,8 +687,8 @@ static void print_attr_value(CK_ATTRIBUT - break; - } - case CKA_LABEL: -- case CKA_NETSCAPE_EMAIL: -- case CKA_NETSCAPE_URL: -+ case CKA_NSS_EMAIL: -+ case CKA_NSS_URL: - if (attr->ulValueLen > 0 && attr->pValue) { - len = PR_MIN(attr->ulValueLen + 1, sizeof valstr); - PR_snprintf(valstr, len, "%s", attr->pValue); -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/pk11wrap/pk11merge.c nss-3.12.11.oden/mozilla/security/nss/lib/pk11wrap/pk11merge.c ---- nss-3.12.11/mozilla/security/nss/lib/pk11wrap/pk11merge.c 2010-04-26 01:37:39.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/pk11wrap/pk11merge.c 2011-08-12 09:57:58.693165070 +0200 -@@ -1037,13 +1037,11 @@ pk11_mergeTrustEntry(CK_ATTRIBUTE *targe - * actual trust of the cert (CKT_MUST_VERIFY, CKT_NSS_VALID, - * CKT_NSS_VALID_DELEGATOR). - */ -- if ((sourceTrust == CKT_NSS_MUST_VERIFY) -- || (sourceTrust == CKT_NSS_VALID) -+ if ((sourceTrust == CKT_NSS_MUST_VERIFY_TRUST) - || (sourceTrust == CKT_NSS_VALID_DELEGATOR)) { - return USE_TARGET; - } -- if ((targetTrust == CKT_NSS_MUST_VERIFY) -- || (targetTrust == CKT_NSS_VALID) -+ if ((targetTrust == CKT_NSS_MUST_VERIFY_TRUST) - || (targetTrust == CKT_NSS_VALID_DELEGATOR)) { - /* source overrites the target */ - return USE_SOURCE; -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/pk11wrap/pk11nobj.c nss-3.12.11.oden/mozilla/security/nss/lib/pk11wrap/pk11nobj.c ---- nss-3.12.11/mozilla/security/nss/lib/pk11wrap/pk11nobj.c 2010-04-26 01:37:39.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/pk11wrap/pk11nobj.c 2011-08-12 09:57:58.694165077 +0200 -@@ -138,31 +138,31 @@ pk11_HandleTrustObject(PK11SlotInfo *slo - /* First implementation: keep it simple for testing. We can study what other - * mappings would be appropriate and add them later.. fgmr 20000724 */ - -- if ( serverAuth == CKT_NETSCAPE_TRUSTED ) { -- trust->sslFlags |= CERTDB_VALID_PEER | CERTDB_TRUSTED; -+ if ( serverAuth == CKT_NSS_TRUSTED ) { -+ trust->sslFlags |= CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED; - } - -- if ( serverAuth == CKT_NETSCAPE_TRUSTED_DELEGATOR ) { -+ if ( serverAuth == CKT_NSS_TRUSTED_DELEGATOR ) { - trust->sslFlags |= CERTDB_VALID_CA | CERTDB_TRUSTED_CA | - CERTDB_NS_TRUSTED_CA; - } -- if ( clientAuth == CKT_NETSCAPE_TRUSTED_DELEGATOR ) { -+ if ( clientAuth == CKT_NSS_TRUSTED_DELEGATOR ) { - trust->sslFlags |= CERTDB_TRUSTED_CLIENT_CA ; - } - -- if ( emailProtection == CKT_NETSCAPE_TRUSTED ) { -- trust->emailFlags |= CERTDB_VALID_PEER | CERTDB_TRUSTED; -+ if ( emailProtection == CKT_NSS_TRUSTED ) { -+ trust->emailFlags |= CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED; - } - -- if ( emailProtection == CKT_NETSCAPE_TRUSTED_DELEGATOR ) { -+ if ( emailProtection == CKT_NSS_TRUSTED_DELEGATOR ) { - trust->emailFlags |= CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_NS_TRUSTED_CA; - } - -- if( codeSigning == CKT_NETSCAPE_TRUSTED ) { -- trust->objectSigningFlags |= CERTDB_VALID_PEER | CERTDB_TRUSTED; -+ if( codeSigning == CKT_NSS_TRUSTED ) { -+ trust->objectSigningFlags |= CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED; - } - -- if( codeSigning == CKT_NETSCAPE_TRUSTED_DELEGATOR ) { -+ if( codeSigning == CKT_NSS_TRUSTED_DELEGATOR ) { - trust->objectSigningFlags |= CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_NS_TRUSTED_CA; - } - -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/pki/pki3hack.c nss-3.12.11.oden/mozilla/security/nss/lib/pki/pki3hack.c ---- nss-3.12.11/mozilla/security/nss/lib/pki/pki3hack.c 2011-03-26 17:55:01.000000000 +0100 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/pki/pki3hack.c 2011-08-12 09:57:58.694165077 +0200 -@@ -555,17 +555,17 @@ nssDecodedPKIXCertificate_Destroy ( - - /* see pk11cert.c:pk11_HandleTrustObject */ - static unsigned int --get_nss3trust_from_nss4trust(CK_TRUST t) -+get_nss3trust_from_nss4trust(nssTrustLevel t) - { - unsigned int rt = 0; - if (t == nssTrustLevel_Trusted) { -- rt |= CERTDB_VALID_PEER | CERTDB_TRUSTED; -+ rt |= CERTDB_TERMINAL_RECORD | CERTDB_TRUSTED; - } - if (t == nssTrustLevel_TrustedDelegator) { -- rt |= CERTDB_VALID_CA | CERTDB_TRUSTED_CA /*| CERTDB_NS_TRUSTED_CA*/; -+ rt |= CERTDB_VALID_CA | CERTDB_TRUSTED_CA; - } -- if (t == nssTrustLevel_Valid) { -- rt |= CERTDB_VALID_PEER; -+ if (t == nssTrustLevel_NotTrusted) { -+ rt |= CERTDB_TERMINAL_RECORD; - } - if (t == nssTrustLevel_ValidDelegator) { - rt |= CERTDB_VALID_CA; -@@ -922,13 +922,13 @@ get_stan_trust(unsigned int t, PRBool is - if (t & CERTDB_TRUSTED) { - return nssTrustLevel_Trusted; - } -+ if (t & CERTDB_TERMINAL_RECORD) { -+ return nssTrustLevel_NotTrusted; -+ } - if (t & CERTDB_VALID_CA) { - return nssTrustLevel_ValidDelegator; - } -- if (t & CERTDB_VALID_PEER) { -- return nssTrustLevel_Valid; -- } -- return nssTrustLevel_NotTrusted; -+ return nssTrustLevel_MustVerify; - } - - NSS_EXTERN NSSCertificate * -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/softoken/legacydb/lgattr.c nss-3.12.11.oden/mozilla/security/nss/lib/softoken/legacydb/lgattr.c ---- nss-3.12.11/mozilla/security/nss/lib/softoken/legacydb/lgattr.c 2009-04-01 00:40:17.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/softoken/legacydb/lgattr.c 2011-08-12 09:57:58.695165083 +0200 -@@ -61,7 +61,7 @@ typedef struct LGObjectCacheStr { - - static const CK_OBJECT_HANDLE lg_classArray[] = { - 0, CKO_PRIVATE_KEY, CKO_PUBLIC_KEY, CKO_SECRET_KEY, -- CKO_NETSCAPE_TRUST, CKO_NETSCAPE_CRL, CKO_NETSCAPE_SMIME, -+ CKO_NSS_TRUST, CKO_NSS_CRL, CKO_NSS_SMIME, - CKO_CERTIFICATE }; - - #define handleToClass(handle) \ -@@ -290,7 +290,7 @@ lg_getSMime(LGObjectCache *obj) - certDBEntrySMime *entry; - NSSLOWCERTCertDBHandle *certHandle; - -- if (obj->objclass != CKO_NETSCAPE_SMIME) { -+ if (obj->objclass != CKO_NSS_SMIME) { - return NULL; - } - if (obj->objectInfo) { -@@ -314,7 +314,7 @@ lg_getCrl(LGObjectCache *obj) - PRBool isKrl; - NSSLOWCERTCertDBHandle *certHandle; - -- if (obj->objclass != CKO_NETSCAPE_CRL) { -+ if (obj->objclass != CKO_NSS_CRL) { - return NULL; - } - if (obj->objectInfo) { -@@ -339,7 +339,7 @@ lg_getCert(LGObjectCache *obj, NSSLOWCER - NSSLOWCERTCertificate *cert; - CK_OBJECT_CLASS objClass = obj->objclass; - -- if ((objClass != CKO_CERTIFICATE) && (objClass != CKO_NETSCAPE_TRUST)) { -+ if ((objClass != CKO_CERTIFICATE) && (objClass != CKO_NSS_TRUST)) { - return NULL; - } - if (objClass == CKO_CERTIFICATE && obj->objectInfo) { -@@ -358,7 +358,7 @@ lg_getTrust(LGObjectCache *obj, NSSLOWCE - { - NSSLOWCERTTrust *trust; - -- if (obj->objclass != CKO_NETSCAPE_TRUST) { -+ if (obj->objclass != CKO_NSS_TRUST) { - return NULL; - } - if (obj->objectInfo) { -@@ -1083,10 +1083,10 @@ lg_FindSMIMEAttribute(LGObjectCache *obj - case CKA_PRIVATE: - case CKA_MODIFIABLE: - return LG_CLONE_ATTR(attribute,type,lg_StaticFalseAttr); -- case CKA_NETSCAPE_EMAIL: -+ case CKA_NSS_EMAIL: - return lg_CopyAttribute(attribute,type,obj->dbKey.data, - obj->dbKey.len-1); -- case CKA_NETSCAPE_SMIME_TIMESTAMP: -+ case CKA_NSS_SMIME_TIMESTAMP: - case CKA_SUBJECT: - case CKA_VALUE: - break; -@@ -1098,7 +1098,7 @@ lg_FindSMIMEAttribute(LGObjectCache *obj - return CKR_OBJECT_HANDLE_INVALID; - } - switch (type) { -- case CKA_NETSCAPE_SMIME_TIMESTAMP: -+ case CKA_NSS_SMIME_TIMESTAMP: - return lg_CopyAttribute(attribute,type,entry->optionsDate.data, - entry->optionsDate.len); - case CKA_SUBJECT: -@@ -1172,26 +1172,25 @@ lg_FindTrustAttribute(LGObjectCache *obj - trust: - if (trustFlags & CERTDB_TRUSTED_CA ) { - return lg_ULongAttribute(attribute, type, -- CKT_NETSCAPE_TRUSTED_DELEGATOR); -+ CKT_NSS_TRUSTED_DELEGATOR); - } - if (trustFlags & CERTDB_TRUSTED) { -- return lg_ULongAttribute(attribute, type, CKT_NETSCAPE_TRUSTED); -+ return lg_ULongAttribute(attribute, type, CKT_NSS_TRUSTED); - } -- if (trustFlags & CERTDB_NOT_TRUSTED) { -- return lg_ULongAttribute(attribute, type, CKT_NETSCAPE_UNTRUSTED); -+ if (trustFlags & CERTDB_MUST_VERIFY) { -+ return lg_ULongAttribute(attribute, type, -+ CKT_NSS_MUST_VERIFY_TRUST); - } - if (trustFlags & CERTDB_TRUSTED_UNKNOWN) { -- return lg_ULongAttribute(attribute, type, -- CKT_NETSCAPE_TRUST_UNKNOWN); -+ return lg_ULongAttribute(attribute, type, CKT_NSS_TRUST_UNKNOWN); - } - if (trustFlags & CERTDB_VALID_CA) { -- return lg_ULongAttribute(attribute, type, -- CKT_NETSCAPE_VALID_DELEGATOR); -+ return lg_ULongAttribute(attribute, type, CKT_NSS_VALID_DELEGATOR); - } -- if (trustFlags & CERTDB_VALID_PEER) { -- return lg_ULongAttribute(attribute, type, CKT_NETSCAPE_VALID); -+ if (trustFlags & CERTDB_TERMINAL_RECORD) { -+ return lg_ULongAttribute(attribute, type, CKT_NSS_NOT_TRUSTED); - } -- return lg_ULongAttribute(attribute, type, CKT_NETSCAPE_MUST_VERIFY); -+ return lg_ULongAttribute(attribute, type, CKT_NSS_TRUST_UNKNOWN); - case CKA_TRUST_STEP_UP_APPROVED: - if (trust->trust->sslFlags & CERTDB_GOVT_APPROVED_CA) { - return LG_CLONE_ATTR(attribute,type,lg_StaticTrueAttr); -@@ -1237,14 +1236,14 @@ lg_FindCrlAttribute(LGObjectCache *obj, - case CKA_PRIVATE: - case CKA_MODIFIABLE: - return LG_CLONE_ATTR(attribute,type,lg_StaticFalseAttr); -- case CKA_NETSCAPE_KRL: -+ case CKA_NSS_KRL: - return ((obj->handle == LG_TOKEN_KRL_HANDLE) - ? LG_CLONE_ATTR(attribute,type,lg_StaticTrueAttr) - : LG_CLONE_ATTR(attribute,type,lg_StaticFalseAttr)); - case CKA_SUBJECT: - return lg_CopyAttribute(attribute,type,obj->dbKey.data, - obj->dbKey.len); -- case CKA_NETSCAPE_URL: -+ case CKA_NSS_URL: - case CKA_VALUE: - break; - default: -@@ -1255,7 +1254,7 @@ lg_FindCrlAttribute(LGObjectCache *obj, - return CKR_OBJECT_HANDLE_INVALID; - } - switch (type) { -- case CKA_NETSCAPE_URL: -+ case CKA_NSS_URL: - if (crl->url == NULL) { - return LG_CLONE_ATTR(attribute,type,lg_StaticNullAttr); - } -@@ -1294,7 +1293,7 @@ lg_FindCertAttribute(LGObjectCache *obj, - case CKA_SUBJECT: - case CKA_ISSUER: - case CKA_SERIAL_NUMBER: -- case CKA_NETSCAPE_EMAIL: -+ case CKA_NSS_EMAIL: - break; - default: - return lg_invalidAttribute(attribute); -@@ -1344,7 +1343,7 @@ lg_FindCertAttribute(LGObjectCache *obj, - case CKA_SERIAL_NUMBER: - return lg_CopyAttribute(attribute,type,cert->derSN.data, - cert->derSN.len); -- case CKA_NETSCAPE_EMAIL: -+ case CKA_NSS_EMAIL: - return (cert->emailAddr && cert->emailAddr[0]) - ? lg_CopyAttribute(attribute, type, cert->emailAddr, - PORT_Strlen(cert->emailAddr)) -@@ -1379,11 +1378,11 @@ lg_GetSingleAttribute(LGObjectCache *obj - switch (obj->objclass) { - case CKO_CERTIFICATE: - return lg_FindCertAttribute(obj,type,attribute); -- case CKO_NETSCAPE_CRL: -+ case CKO_NSS_CRL: - return lg_FindCrlAttribute(obj,type,attribute); -- case CKO_NETSCAPE_TRUST: -+ case CKO_NSS_TRUST: - return lg_FindTrustAttribute(obj,type,attribute); -- case CKO_NETSCAPE_SMIME: -+ case CKO_NSS_SMIME: - return lg_FindSMIMEAttribute(obj,type,attribute); - case CKO_PUBLIC_KEY: - return lg_FindPublicKeyAttribute(obj,type,attribute); -@@ -1501,7 +1500,7 @@ lg_SetCertAttribute(LGObjectCache *obj, - - /* we can't change the EMAIL values, but let the - * upper layers feel better about the fact we tried to set these */ -- if (type == CKA_NETSCAPE_EMAIL) { -+ if (type == CKA_NSS_EMAIL) { - return CKR_OK; - } - -@@ -1763,10 +1762,10 @@ lg_SetSingleAttribute(LGObjectCache *obj - crv = lg_SetCertAttribute(obj,attr->type, - attr->pValue,attr->ulValueLen); - break; -- case CKO_NETSCAPE_CRL: -+ case CKO_NSS_CRL: - /* change URL */ - break; -- case CKO_NETSCAPE_TRUST: -+ case CKO_NSS_TRUST: - crv = lg_SetTrustAttribute(obj,attr); - break; - case CKO_PRIVATE_KEY: -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/softoken/legacydb/lgcreate.c nss-3.12.11.oden/mozilla/security/nss/lib/softoken/legacydb/lgcreate.c ---- nss-3.12.11/mozilla/security/nss/lib/softoken/legacydb/lgcreate.c 2009-04-01 00:40:18.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/softoken/legacydb/lgcreate.c 2011-08-12 09:57:58.696165088 +0200 -@@ -143,7 +143,7 @@ lg_createCertObject(SDB *sdb, CK_OBJECT_ - /* - * Add a NULL S/MIME profile if necessary. - */ -- email = lg_getString(CKA_NETSCAPE_EMAIL, templ, count); -+ email = lg_getString(CKA_NSS_EMAIL, templ, count); - if (email) { - certDBEntrySMime *entry; - -@@ -168,17 +168,15 @@ lg_MapTrust(CK_TRUST trust, PRBool clien - unsigned int trustCA = clientAuth ? CERTDB_TRUSTED_CLIENT_CA : - CERTDB_TRUSTED_CA; - switch (trust) { -- case CKT_NETSCAPE_TRUSTED: -- return CERTDB_VALID_PEER|CERTDB_TRUSTED; -- case CKT_NETSCAPE_TRUSTED_DELEGATOR: -+ case CKT_NSS_TRUSTED: -+ return CERTDB_TERMINAL_RECORD|CERTDB_TRUSTED; -+ case CKT_NSS_TRUSTED_DELEGATOR: - return CERTDB_VALID_CA|trustCA; -- case CKT_NETSCAPE_UNTRUSTED: -- return CERTDB_NOT_TRUSTED; -- case CKT_NETSCAPE_MUST_VERIFY: -- return 0; -- case CKT_NETSCAPE_VALID: /* implies must verify */ -- return CERTDB_VALID_PEER; -- case CKT_NETSCAPE_VALID_DELEGATOR: /* implies must verify */ -+ case CKT_NSS_MUST_VERIFY_TRUST: -+ return CERTDB_MUST_VERIFY; -+ case CKT_NSS_NOT_TRUSTED: -+ return CERTDB_TERMINAL_RECORD; -+ case CKT_NSS_VALID_DELEGATOR: /* implies must verify */ - return CERTDB_VALID_CA; - default: - break; -@@ -198,10 +196,10 @@ lg_createTrustObject(SDB *sdb, CK_OBJECT - const CK_ATTRIBUTE *serial = NULL; - NSSLOWCERTCertificate *cert = NULL; - const CK_ATTRIBUTE *trust; -- CK_TRUST sslTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -- CK_TRUST clientTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -- CK_TRUST emailTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -- CK_TRUST signTrust = CKT_NETSCAPE_TRUST_UNKNOWN; -+ CK_TRUST sslTrust = CKT_NSS_TRUST_UNKNOWN; -+ CK_TRUST clientTrust = CKT_NSS_TRUST_UNKNOWN; -+ CK_TRUST emailTrust = CKT_NSS_TRUST_UNKNOWN; -+ CK_TRUST signTrust = CKT_NSS_TRUST_UNKNOWN; - CK_BBOOL stepUp; - NSSLOWCERTCertTrust dbTrust = { 0 }; - SECStatus rv; -@@ -323,7 +321,7 @@ lg_createSMimeObject(SDB *sdb, CK_OBJECT - } - - /* lookup Time */ -- time = lg_FindAttribute(CKA_NETSCAPE_SMIME_TIMESTAMP,templ,count); -+ time = lg_FindAttribute(CKA_NSS_SMIME_TIMESTAMP,templ,count); - if (time) { - rawTime.data = (unsigned char *)time->pValue; - rawTime.len = time->ulValueLen ; -@@ -332,7 +330,7 @@ lg_createSMimeObject(SDB *sdb, CK_OBJECT - } - - -- email = lg_getString(CKA_NETSCAPE_EMAIL,templ,count); -+ email = lg_getString(CKA_NSS_EMAIL,templ,count); - if (!email) { - ck_rv = CKR_ATTRIBUTE_VALUE_INVALID; - goto loser; -@@ -399,8 +397,8 @@ lg_createCrlObject(SDB *sdb, CK_OBJECT_H - derCrl.data = (unsigned char *)crl->pValue; - derCrl.len = crl->ulValueLen ; - -- url = lg_getString(CKA_NETSCAPE_URL,templ,count); -- isKRL = lg_isTrue(CKA_NETSCAPE_KRL,templ,count); -+ url = lg_getString(CKA_NSS_URL,templ,count); -+ isKRL = lg_isTrue(CKA_NSS_KRL,templ,count); - - /* Store CRL by SUBJECT */ - rv = nsslowcert_AddCrl(certHandle, &derCrl, &derSubj, url, isKRL); -@@ -987,13 +985,13 @@ lg_CreateObject(SDB *sdb, CK_OBJECT_HAND - case CKO_CERTIFICATE: - crv = lg_createCertObject(sdb,handle,templ,count); - break; -- case CKO_NETSCAPE_TRUST: -+ case CKO_NSS_TRUST: - crv = lg_createTrustObject(sdb,handle,templ,count); - break; -- case CKO_NETSCAPE_CRL: -+ case CKO_NSS_CRL: - crv = lg_createCrlObject(sdb,handle,templ,count); - break; -- case CKO_NETSCAPE_SMIME: -+ case CKO_NSS_SMIME: - crv = lg_createSMimeObject(sdb,handle,templ,count); - break; - case CKO_PRIVATE_KEY: -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/softoken/legacydb/pcertt.h nss-3.12.11.oden/mozilla/security/nss/lib/softoken/legacydb/pcertt.h ---- nss-3.12.11/mozilla/security/nss/lib/softoken/legacydb/pcertt.h 2009-04-12 03:31:46.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/softoken/legacydb/pcertt.h 2011-08-12 09:57:58.697165093 +0200 -@@ -431,7 +431,7 @@ typedef union { - #define DB_CERT_ENTRY_HEADER_LEN 10 - - /* common flags for all types of certificates */ --#define CERTDB_VALID_PEER (1<<0) -+#define CERTDB_TERMINAL_RECORD (1<<0) - #define CERTDB_TRUSTED (1<<1) - #define CERTDB_SEND_WARN (1<<2) - #define CERTDB_VALID_CA (1<<3) -@@ -441,11 +441,11 @@ typedef union { - #define CERTDB_TRUSTED_CLIENT_CA (1<<7) /* trusted for issuing client certs */ - #define CERTDB_INVISIBLE_CA (1<<8) /* don't show in UI */ - #define CERTDB_GOVT_APPROVED_CA (1<<9) /* can do strong crypto in export ver */ --#define CERTDB_NOT_TRUSTED (1<<10) /* explicitly don't trust this cert */ -+#define CERTDB_MUST_VERIFY (1<<10) /* explicitly don't trust this cert */ - #define CERTDB_TRUSTED_UNKNOWN (1<<11) /* accept trust from another source */ - - /* bits not affected by the CKO_NETSCAPE_TRUST object */ --#define CERTDB_PRESERVE_TRUST_BITS (CERTDB_USER | CERTDB_VALID_PEER | \ -+#define CERTDB_PRESERVE_TRUST_BITS (CERTDB_USER | \ - CERTDB_NS_TRUSTED_CA | CERTDB_VALID_CA | CERTDB_INVISIBLE_CA | \ - CERTDB_GOVT_APPROVED_CA) - -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/softoken/sftkdb.c nss-3.12.11.oden/mozilla/security/nss/lib/softoken/sftkdb.c ---- nss-3.12.11/mozilla/security/nss/lib/softoken/sftkdb.c 2010-06-24 02:21:23.000000000 +0200 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/softoken/sftkdb.c 2011-08-12 09:57:58.697165093 +0200 -@@ -1914,17 +1914,15 @@ sftkdb_reconcileTrustEntry(PRArenaPool * - * trust attribute should be, and neither agree exactly. - * At this point, we prefer 'hard' attributes over 'soft' ones. - * 'hard' ones are CKT_NSS_TRUSTED, CKT_NSS_TRUSTED_DELEGATOR, and -- * CKT_NSS_UNTRUTED. Soft ones are ones which don't change the -- * actual trust of the cert (CKT_MUST_VERIFY, CKT_NSS_VALID, -+ * CKT_NSS_NOT_TRUTED. Soft ones are ones which don't change the -+ * actual trust of the cert (CKT_MUST_VERIFY_TRUST, - * CKT_NSS_VALID_DELEGATOR). - */ -- if ((sourceTrust == CKT_NSS_MUST_VERIFY) -- || (sourceTrust == CKT_NSS_VALID) -+ if ((sourceTrust == CKT_NSS_MUST_VERIFY_TRUST) - || (sourceTrust == CKT_NSS_VALID_DELEGATOR)) { - return SFTKDB_DROP_ATTRIBUTE; - } -- if ((targetTrust == CKT_NSS_MUST_VERIFY) -- || (targetTrust == CKT_NSS_VALID) -+ if ((targetTrust == CKT_NSS_MUST_VERIFY_TRUST) - || (targetTrust == CKT_NSS_VALID_DELEGATOR)) { - /* again, overwriting the target in this case is OK */ - return SFTKDB_MODIFY_OBJECT; -diff -Naurp nss-3.12.11/mozilla/security/nss/lib/util/pkcs11n.h nss-3.12.11.oden/mozilla/security/nss/lib/util/pkcs11n.h ---- nss-3.12.11/mozilla/security/nss/lib/util/pkcs11n.h 2010-12-04 20:10:46.000000000 +0100 -+++ nss-3.12.11.oden/mozilla/security/nss/lib/util/pkcs11n.h 2011-08-12 09:57:58.698165098 +0200 -@@ -330,17 +330,72 @@ typedef CK_ULONG CK_TRUST; - /* If trust goes standard, these'll probably drop out of vendor space. */ - #define CKT_NSS_TRUSTED (CKT_NSS + 1) - #define CKT_NSS_TRUSTED_DELEGATOR (CKT_NSS + 2) --#define CKT_NSS_UNTRUSTED (CKT_NSS + 3) --#define CKT_NSS_MUST_VERIFY (CKT_NSS + 4) -+#define CKT_NSS_MUST_VERIFY_TRUST (CKT_NSS + 3) -+#define CKT_NSS_NOT_TRUSTED (CKT_NSS + 10) - #define CKT_NSS_TRUST_UNKNOWN (CKT_NSS + 5) /* default */ - - /* - * These may well remain NSS-specific; I'm only using them - * to cache resolution data. - */ --#define CKT_NSS_VALID (CKT_NSS + 10) - #define CKT_NSS_VALID_DELEGATOR (CKT_NSS + 11) - -+ -+/* -+ * old definitions. They still exist, but the plain meaning of the -+ * labels have never been accurate to was was really implemented. -+ * The new labels correctly reflect what the values effectively mean. -+ */ -+#if __GNUC__ > 3 -+/* make GCC warn when we use these #defines */ -+/* -+ * This is really painful because GCC doesn't allow us to mark random -+ * #defines as deprecated. We can only mark the following: -+ * functions, variables, and types. -+ * const variables will create extra storage for everyone including this -+ * header file, so it's undesirable. -+ * functions could be inlined to prevent storage creation, but will fail -+ * when constant values are expected (like switch statements). -+ * enum types do not seem to pay attention to the deprecated attribute. -+ * -+ * That leaves typedefs. We declare new types that we then deprecate, then -+ * cast the resulting value to the deprecated type in the #define, thus -+ * producting the warning when the #define is used. -+ */ -+#if (__GNUC__ == 4) && (__GNUC_MINOR < 5) -+/* The mac doesn't like the friendlier deprecate messages. I'm assuming this -+ * is a gcc version issue rather than mac or ppc specific */ -+typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated)); -+typedef CK_TRUST __CKT_NSS_VALID __attribute__ ((deprecated)); -+typedef CK_TRUST __CKT_NSS_MUST_VERIFY __attribute__((deprecated)); -+#else -+/* when possible, get a full deprecation warning. This works on gcc 4.5 -+ * it may work on earlier versions of gcc */ -+typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated -+ ("CKT_NSS_UNTRUSTED really means CKT_NSS_MUST_VERIFY_TRUST"))); -+typedef CK_TRUST __CKT_NSS_VALID __attribute__ ((deprecated -+ ("CKT_NSS_VALID really means CKT_NSS_NOT_TRUSTED"))); -+typedef CK_TRUST __CKT_NSS_MUST_VERIFY __attribute__((deprecated -+ ("CKT_NSS_MUST_VERIFY really functions as CKT_NSS_TRUST_UNKNOWN"))); -+#endif -+#define CKT_NSS_UNTRUSTED ((__CKT_NSS_UNTRUSTED)CKT_NSS_MUST_VERIFY_TRUST) -+#define CKT_NSS_VALID ((__CKT_NSS_VALID) CKT_NSS_NOT_TRUSTED) -+/* keep the old value for compatibility reasons*/ -+#define CKT_NSS_MUST_VERIFY ((__CKT_NSS_MUST_VERIFY)(CKT_NSS +4)) -+#else -+#ifdef _WIN32 -+/* This magic gets the windows compiler to give us a deprecation -+ * warning */ -+#pragma deprecated(CKT_NSS_UNTRUSTED, CKT_NSS_MUST_VERIFY, CKT_NSS_VALID) -+#endif -+/* CKT_NSS_UNTRUSTED really means CKT_NSS_MUST_VERIFY_TRUST */ -+#define CKT_NSS_UNTRUSTED CKT_NSS_MUST_VERIFY_TRUST -+/* CKT_NSS_VALID really means CKT_NSS_NOT_TRUSTED */ -+#define CKT_NSS_VALID CKT_NSS_NOT_TRUSTED -+/* CKT_NSS_MUST_VERIFY was always treated as CKT_NSS_TRUST_UNKNOWN */ -+#define CKT_NSS_MUST_VERIFY (CKT_NSS + 4) /*really means trust unknown*/ -+#endif -+ - /* don't leave old programs in a lurch just yet, give them the old NETSCAPE - * synonym */ - #define CKO_NETSCAPE_CRL CKO_NSS_CRL -@@ -367,6 +422,7 @@ typedef CK_ULONG CK_TRUST; - #define CKM_NETSCAPE_AES_KEY_WRAP_PAD CKM_NSS_AES_KEY_WRAP_PAD - #define CKR_NETSCAPE_CERTDB_FAILED CKR_NSS_CERTDB_FAILED - #define CKR_NETSCAPE_KEYDB_FAILED CKR_NSS_KEYDB_FAILED -+ - #define CKT_NETSCAPE_TRUSTED CKT_NSS_TRUSTED - #define CKT_NETSCAPE_TRUSTED_DELEGATOR CKT_NSS_TRUSTED_DELEGATOR - #define CKT_NETSCAPE_UNTRUSTED CKT_NSS_UNTRUSTED diff --git a/nss.spec b/nss.spec index 1fe351a..a5aba8d 100644 --- a/nss.spec +++ b/nss.spec @@ -4,20 +4,11 @@ %define libname %mklibname %{name} %{major} %define develname %mklibname -d %{name} %define sdevelname %mklibname -d -s %{name} -%define cvsver 3_12 +%define cvsver 3_13 %define nspr_libname %mklibname nspr 4 %define nspr_version 4.8.8 -%if %mandriva_branch == Cooker -# Cooker -%define release %mkrel 1 -%else -# Old distros -%define subrel 1 -%define release %mkrel 0 -%endif - # this seems fragile, so require the exact version or later (#58754) %define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0) %define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null || echo 0) @@ -27,9 +18,9 @@ %{?_without_empty: %{expand: %%global build_empty 0}} Name: nss -Version: 3.12.11 -Release: %{release} Epoch: 2 +Version: 3.13.1 +Release: 4 Summary: Netscape Security Services Group: System/Libraries License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -53,17 +44,11 @@ Patch0: nss-no-rpath.patch Patch1: nss-fixrandom.patch Patch3: nss-3.12.7-format_not_a_string_literal_and_no_format_arguments.patch Patch4: renegotiate-transitional.patch -Patch5: nss-3.12.11-new_certdata.txt_format.diff -%if %mdkversion >= 200700 -BuildRequires: rootcerts >= 1:20110413.00 -%endif -BuildRequires: libnspr-devel >= 2:4.8.8 -BuildRequires: libz-devel -%if %mdkversion >= 200800 -BuildRequires: libsqlite3-devel >= 3.6.22 -%endif +BuildRequires: rootcerts >= 1:20120117.00 +BuildRequires: nspr-devel >= 2:4.8.8 +BuildRequires: zlib-devel +BuildRequires: sqlite3-devel >= 3.6.22 BuildRequires: zip -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description Network Security Services (NSS) is a set of libraries designed to @@ -79,17 +64,20 @@ libraries have been not been included due to conflicts with the Mozilla libraries. %endif +%package shlibsign +Summary: Netscape Security Services - shlibsign +Group: System/Libraries +Conflicts: %{name} < 2:3.13.1-2 + +%description shlibsign +This package contains the binary shlibsign needed by %{libname}. + %if %with lib %package -n %{libname} Summary: Network Security Services (NSS) Group: System/Libraries -Provides: mozilla-nss = %{epoch}:%{version}-%{release} -Requires(post): nss -Requires(post): rpm-helper -%if %mdkversion >= 200800 -Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version} -%endif -Requires: %{nspr_libname} >= 2:%{nspr_version} +Requires(post): nss-shlibsign +Requires(post): rpm-helper %description -n %{libname} Network Security Services (NSS) is a set of libraries designed to @@ -103,12 +91,9 @@ http://www.mozilla.org/projects/security/pki/nss/overview.html. %package -n %{develname} Summary: Network Security Services (NSS) - development files Group: Development/C++ -Requires: %{libname} = %{epoch}:%{version}-%{release} -Requires: libnspr-devel -Provides: libnss-devel = %{epoch}:%{version}-%{release} +Requires: %{libname} >= %{epoch}:%{version}-%{release} Provides: nss-devel = %{epoch}:%{version}-%{release} Obsoletes: %{libname}-devel -Conflicts: %{libname} < 2:3.12-8 %description -n %{develname} Header files to doing development with Network Security Services. @@ -116,10 +101,8 @@ Header files to doing development with Network Security Services. %package -n %{sdevelname} Summary: Network Security Services (NSS) - static libraries Group: Development/C++ -Requires: %{libname} = %{epoch}:%{version}-%{release} -Requires: %{develname} = %{epoch}:%{version}-%{release} -Requires: libnspr-devel -Provides: libnss-static-devel = %{epoch}:%{version}-%{release} +Requires: %{libname} >= %{epoch}:%{version}-%{release} +Requires: %{develname} >= %{epoch}:%{version}-%{release} Provides: nss-static-devel = %{epoch}:%{version}-%{release} Conflicts: libopenssl-static-devel Obsoletes: %{libname}-static-devel @@ -135,16 +118,13 @@ Static libraries for doing development with Network Security Services. %patch1 -p0 %patch3 -p1 %patch4 -p0 -b .transitional -%patch5 -p1 find . -type d -perm 0700 -exec chmod 755 {} \; find . -type f -perm 0555 -exec chmod 755 {} \; find . -type f -perm 0444 -exec chmod 644 {} \; %build -%if %mdkversion >= 200900 %setup_compile_flags -%endif export BUILD_OPT=1 export OPTIMIZER="%{optflags}" export XCFLAGS="%{optflags}" @@ -336,27 +316,15 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %multiarch_binaries %{buildroot}%{_bindir}/nss-config -%clean -%{__rm} -rf %{buildroot} - %if %with lib %post -n %{libname} -%if %mdkversion < 200900 -/sbin/ldconfig -%endif %create_ghostfile /%{_lib}/libsoftokn%{major}.chk root root 644 %create_ghostfile /%{_lib}/libfreebl%{major}.chk root root 644 %{_bindir}/shlibsign -i /%{_lib}/libsoftokn%{major}.so >/dev/null 2>/dev/null %{_bindir}/shlibsign -i /%{_lib}/libfreebl%{major}.so >/dev/null 2>/dev/null - -%postun -n %{libname} -%if %mdkversion < 200900 -/sbin/ldconfig -%endif %endif %files -%defattr(0644,root,root,0755) %doc docs/* %attr(0755,root,root) %{_bindir}/addbuiltin %attr(0755,root,root) %{_bindir}/atob @@ -366,6 +334,7 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %attr(0755,root,root) %{_bindir}/certcgi %attr(0755,root,root) %{_bindir}/certutil %attr(0755,root,root) %{_bindir}/checkcert +%attr(0755,root,root) %{_bindir}/chktest %attr(0755,root,root) %{_bindir}/cmsutil %attr(0755,root,root) %{_bindir}/conflict %attr(0755,root,root) %{_bindir}/crlutil @@ -374,6 +343,7 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %attr(0755,root,root) %{_bindir}/derdump %attr(0755,root,root) %{_bindir}/dertimetest %attr(0755,root,root) %{_bindir}/digest +%attr(0755,root,root) %{_bindir}/encodeinttest %attr(0755,root,root) %{_bindir}/fipstest %attr(0755,root,root) %{_bindir}/makepqg %attr(0755,root,root) %{_bindir}/mangle @@ -393,7 +363,6 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %attr(0755,root,root) %{_bindir}/rsaperf %attr(0755,root,root) %{_bindir}/sdrtest %attr(0755,root,root) %{_bindir}/selfserv -%attr(0755,root,root) %{_bindir}/shlibsign %attr(0755,root,root) %{_bindir}/signtool %attr(0755,root,root) %{_bindir}/signver %attr(0755,root,root) %{_bindir}/smime @@ -408,9 +377,11 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db +%files shlibsign +%attr(0755,root,root) %{_bindir}/shlibsign + %if %with lib %files -n %{libname} -%defattr(0755,root,root,0755) /%{_lib}/libfreebl%{major}.so /%{_lib}/libnss%{major}.so /%{_lib}/libnssckbi.so @@ -427,7 +398,6 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %ghost /%{_lib}/libfreebl%{major}.chk %files -n %{develname} -%defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/nss-config %attr(0755,root,root) %{multiarch_bindir}/nss-config %_libdir/*.so @@ -541,7 +511,35 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so %changelog -* Fri Aug 12 2011 Oden Eriksson 2:3.12.11-0.1mdv2011.0 +* Thu Jan 26 2012 Oden Eriksson 2:3.13.1-4 ++ Revision: 769168 +- bump release +- fix deps +- rebuilt to pickup the changes in rootcerts as of 2012/01/17 + +* Tue Jan 10 2012 Matthew Dawkins 2:3.13.1-2 ++ Revision: 759561 +- fixed shlibsign description +- split out shlibsign binary +- this helps break a huge dep LOOP +- glibc<>nss<>perl +- cleaned up spec a bit + +* Sat Nov 05 2011 Oden Eriksson 2:3.13.1-1 ++ Revision: 720519 +- 3.13.1 +- rediff the renegotiate-transitional patch +- drop the new_certdata.txt format patch as it is fixed since 3.13 + +* Wed Sep 07 2011 Oden Eriksson 2:3.12.11-3 ++ Revision: 698538 +- pick up the fix for MFSA 2011-35 + +* Wed Aug 31 2011 Oden Eriksson 2:3.12.11-2 ++ Revision: 697592 +- pick up the fix for MFSA 2011-34 + +* Fri Aug 12 2011 Oden Eriksson 2:3.12.11-1 + Revision: 694115 - 3.12.11 - rediffed the new_certdata.txt_format patch diff --git a/renegotiate-transitional.patch b/renegotiate-transitional.patch index 3c1c831..b1a940b 100644 --- a/renegotiate-transitional.patch +++ b/renegotiate-transitional.patch @@ -1,5 +1,5 @@ ---- mozilla/security/nss/lib/ssl/sslsock.c 2010-07-31 06:33:52.000000000 +0200 -+++ mozilla/security/nss/lib/ssl/sslsock.c.oden 2010-10-12 16:15:56.536434663 +0200 +--- mozilla/security/nss/lib/ssl/sslsock.c 2011-10-22 18:45:40.000000000 +0200 ++++ mozilla/security/nss/lib/ssl/sslsock.c.oden 2011-11-05 17:45:55.672091551 +0100 @@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* noLocks */ PR_FALSE, /* enableSessionTickets */ @@ -8,4 +8,4 @@ + 3, /* enableRenegotiation (default: transitional) */ PR_FALSE, /* requireSafeNegotiation */ PR_FALSE, /* enableFalseStart */ - }; + PR_TRUE /* cbcRandomIV */