summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaie%netscape.com <devnull@localhost>2002-11-06 15:41:46 +0000
committerkaie%netscape.com <devnull@localhost>2002-11-06 15:41:46 +0000
commit7371aa17e4ed41ab23d3faf2fa67c5b16487b3ec (patch)
treefa73d60b1ba716a2917686e0807c41b8325a7f7f
parent39f7c52c8bcf366ee735a239674d9cdbd4994646 (diff)
parentfb0f13ef8580ac7b70f1f2e75cb56f33f97740b5 (diff)
downloadnss-hg-7371aa17e4ed41ab23d3faf2fa67c5b16487b3ec.tar.gz
b=171331 Thawte Freemail certificates not trusted
same bug as b=175085 New builds with old databases lose trust Patch from relyea r=kaie a=blizzard
-rw-r--r--security/nss/cmd/addbuiltin/addbuiltin.c14
-rw-r--r--security/nss/lib/ckfw/builtins/bfind.c38
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.c616
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.txt336
4 files changed, 558 insertions, 446 deletions
diff --git a/security/nss/cmd/addbuiltin/addbuiltin.c b/security/nss/cmd/addbuiltin/addbuiltin.c
index 26a46e7a9..2304e241f 100644
--- a/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -73,6 +73,11 @@ char *getTrustString(unsigned int trust)
return "CKT_NETSCAPE_VALID"; /* not reached */
}
+static const SEC_ASN1Template serialTemplate[] = {
+ { SEC_ASN1_INTEGER, offsetof(CERTCertificate,serialNumber) },
+ { 0 }
+};
+
static SECStatus
ConvertCertificate(SECItem *sdder, char *nickname, CERTCertTrust *trust)
{
@@ -80,11 +85,16 @@ ConvertCertificate(SECItem *sdder, char *nickname, CERTCertTrust *trust)
CERTCertificate *cert;
unsigned char sha1_hash[SHA1_LENGTH];
unsigned char md5_hash[MD5_LENGTH];
+ SECItem *serial = NULL;
cert = CERT_DecodeDERCertificate(sdder, PR_FALSE, nickname);
if (!cert) {
return SECFailure;
}
+ serial = SEC_ASN1EncodeItem(NULL,NULL,cert,serialTemplate);
+ if (!serial) {
+ return SECFailure;
+ }
printf("\n#\n# Certificate \"%s\"\n#\n",nickname);
printf("CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE\n");
@@ -101,7 +111,7 @@ ConvertCertificate(SECItem *sdder, char *nickname, CERTCertTrust *trust)
dumpbytes(cert->derIssuer.data,cert->derIssuer.len);
printf("END\n");
printf("CKA_SERIAL_NUMBER MULTILINE_OCTAL\n");
- dumpbytes(cert->serialNumber.data,cert->serialNumber.len);
+ dumpbytes(serial->data,serial->len);
printf("END\n");
printf("CKA_VALUE MULTILINE_OCTAL\n");
dumpbytes(sdder->data,sdder->len);
@@ -126,7 +136,7 @@ ConvertCertificate(SECItem *sdder, char *nickname, CERTCertTrust *trust)
dumpbytes(cert->derIssuer.data,cert->derIssuer.len);
printf("END\n");
printf("CKA_SERIAL_NUMBER MULTILINE_OCTAL\n");
- dumpbytes(cert->serialNumber.data,cert->serialNumber.len);
+ dumpbytes(serial->data,serial->len);
printf("END\n");
printf("CKA_TRUST_SERVER_AUTH CK_TRUST %s\n",
diff --git a/security/nss/lib/ckfw/builtins/bfind.c b/security/nss/lib/ckfw/builtins/bfind.c
index 17b94fa15..13f45166f 100644
--- a/security/nss/lib/ckfw/builtins/bfind.c
+++ b/security/nss/lib/ckfw/builtins/bfind.c
@@ -108,6 +108,33 @@ builtins_mdFindObjects_Next
return nss_builtins_CreateMDObject(arena, io, pError);
}
+static int
+builtins_derUnwrapInt(unsigned char *src, int size, unsigned char **dest) {
+ unsigned char *start = src;
+ int len = 0;
+
+ if (*src ++ != 2) {
+ return 0;
+ }
+ len = *src++;
+ if (len & 0x80) {
+ int count = len & 0x7f;
+ len =0;
+
+ if (count+2 > size) {
+ return 0;
+ }
+ while (count-- > 0) {
+ len = (len << 8) | *src++;
+ }
+ }
+ if (len + (src-start) != size) {
+ return 0;
+ }
+ *dest = src;
+ return len;
+}
+
static CK_BBOOL
builtins_attrmatch
(
@@ -118,6 +145,17 @@ builtins_attrmatch
PRBool prb;
if( a->ulValueLen != b->size ) {
+ /* match a decoded serial number */
+ if ((a->type == CKA_SERIAL_NUMBER) && (a->ulValueLen < b->size)) {
+ int len;
+ unsigned char *data;
+
+ len = builtins_derUnwrapInt(b->data,b->size,&data);
+ if ((len == a->ulValueLen) &&
+ nsslibc_memequal(a->pValue, data, len, (PRStatus *)NULL)) {
+ return CK_TRUE;
+ }
+ }
return CK_FALSE;
}
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index b42246605..901c201a3 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -39,15 +39,15 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $R
#include "builtins.h"
#endif /* BUILTINS_H */
-static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
+static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
+static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
+static const CK_BBOOL ck_false = CK_FALSE;
static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
-static const CK_OBJECT_CLASS cko_netscape_builtin_root_list = CKO_NETSCAPE_BUILTIN_ROOT_LIST;
static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
-static const CK_CERTIFICATE_TYPE ckc_x_509 = CKC_X_509;
static const CK_OBJECT_CLASS cko_data = CKO_DATA;
-static const CK_BBOOL ck_false = CK_FALSE;
static const CK_BBOOL ck_true = CK_TRUE;
-static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
+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;
#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
@@ -466,7 +466,7 @@ static const NSSItem nss_builtins_items_0 [] = {
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
{ (void *)"CVS ID", (PRUint32)7 },
{ (void *)"NSS", (PRUint32)4 },
- { (void *)"@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)179 }
+ { (void *)"@(#) $RCSfile$ $Revision$ $Date$ $Name$""; @(#) $RCSfile$ $Revision$ $Date$ $Name$", (PRUint32)197 }
};
#endif /* DEBUG */
static const NSSItem nss_builtins_items_1 [] = {
@@ -500,8 +500,9 @@ static const NSSItem nss_builtins_items_2 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300"
-, (PRUint32)16 },
+ { (void *)"\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136"
+"\335\300"
+, (PRUint32)18 },
{ (void *)"\060\202\002\064\060\202\001\241\002\020\002\255\146\176\116\105"
"\376\136\127\157\074\230\031\136\335\300\060\015\006\011\052\206"
"\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006"
@@ -559,8 +560,9 @@ static const NSSItem nss_builtins_items_3 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300"
-, (PRUint32)16 },
+ { (void *)"\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136"
+"\335\300"
+, (PRUint32)18 },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -585,8 +587,8 @@ static const NSSItem nss_builtins_items_4 [] = {
"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165"
"\163\164\040\122\157\157\164"
, (PRUint32)71 },
- { (void *)"\001\243"
-, (PRUint32)2 },
+ { (void *)"\002\002\001\243"
+, (PRUint32)4 },
{ (void *)"\060\202\001\372\060\202\001\143\002\002\001\243\060\015\006\011"
"\052\206\110\206\367\015\001\001\004\005\000\060\105\061\013\060"
"\011\006\003\125\004\006\023\002\125\123\061\030\060\026\006\003"
@@ -638,8 +640,8 @@ static const NSSItem nss_builtins_items_5 [] = {
"\004\003\023\023\107\124\105\040\103\171\142\145\162\124\162\165"
"\163\164\040\122\157\157\164"
, (PRUint32)71 },
- { (void *)"\001\243"
-, (PRUint32)2 },
+ { (void *)"\002\002\001\243"
+, (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) }
@@ -670,8 +672,8 @@ static const NSSItem nss_builtins_items_6 [] = {
"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
"\141\154\040\122\157\157\164"
, (PRUint32)119 },
- { (void *)"\001\245"
-, (PRUint32)2 },
+ { (void *)"\002\002\001\245"
+, (PRUint32)4 },
{ (void *)"\060\202\002\132\060\202\001\303\002\002\001\245\060\015\006\011"
"\052\206\110\206\367\015\001\001\004\005\000\060\165\061\013\060"
"\011\006\003\125\004\006\023\002\125\123\061\030\060\026\006\003"
@@ -732,8 +734,8 @@ static const NSSItem nss_builtins_items_7 [] = {
"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
"\141\154\040\122\157\157\164"
, (PRUint32)119 },
- { (void *)"\001\245"
-, (PRUint32)2 },
+ { (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) }
@@ -774,8 +776,8 @@ static const NSSItem nss_builtins_items_8 [] = {
"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141"
"\163\151\143\100\164\150\141\167\164\145\056\143\157\155"
, (PRUint32)206 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
{ (void *)"\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\201\313\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
@@ -854,8 +856,8 @@ static const NSSItem nss_builtins_items_9 [] = {
"\001\011\001\026\031\160\145\162\163\157\156\141\154\055\142\141"
"\163\151\143\100\164\150\141\167\164\145\056\143\157\155"
, (PRUint32)206 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -898,8 +900,8 @@ static const NSSItem nss_builtins_items_10 [] = {
"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143"
"\157\155"
, (PRUint32)210 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
{ (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\201\317\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
@@ -979,8 +981,8 @@ static const NSSItem nss_builtins_items_11 [] = {
"\160\162\145\155\151\165\155\100\164\150\141\167\164\145\056\143"
"\157\155"
, (PRUint32)210 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -1023,8 +1025,8 @@ static const NSSItem nss_builtins_items_12 [] = {
"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
"\056\143\157\155"
, (PRUint32)212 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
{ (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
@@ -1105,8 +1107,8 @@ static const NSSItem nss_builtins_items_13 [] = {
"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
"\056\143\157\155"
, (PRUint32)212 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -1147,8 +1149,8 @@ static const NSSItem nss_builtins_items_14 [] = {
"\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141"
"\167\164\145\056\143\157\155"
, (PRUint32)199 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\003\023\060\202\002\174\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
@@ -1226,8 +1228,8 @@ static const NSSItem nss_builtins_items_15 [] = {
"\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141"
"\167\164\145\056\143\157\155"
, (PRUint32)199 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -1270,8 +1272,8 @@ static const NSSItem nss_builtins_items_16 [] = {
"\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157"
"\155"
, (PRUint32)209 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\003\047\060\202\002\220\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
@@ -1351,8 +1353,8 @@ static const NSSItem nss_builtins_items_17 [] = {
"\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157"
"\155"
, (PRUint32)209 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -1377,8 +1379,8 @@ static const NSSItem nss_builtins_items_18 [] = {
"\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151"
"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
, (PRUint32)80 },
- { (void *)"\065\336\364\317"
-, (PRUint32)4 },
+ { (void *)"\002\004\065\336\364\317"
+, (PRUint32)6 },
{ (void *)"\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\065"
"\336\364\317\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125"
@@ -1449,8 +1451,8 @@ static const NSSItem nss_builtins_items_19 [] = {
"\146\141\170\040\123\145\143\165\162\145\040\103\145\162\164\151"
"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
, (PRUint32)80 },
- { (void *)"\065\336\364\317"
-, (PRUint32)4 },
+ { (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) }
@@ -1483,9 +1485,9 @@ static const NSSItem nss_builtins_items_20 [] = {
"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147"
"\163\151\147\164\162\165\163\164\056\143\157\155"
, (PRUint32)140 },
- { (void *)"\000\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000"
-"\004"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000"
+"\000\000\004"
+, (PRUint32)19 },
{ (void *)"\060\202\003\265\060\202\002\235\240\003\002\001\002\002\021\000"
"\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000\004"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
@@ -1569,9 +1571,9 @@ static const NSSItem nss_builtins_items_21 [] = {
"\367\015\001\011\001\026\025\141\144\155\151\156\100\144\151\147"
"\163\151\147\164\162\165\163\164\056\143\157\155"
, (PRUint32)140 },
- { (void *)"\000\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000"
-"\004"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000"
+"\000\000\004"
+, (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) }
@@ -1596,8 +1598,8 @@ static const NSSItem nss_builtins_items_22 [] = {
"\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010"
"\104\123\124\103\101\040\105\061"
, (PRUint32)72 },
- { (void *)"\066\160\025\226"
-, (PRUint32)4 },
+ { (void *)"\002\004\066\160\025\226"
+, (PRUint32)6 },
{ (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066"
"\160\025\226\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\106\061\013\060\011\006\003\125\004\006\023\002\125"
@@ -1668,8 +1670,8 @@ static const NSSItem nss_builtins_items_23 [] = {
"\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010"
"\104\123\124\103\101\040\105\061"
, (PRUint32)72 },
- { (void *)"\066\160\025\226"
-, (PRUint32)4 },
+ { (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) }
@@ -1694,8 +1696,8 @@ static const NSSItem nss_builtins_items_24 [] = {
"\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010"
"\104\123\124\103\101\040\105\062"
, (PRUint32)72 },
- { (void *)"\066\156\323\316"
-, (PRUint32)4 },
+ { (void *)"\002\004\066\156\323\316"
+, (PRUint32)6 },
{ (void *)"\060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066"
"\156\323\316\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\106\061\013\060\011\006\003\125\004\006\023\002\125"
@@ -1766,8 +1768,8 @@ static const NSSItem nss_builtins_items_25 [] = {
"\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010"
"\104\123\124\103\101\040\105\062"
, (PRUint32)72 },
- { (void *)"\066\156\323\316"
-, (PRUint32)4 },
+ { (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) }
@@ -1804,9 +1806,9 @@ static const NSSItem nss_builtins_items_26 [] = {
"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
"\163\151\147\164\162\165\163\164\056\143\157\155"
, (PRUint32)172 },
- { (void *)"\000\320\036\100\213\000\000\002\174\000\000\000\002\000\000\000"
-"\001"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000"
+"\000\000\001"
+, (PRUint32)19 },
{ (void *)"\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000"
"\000\002\174\000\000\000\002\000\000\000\001\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\251\061\013\060"
@@ -1894,9 +1896,9 @@ static const NSSItem nss_builtins_items_27 [] = {
"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
"\163\151\147\164\162\165\163\164\056\143\157\155"
, (PRUint32)172 },
- { (void *)"\000\320\036\100\213\000\000\002\174\000\000\000\002\000\000\000"
-"\001"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000"
+"\000\000\001"
+, (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) }
@@ -1933,9 +1935,9 @@ static const NSSItem nss_builtins_items_28 [] = {
"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
"\163\151\147\164\162\165\163\164\056\143\157\155"
, (PRUint32)172 },
- { (void *)"\000\320\036\100\213\000\000\167\155\000\000\000\001\000\000\000"
-"\004"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000"
+"\000\000\004"
+, (PRUint32)19 },
{ (void *)"\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000"
"\000\167\155\000\000\000\001\000\000\000\004\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\251\061\013\060"
@@ -2023,9 +2025,9 @@ static const NSSItem nss_builtins_items_29 [] = {
"\206\110\206\367\015\001\011\001\026\022\143\141\100\144\151\147"
"\163\151\147\164\162\165\163\164\056\143\157\155"
, (PRUint32)172 },
- { (void *)"\000\320\036\100\213\000\000\167\155\000\000\000\001\000\000\000"
-"\004"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000"
+"\000\000\004"
+, (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) }
@@ -2054,9 +2056,9 @@ static const NSSItem nss_builtins_items_30 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252"
-"\125"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263"
+"\162\252\125"
+, (PRUint32)19 },
{ (void *)"\060\202\002\075\060\202\001\246\002\021\000\315\272\177\126\360"
"\337\344\274\124\376\042\254\263\162\252\125\060\015\006\011\052"
"\206\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011"
@@ -2115,9 +2117,9 @@ static const NSSItem nss_builtins_items_31 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252"
-"\125"
-, (PRUint32)17 },
+ { (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_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -2146,8 +2148,9 @@ static const NSSItem nss_builtins_items_32 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276\013"
-, (PRUint32)16 },
+ { (void *)"\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105"
+"\276\013"
+, (PRUint32)18 },
{ (void *)"\060\202\002\074\060\202\001\245\002\020\055\033\374\112\027\215"
"\243\221\353\347\377\365\213\105\276\013\060\015\006\011\052\206"
"\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006"
@@ -2205,8 +2208,9 @@ static const NSSItem nss_builtins_items_33 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276\013"
-, (PRUint32)16 },
+ { (void *)"\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105"
+"\276\013"
+, (PRUint32)18 },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -2235,8 +2239,9 @@ static const NSSItem nss_builtins_items_34 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277"
-, (PRUint32)16 },
+ { (void *)"\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314"
+"\272\277"
+, (PRUint32)18 },
{ (void *)"\060\202\002\074\060\202\001\245\002\020\160\272\344\035\020\331"
"\051\064\266\070\312\173\003\314\272\277\060\015\006\011\052\206"
"\110\206\367\015\001\001\002\005\000\060\137\061\013\060\011\006"
@@ -2294,8 +2299,9 @@ static const NSSItem nss_builtins_items_35 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277"
-, (PRUint32)16 },
+ { (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) }
@@ -2336,8 +2342,9 @@ static const NSSItem nss_builtins_items_36 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222"
-, (PRUint32)16 },
+ { (void *)"\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211"
+"\221\222"
+, (PRUint32)18 },
{ (void *)"\060\202\003\002\060\202\002\153\002\020\114\307\352\252\230\076"
"\161\323\223\020\370\075\072\211\221\222\060\015\006\011\052\206"
"\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011"
@@ -2414,8 +2421,9 @@ static const NSSItem nss_builtins_items_37 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222"
-, (PRUint32)16 },
+ { (void *)"\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211"
+"\221\222"
+, (PRUint32)18 },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -2456,9 +2464,9 @@ static const NSSItem nss_builtins_items_38 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212"
-"\257"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160"
+"\154\212\257"
+, (PRUint32)19 },
{ (void *)"\060\202\003\003\060\202\002\154\002\021\000\271\057\140\314\210"
"\237\241\172\106\011\270\133\160\154\212\257\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060"
@@ -2535,9 +2543,9 @@ static const NSSItem nss_builtins_items_39 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212"
-"\257"
-, (PRUint32)17 },
+ { (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_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -2578,8 +2586,9 @@ static const NSSItem nss_builtins_items_40 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306"
-, (PRUint32)16 },
+ { (void *)"\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211"
+"\064\306"
+, (PRUint32)18 },
{ (void *)"\060\202\003\002\060\202\002\153\002\020\175\331\376\007\317\250"
"\036\267\020\171\147\373\247\211\064\306\060\015\006\011\052\206"
"\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011"
@@ -2656,8 +2665,9 @@ static const NSSItem nss_builtins_items_41 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306"
-, (PRUint32)16 },
+ { (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) }
@@ -2698,8 +2708,9 @@ static const NSSItem nss_builtins_items_42 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370"
-, (PRUint32)16 },
+ { (void *)"\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067"
+"\045\370"
+, (PRUint32)18 },
{ (void *)"\060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365"
"\353\023\107\370\177\304\040\067\045\370\060\015\006\011\052\206"
"\110\206\367\015\001\001\005\005\000\060\201\301\061\013\060\011"
@@ -2776,8 +2787,9 @@ static const NSSItem nss_builtins_items_43 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370"
-, (PRUint32)16 },
+ { (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) }
@@ -2804,8 +2816,8 @@ static const NSSItem nss_builtins_items_44 [] = {
"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
"\156\040\122\157\157\164\040\103\101"
, (PRUint32)89 },
- { (void *)"\002\000\000\000\000\000\326\170\267\224\005"
-, (PRUint32)11 },
+ { (void *)"\002\013\002\000\000\000\000\000\326\170\267\224\005"
+, (PRUint32)13 },
{ (void *)"\060\202\003\165\060\202\002\135\240\003\002\001\002\002\013\002"
"\000\000\000\000\000\326\170\267\224\005\060\015\006\011\052\206"
"\110\206\367\015\001\001\004\005\000\060\127\061\013\060\011\006"
@@ -2882,8 +2894,8 @@ static const NSSItem nss_builtins_items_45 [] = {
"\006\003\125\004\003\023\022\107\154\157\142\141\154\123\151\147"
"\156\040\122\157\157\164\040\103\101"
, (PRUint32)89 },
- { (void *)"\002\000\000\000\000\000\326\170\267\224\005"
-, (PRUint32)11 },
+ { (void *)"\002\013\002\000\000\000\000\000\326\170\267\224\005"
+, (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) }
@@ -2922,8 +2934,8 @@ static const NSSItem nss_builtins_items_46 [] = {
"\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146"
"\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
, (PRUint32)190 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060"
"\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164"
@@ -2997,8 +3009,8 @@ static const NSSItem nss_builtins_items_47 [] = {
"\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146"
"\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
, (PRUint32)190 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -3037,8 +3049,8 @@ static const NSSItem nss_builtins_items_48 [] = {
"\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146"
"\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
, (PRUint32)190 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060"
"\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164"
@@ -3112,8 +3124,8 @@ static const NSSItem nss_builtins_items_49 [] = {
"\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146"
"\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
, (PRUint32)190 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -3152,8 +3164,8 @@ static const NSSItem nss_builtins_items_50 [] = {
"\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146"
"\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
, (PRUint32)190 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\273\061\044\060"
"\042\006\003\125\004\007\023\033\126\141\154\151\103\145\162\164"
@@ -3227,8 +3239,8 @@ static const NSSItem nss_builtins_items_51 [] = {
"\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156\146"
"\157\100\166\141\154\151\143\145\162\164\056\143\157\155"
, (PRUint32)190 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -3269,9 +3281,9 @@ static const NSSItem nss_builtins_items_52 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261"
-"\244"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110"
+"\316\261\244"
+, (PRUint32)19 },
{ (void *)"\060\202\004\032\060\202\003\002\002\021\000\213\133\165\126\204"
"\124\205\013\000\317\257\070\110\316\261\244\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060"
@@ -3365,9 +3377,9 @@ static const NSSItem nss_builtins_items_53 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261"
-"\244"
-, (PRUint32)17 },
+ { (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_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -3408,8 +3420,9 @@ static const NSSItem nss_builtins_items_54 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172"
-, (PRUint32)16 },
+ { (void *)"\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120"
+"\133\172"
+, (PRUint32)18 },
{ (void *)"\060\202\004\031\060\202\003\001\002\020\141\160\313\111\214\137"
"\230\105\051\347\260\246\331\120\133\172\060\015\006\011\052\206"
"\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060\011"
@@ -3503,8 +3516,9 @@ static const NSSItem nss_builtins_items_55 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172"
-, (PRUint32)16 },
+ { (void *)"\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120"
+"\133\172"
+, (PRUint32)18 },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -3545,9 +3559,9 @@ static const NSSItem nss_builtins_items_56 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357"
-"\127"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161"
+"\051\357\127"
+, (PRUint32)19 },
{ (void *)"\060\202\004\032\060\202\003\002\002\021\000\233\176\006\111\243"
"\076\142\271\325\356\220\110\161\051\357\127\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060"
@@ -3641,9 +3655,9 @@ static const NSSItem nss_builtins_items_57 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357"
-"\127"
-, (PRUint32)17 },
+ { (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) }
@@ -3684,9 +3698,9 @@ static const NSSItem nss_builtins_items_58 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136"
-"\327"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057"
+"\224\136\327"
+, (PRUint32)19 },
{ (void *)"\060\202\004\032\060\202\003\002\002\021\000\354\240\247\213\156"
"\165\152\001\317\304\174\314\057\224\136\327\060\015\006\011\052"
"\206\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060"
@@ -3780,9 +3794,9 @@ static const NSSItem nss_builtins_items_59 [] = {
"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
"\165\164\150\157\162\151\164\171\040\055\040\107\063"
, (PRUint32)205 },
- { (void *)"\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136"
-"\327"
-, (PRUint32)17 },
+ { (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) }
@@ -3823,8 +3837,8 @@ static const NSSItem nss_builtins_items_60 [] = {
"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
"\150\157\162\151\164\171"
, (PRUint32)198 },
- { (void *)"\067\112\322\103"
-, (PRUint32)4 },
+ { (void *)"\002\004\067\112\322\103"
+, (PRUint32)6 },
{ (void *)"\060\202\004\330\060\202\004\101\240\003\002\001\002\002\004\067"
"\112\322\103\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\201\303\061\013\060\011\006\003\125\004\006\023\002"
@@ -3930,8 +3944,8 @@ static const NSSItem nss_builtins_items_61 [] = {
"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
"\150\157\162\151\164\171"
, (PRUint32)198 },
- { (void *)"\067\112\322\103"
-, (PRUint32)4 },
+ { (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) }
@@ -3972,8 +3986,8 @@ static const NSSItem nss_builtins_items_62 [] = {
"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
"\157\156\040\101\165\164\150\157\162\151\164\171"
, (PRUint32)204 },
- { (void *)"\070\003\221\356"
-, (PRUint32)4 },
+ { (void *)"\002\004\070\003\221\356"
+, (PRUint32)6 },
{ (void *)"\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070"
"\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004"
"\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002"
@@ -4081,8 +4095,8 @@ static const NSSItem nss_builtins_items_63 [] = {
"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
"\157\156\040\101\165\164\150\157\162\151\164\171"
, (PRUint32)204 },
- { (void *)"\070\003\221\356"
-, (PRUint32)4 },
+ { (void *)"\002\004\070\003\221\356"
+, (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) }
@@ -4121,8 +4135,8 @@ static const NSSItem nss_builtins_items_64 [] = {
"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
"\040\050\062\060\064\070\051"
, (PRUint32)183 },
- { (void *)"\070\143\271\146"
-, (PRUint32)4 },
+ { (void *)"\002\004\070\143\271\146"
+, (PRUint32)6 },
{ (void *)"\060\202\004\134\060\202\003\104\240\003\002\001\002\002\004\070"
"\143\271\146\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013"
@@ -4219,8 +4233,8 @@ static const NSSItem nss_builtins_items_65 [] = {
"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
"\040\050\062\060\064\070\051"
, (PRUint32)183 },
- { (void *)"\070\143\271\146"
-, (PRUint32)4 },
+ { (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) }
@@ -4259,8 +4273,8 @@ static const NSSItem nss_builtins_items_66 [] = {
"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162"
"\164\056\143\157\155"
, (PRUint32)181 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\201\262\061\044\060\042\006\003\125\004\007\023\033\126\141\154"
@@ -4340,8 +4354,8 @@ static const NSSItem nss_builtins_items_67 [] = {
"\011\001\026\021\151\156\146\157\100\166\141\154\151\143\145\162"
"\164\056\143\157\155"
, (PRUint32)181 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -4370,8 +4384,8 @@ static const NSSItem nss_builtins_items_68 [] = {
"\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147"
"\156\151\156\147\040\122\157\157\164"
, (PRUint32)105 },
- { (void *)"\002\000\000\277"
-, (PRUint32)4 },
+ { (void *)"\002\004\002\000\000\277"
+, (PRUint32)6 },
{ (void *)"\060\202\003\246\060\202\002\216\240\003\002\001\002\002\004\002"
"\000\000\277\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\147\061\013\060\011\006\003\125\004\006\023\002\111"
@@ -4452,8 +4466,8 @@ static const NSSItem nss_builtins_items_69 [] = {
"\145\162\124\162\165\163\164\040\103\157\144\145\040\123\151\147"
"\156\151\156\147\040\122\157\157\164"
, (PRUint32)105 },
- { (void *)"\002\000\000\277"
-, (PRUint32)4 },
+ { (void *)"\002\004\002\000\000\277"
+, (PRUint32)6 },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }
@@ -4480,8 +4494,8 @@ static const NSSItem nss_builtins_items_70 [] = {
"\003\023\031\102\141\154\164\151\155\157\162\145\040\103\171\142"
"\145\162\124\162\165\163\164\040\122\157\157\164"
, (PRUint32)92 },
- { (void *)"\002\000\000\271"
-, (PRUint32)4 },
+ { (void *)"\002\004\002\000\000\271"
+, (PRUint32)6 },
{ (void *)"\060\202\003\167\060\202\002\137\240\003\002\001\002\002\004\002"
"\000\000\271\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\111"
@@ -4558,8 +4572,8 @@ static const NSSItem nss_builtins_items_71 [] = {
"\003\023\031\102\141\154\164\151\155\157\162\145\040\103\171\142"
"\145\162\124\162\165\163\164\040\122\157\157\164"
, (PRUint32)92 },
- { (void *)"\002\000\000\271"
-, (PRUint32)4 },
+ { (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_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -4588,8 +4602,8 @@ static const NSSItem nss_builtins_items_72 [] = {
"\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122"
"\157\157\164"
, (PRUint32)99 },
- { (void *)"\002\000\000\270"
-, (PRUint32)4 },
+ { (void *)"\002\004\002\000\000\270"
+, (PRUint32)6 },
{ (void *)"\060\202\002\175\060\202\001\346\240\003\002\001\002\002\004\002"
"\000\000\270\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\141\061\013\060\011\006\003\125\004\006\023\002\111"
@@ -4652,8 +4666,8 @@ static const NSSItem nss_builtins_items_73 [] = {
"\145\162\124\162\165\163\164\040\115\157\142\151\154\145\040\122"
"\157\157\164"
, (PRUint32)99 },
- { (void *)"\002\000\000\270"
-, (PRUint32)4 },
+ { (void *)"\002\004\002\000\000\270"
+, (PRUint32)6 },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -4680,8 +4694,8 @@ static const NSSItem nss_builtins_items_74 [] = {
"\123\145\143\165\162\145\040\107\154\157\142\141\154\040\145\102"
"\165\163\151\156\145\163\163\040\103\101\055\061"
, (PRUint32)92 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\002\220\060\202\001\371\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\132\061\013\060\011\006\003\125\004\006\023\002\125\123\061\034"
@@ -4744,8 +4758,8 @@ static const NSSItem nss_builtins_items_75 [] = {
"\123\145\143\165\162\145\040\107\154\157\142\141\154\040\145\102"
"\165\163\151\156\145\163\163\040\103\101\055\061"
, (PRUint32)92 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -4772,8 +4786,8 @@ static const NSSItem nss_builtins_items_76 [] = {
"\123\145\143\165\162\145\040\145\102\165\163\151\156\145\163\163"
"\040\103\101\055\061"
, (PRUint32)85 },
- { (void *)"\004"
-, (PRUint32)1 },
+ { (void *)"\002\001\004"
+, (PRUint32)3 },
{ (void *)"\060\202\002\202\060\202\001\353\240\003\002\001\002\002\001\004"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\123\061\013\060\011\006\003\125\004\006\023\002\125\123\061\034"
@@ -4835,8 +4849,8 @@ static const NSSItem nss_builtins_items_77 [] = {
"\123\145\143\165\162\145\040\145\102\165\163\151\156\145\163\163"
"\040\103\101\055\061"
, (PRUint32)85 },
- { (void *)"\004"
-, (PRUint32)1 },
+ { (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) }
@@ -4861,8 +4875,8 @@ static const NSSItem nss_builtins_items_78 [] = {
"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162"
"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062"
, (PRUint32)80 },
- { (void *)"\067\160\317\265"
-, (PRUint32)4 },
+ { (void *)"\002\004\067\160\317\265"
+, (PRUint32)6 },
{ (void *)"\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\067"
"\160\317\265\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\116\061\013\060\011\006\003\125\004\006\023\002\125"
@@ -4933,8 +4947,8 @@ static const NSSItem nss_builtins_items_79 [] = {
"\013\023\035\105\161\165\151\146\141\170\040\123\145\143\165\162"
"\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062"
, (PRUint32)80 },
- { (void *)"\067\160\317\265"
-, (PRUint32)4 },
+ { (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) }
@@ -4963,8 +4977,8 @@ static const NSSItem nss_builtins_items_80 [] = {
"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
"\164\040\062"
, (PRUint32)99 },
- { (void *)"\003\036"
-, (PRUint32)2 },
+ { (void *)"\002\002\003\036"
+, (PRUint32)4 },
{ (void *)"\060\202\003\200\060\202\002\150\240\003\002\001\002\002\002\003"
"\036\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
"\060\141\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
@@ -5043,8 +5057,8 @@ static const NSSItem nss_builtins_items_81 [] = {
"\022\060\020\006\003\125\004\003\023\011\107\120\040\122\157\157"
"\164\040\062"
, (PRUint32)99 },
- { (void *)"\003\036"
-, (PRUint32)2 },
+ { (void *)"\002\002\003\036"
+, (PRUint32)4 },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
{ (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -5071,8 +5085,8 @@ static const NSSItem nss_builtins_items_82 [] = {
"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125"
"\123\124\145\144\040\122\157\157\164\040\103\101"
, (PRUint32)92 },
- { (void *)"\071\117\175\207"
-, (PRUint32)4 },
+ { (void *)"\002\004\071\117\175\207"
+, (PRUint32)6 },
{ (void *)"\060\202\005\054\060\202\004\024\240\003\002\001\002\002\004\071"
"\117\175\207\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\127"
@@ -5176,8 +5190,8 @@ static const NSSItem nss_builtins_items_83 [] = {
"\061\032\060\030\006\003\125\004\003\023\021\142\145\124\122\125"
"\123\124\145\144\040\122\157\157\164\040\103\101"
, (PRUint32)92 },
- { (void *)"\071\117\175\207"
-, (PRUint32)4 },
+ { (void *)"\002\004\071\117\175\207"
+, (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) }
@@ -5206,8 +5220,8 @@ static const NSSItem nss_builtins_items_84 [] = {
"\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040"
"\103\101\040\122\157\157\164"
, (PRUint32)103 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\004\030\060\202\003\000\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\145\061\013\060\011\006\003\125\004\006\023\002\123\105\061\024"
@@ -5295,8 +5309,8 @@ static const NSSItem nss_builtins_items_85 [] = {
"\144\144\124\162\165\163\164\040\103\154\141\163\163\040\061\040"
"\103\101\040\122\157\157\164"
, (PRUint32)103 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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_valid, (PRUint32)sizeof(CK_TRUST) }
@@ -5327,8 +5341,8 @@ static const NSSItem nss_builtins_items_86 [] = {
"\040\105\170\164\145\162\156\141\154\040\103\101\040\122\157\157"
"\164"
, (PRUint32)113 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\004\066\060\202\003\036\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\157\061\013\060\011\006\003\125\004\006\023\002\123\105\061\024"
@@ -5419,8 +5433,8 @@ static const NSSItem nss_builtins_items_87 [] = {
"\040\105\170\164\145\162\156\141\154\040\103\101\040\122\157\157"
"\164"
, (PRUint32)113 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -5449,8 +5463,8 @@ static const NSSItem nss_builtins_items_88 [] = {
"\144\144\124\162\165\163\164\040\120\165\142\154\151\143\040\103"
"\101\040\122\157\157\164"
, (PRUint32)102 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\004\025\060\202\002\375\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\144\061\013\060\011\006\003\125\004\006\023\002\123\105\061\024"
@@ -5539,8 +5553,8 @@ static const NSSItem nss_builtins_items_89 [] = {
"\040\105\170\164\145\162\156\141\154\040\103\101\040\122\157\157"
"\164"
, (PRUint32)113 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -5569,8 +5583,8 @@ static const NSSItem nss_builtins_items_90 [] = {
"\144\144\124\162\165\163\164\040\121\165\141\154\151\146\151\145"
"\144\040\103\101\040\122\157\157\164"
, (PRUint32)105 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\004\036\060\202\003\006\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\147\061\013\060\011\006\003\125\004\006\023\002\123\105\061\024"
@@ -5659,8 +5673,8 @@ static const NSSItem nss_builtins_items_91 [] = {
"\144\144\124\162\165\163\164\040\121\165\141\154\151\146\151\145"
"\144\040\103\101\040\122\157\157\164"
, (PRUint32)105 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -5693,8 +5707,9 @@ static const NSSItem nss_builtins_items_92 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040"
-, (PRUint32)16 },
+ { (void *)"\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177"
+"\047\040"
+, (PRUint32)18 },
{ (void *)"\060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\053"
"\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
@@ -5775,8 +5790,9 @@ static const NSSItem nss_builtins_items_93 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040"
-, (PRUint32)16 },
+ { (void *)"\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177"
+"\047\040"
+, (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) }
@@ -5809,8 +5825,9 @@ static const NSSItem nss_builtins_items_94 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247"
-, (PRUint32)16 },
+ { (void *)"\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171"
+"\212\247"
+, (PRUint32)18 },
{ (void *)"\060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\011"
"\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
@@ -5891,8 +5908,9 @@ static const NSSItem nss_builtins_items_95 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247"
-, (PRUint32)16 },
+ { (void *)"\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171"
+"\212\247"
+, (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) }
@@ -5925,8 +5943,9 @@ static const NSSItem nss_builtins_items_96 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204"
-, (PRUint32)16 },
+ { (void *)"\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154"
+"\301\204"
+, (PRUint32)18 },
{ (void *)"\060\202\003\242\060\202\003\013\240\003\002\001\002\002\020\056"
"\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
@@ -6007,8 +6026,9 @@ static const NSSItem nss_builtins_items_97 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204"
-, (PRUint32)16 },
+ { (void *)"\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154"
+"\301\204"
+, (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) }
@@ -6041,9 +6061,9 @@ static const NSSItem nss_builtins_items_98 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117"
-"\336"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127"
+"\341\117\336"
+, (PRUint32)19 },
{ (void *)"\060\202\003\237\060\202\003\014\240\003\002\001\002\002\021\000"
"\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117\336"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
@@ -6124,9 +6144,9 @@ static const NSSItem nss_builtins_items_99 [] = {
"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
"\171"
, (PRUint32)97 },
- { (void *)"\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117"
-"\336"
-, (PRUint32)17 },
+ { (void *)"\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127"
+"\341\117\336"
+, (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) }
@@ -6165,8 +6185,9 @@ static const NSSItem nss_builtins_items_100 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\123\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011"
-, (PRUint32)16 },
+ { (void *)"\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364"
+"\007\011"
+, (PRUint32)18 },
{ (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\020\123"
"\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
@@ -6256,8 +6277,9 @@ static const NSSItem nss_builtins_items_101 [] = {
"\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164"
"\167\157\162\153"
, (PRUint32)196 },
- { (void *)"\123\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011"
-, (PRUint32)16 },
+ { (void *)"\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364"
+"\007\011"
+, (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) }
@@ -6290,8 +6312,8 @@ static const NSSItem nss_builtins_items_102 [] = {
"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
, (PRUint32)142 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (void *)"\002\001\000"
+, (PRUint32)3 },
{ (void *)"\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000"
"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
"\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
@@ -6358,8 +6380,8 @@ static const NSSItem nss_builtins_items_103 [] = {
"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
, (PRUint32)142 },
- { (void *)"\000"
-, (PRUint32)1 },
+ { (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) }
@@ -6398,8 +6420,8 @@ static const NSSItem nss_builtins_items_104 [] = {
"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
"\151\157\156\040\101\165\164\150\157\162\151\164\171"
, (PRUint32)189 },
- { (void *)"\070\233\021\074"
-, (PRUint32)4 },
+ { (void *)"\002\004\070\233\021\074"
+, (PRUint32)6 },
{ (void *)"\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070"
"\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004"
"\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013"
@@ -6500,8 +6522,8 @@ static const NSSItem nss_builtins_items_105 [] = {
"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
"\151\157\156\040\101\165\164\150\157\162\151\164\171"
, (PRUint32)189 },
- { (void *)"\070\233\021\074"
-, (PRUint32)4 },
+ { (void *)"\002\004\070\233\021\074"
+, (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) }
@@ -6540,8 +6562,8 @@ static const NSSItem nss_builtins_items_106 [] = {
"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
"\164\150\157\162\151\164\171"
, (PRUint32)183 },
- { (void *)"\070\236\366\344"
-, (PRUint32)4 },
+ { (void *)"\002\004\070\236\366\344"
+, (PRUint32)6 },
{ (void *)"\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070"
"\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004"
"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013"
@@ -6641,8 +6663,8 @@ static const NSSItem nss_builtins_items_107 [] = {
"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
"\164\150\157\162\151\164\171"
, (PRUint32)183 },
- { (void *)"\070\236\366\344"
-, (PRUint32)4 },
+ { (void *)"\002\004\070\236\366\344"
+, (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) }
@@ -6675,8 +6697,8 @@ static const NSSItem nss_builtins_items_108 [] = {
"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
"\162\151\164\171\040\061"
, (PRUint32)134 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
@@ -6763,8 +6785,8 @@ static const NSSItem nss_builtins_items_109 [] = {
"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
"\162\151\164\171\040\061"
, (PRUint32)134 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -6797,8 +6819,8 @@ static const NSSItem nss_builtins_items_110 [] = {
"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
"\162\151\164\171\040\062"
, (PRUint32)134 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
@@ -6917,8 +6939,8 @@ static const NSSItem nss_builtins_items_111 [] = {
"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
"\162\151\164\171\040\062"
, (PRUint32)134 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -6947,8 +6969,8 @@ static const NSSItem nss_builtins_items_112 [] = {
"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155"
"\145\156\164\141\164\151\157\156"
, (PRUint32)104 },
- { (void *)"\074\265\075\106"
-, (PRUint32)4 },
+ { (void *)"\002\004\074\265\075\106"
+, (PRUint32)6 },
{ (void *)"\060\202\005\152\060\202\004\122\240\003\002\001\002\002\004\074"
"\265\075\106\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142"
@@ -7057,8 +7079,8 @@ static const NSSItem nss_builtins_items_113 [] = {
"\102\141\154\164\151\155\157\162\145\040\111\155\160\154\145\155"
"\145\156\164\141\164\151\157\156"
, (PRUint32)104 },
- { (void *)"\074\265\075\106"
-, (PRUint32)4 },
+ { (void *)"\002\004\074\265\075\106"
+, (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) }
@@ -7087,8 +7109,8 @@ static const NSSItem nss_builtins_items_114 [] = {
"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155"
"\145\156\164\141\164\151\157\156"
, (PRUint32)104 },
- { (void *)"\074\265\117\100"
-, (PRUint32)4 },
+ { (void *)"\002\004\074\265\117\100"
+, (PRUint32)6 },
{ (void *)"\060\202\006\121\060\202\005\071\240\003\002\001\002\002\004\074"
"\265\117\100\060\015\006\011\052\206\110\206\367\015\001\001\005"
"\005\000\060\146\061\022\060\020\006\003\125\004\012\023\011\142"
@@ -7212,8 +7234,8 @@ static const NSSItem nss_builtins_items_115 [] = {
"\055\040\105\156\164\162\165\163\164\040\111\155\160\154\145\155"
"\145\156\164\141\164\151\157\156"
, (PRUint32)104 },
- { (void *)"\074\265\117\100"
-, (PRUint32)4 },
+ { (void *)"\002\004\074\265\117\100"
+, (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) }
@@ -7242,8 +7264,9 @@ static const NSSItem nss_builtins_items_116 [] = {
"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141"
"\164\151\157\156"
, (PRUint32)100 },
- { (void *)"\073\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032"
-, (PRUint32)16 },
+ { (void *)"\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264"
+"\252\032"
+, (PRUint32)18 },
{ (void *)"\060\202\005\150\060\202\004\120\240\003\002\001\002\002\020\073"
"\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142"
@@ -7352,8 +7375,9 @@ static const NSSItem nss_builtins_items_117 [] = {
"\055\040\122\123\101\040\111\155\160\154\145\155\145\156\164\141"
"\164\151\157\156"
, (PRUint32)100 },
- { (void *)"\073\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032"
-, (PRUint32)16 },
+ { (void *)"\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264"
+"\252\032"
+, (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) }
@@ -7376,8 +7400,9 @@ static const NSSItem nss_builtins_items_118 [] = {
"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165"
"\162\151\164\171\040\062\060\064\070\040\126\063"
, (PRUint32)60 },
- { (void *)"\012\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002"
-, (PRUint32)16 },
+ { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000"
+"\000\002"
+, (PRUint32)18 },
{ (void *)"\060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012"
"\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\072"
@@ -7451,8 +7476,9 @@ static const NSSItem nss_builtins_items_119 [] = {
"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165"
"\162\151\164\171\040\062\060\064\070\040\126\063"
, (PRUint32)60 },
- { (void *)"\012\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002"
-, (PRUint32)16 },
+ { (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) }
@@ -7475,8 +7501,9 @@ static const NSSItem nss_builtins_items_120 [] = {
"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165"
"\162\151\164\171\040\061\060\062\064\040\126\063"
, (PRUint32)60 },
- { (void *)"\012\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002"
-, (PRUint32)16 },
+ { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\013\000\000"
+"\000\002"
+, (PRUint32)18 },
{ (void *)"\060\202\002\134\060\202\001\305\240\003\002\001\002\002\020\012"
"\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\072"
@@ -7533,8 +7560,9 @@ static const NSSItem nss_builtins_items_121 [] = {
"\033\006\003\125\004\013\023\024\122\123\101\040\123\145\143\165"
"\162\151\164\171\040\061\060\062\064\040\126\063"
, (PRUint32)60 },
- { (void *)"\012\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002"
-, (PRUint32)16 },
+ { (void *)"\002\020\012\001\001\001\000\000\002\174\000\000\000\013\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) }
@@ -7559,8 +7587,8 @@ static const NSSItem nss_builtins_items_122 [] = {
"\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141"
"\154\040\103\101"
, (PRUint32)68 },
- { (void *)"\002\064\126"
-, (PRUint32)3 },
+ { (void *)"\002\003\002\064\126"
+, (PRUint32)5 },
{ (void *)"\060\202\003\124\060\202\002\074\240\003\002\001\002\002\003\002"
"\064\126\060\015\006\011\052\206\110\206\367\015\001\001\005\005"
"\000\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123"
@@ -7634,8 +7662,8 @@ static const NSSItem nss_builtins_items_123 [] = {
"\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141"
"\154\040\103\101"
, (PRUint32)68 },
- { (void *)"\002\064\126"
-, (PRUint32)3 },
+ { (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) }
@@ -7672,8 +7700,9 @@ static const NSSItem nss_builtins_items_124 [] = {
"\164\055\116\145\164\167\157\162\153\040\101\160\160\154\151\143"
"\141\164\151\157\156\163"
, (PRUint32)166 },
- { (void *)"\104\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167"
-, (PRUint32)16 },
+ { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300"
+"\063\167"
+, (PRUint32)18 },
{ (void *)"\060\202\004\144\060\202\003\114\240\003\002\001\002\002\020\104"
"\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
@@ -7770,8 +7799,9 @@ static const NSSItem nss_builtins_items_125 [] = {
"\164\055\116\145\164\167\157\162\153\040\101\160\160\154\151\143"
"\141\164\151\157\156\163"
, (PRUint32)166 },
- { (void *)"\104\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167"
-, (PRUint32)16 },
+ { (void *)"\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300"
+"\063\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) }
@@ -7800,8 +7830,8 @@ static const NSSItem nss_builtins_items_126 [] = {
"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
"\151\164\171\040\061"
, (PRUint32)101 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\003\244\060\202\002\214\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061\034"
@@ -7882,8 +7912,8 @@ static const NSSItem nss_builtins_items_127 [] = {
"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
"\151\164\171\040\061"
, (PRUint32)101 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -7912,8 +7942,8 @@ static const NSSItem nss_builtins_items_128 [] = {
"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
"\151\164\171\040\062"
, (PRUint32)101 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\005\244\060\202\003\214\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061\034"
@@ -8026,8 +8056,8 @@ static const NSSItem nss_builtins_items_129 [] = {
"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
"\151\164\171\040\062"
, (PRUint32)101 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (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) }
@@ -8056,8 +8086,9 @@ static const NSSItem nss_builtins_items_130 [] = {
"\034\060\032\006\003\125\004\003\023\023\126\151\163\141\040\145"
"\103\157\155\155\145\162\143\145\040\122\157\157\164"
, (PRUint32)109 },
- { (void *)"\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142"
-, (PRUint32)16 },
+ { (void *)"\002\020\023\206\065\115\035\077\006\362\301\371\145\005\325\220"
+"\034\142"
+, (PRUint32)18 },
{ (void *)"\060\202\003\242\060\202\002\212\240\003\002\001\002\002\020\023"
"\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142\060"
"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\153"
@@ -8138,8 +8169,9 @@ static const NSSItem nss_builtins_items_131 [] = {
"\034\060\032\006\003\125\004\003\023\023\126\151\163\141\040\145"
"\103\157\155\155\145\162\143\145\040\122\157\157\164"
, (PRUint32)109 },
- { (void *)"\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142"
-, (PRUint32)16 },
+ { (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) }
@@ -8178,8 +8210,8 @@ static const NSSItem nss_builtins_items_132 [] = {
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 },
- { (void *)"\003\352"
-, (PRUint32)2 },
+ { (void *)"\002\002\003\352"
+, (PRUint32)4 },
{ (void *)"\060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003"
"\352\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000"
"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105"
@@ -8260,8 +8292,8 @@ static const NSSItem nss_builtins_items_133 [] = {
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 },
- { (void *)"\003\352"
-, (PRUint32)2 },
+ { (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) }
@@ -8300,8 +8332,8 @@ static const NSSItem nss_builtins_items_134 [] = {
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 },
- { (void *)"\003\353"
-, (PRUint32)2 },
+ { (void *)"\002\002\003\353"
+, (PRUint32)4 },
{ (void *)"\060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003"
"\353\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000"
"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\104\105"
@@ -8382,8 +8414,8 @@ static const NSSItem nss_builtins_items_135 [] = {
"\001\011\001\026\032\143\145\162\164\151\146\151\143\141\164\145"
"\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145"
, (PRUint32)191 },
- { (void *)"\003\353"
-, (PRUint32)2 },
+ { (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) }
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 029f85103..43d98fac8 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -126,7 +126,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300
+\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136
+\335\300
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\064\060\202\001\241\002\020\002\255\146\176\116\105
@@ -190,7 +191,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300
+\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136
+\335\300
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -221,7 +223,7 @@ CKA_ISSUER MULTILINE_OCTAL
\163\164\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\243
+\002\002\001\243
END
CKA_VALUE MULTILINE_OCTAL
\060\202\001\372\060\202\001\143\002\002\001\243\060\015\006\011
@@ -279,7 +281,7 @@ CKA_ISSUER MULTILINE_OCTAL
\163\164\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\243
+\002\002\001\243
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -316,7 +318,7 @@ CKA_ISSUER MULTILINE_OCTAL
\141\154\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\245
+\002\002\001\245
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\132\060\202\001\303\002\002\001\245\060\015\006\011
@@ -383,7 +385,7 @@ CKA_ISSUER MULTILINE_OCTAL
\141\154\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\245
+\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
@@ -430,7 +432,7 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\143\100\164\150\141\167\164\145\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000
@@ -515,7 +517,7 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\143\100\164\150\141\167\164\145\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -564,7 +566,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000
@@ -650,7 +652,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -699,7 +701,7 @@ CKA_ISSUER MULTILINE_OCTAL
\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000
@@ -786,7 +788,7 @@ CKA_ISSUER MULTILINE_OCTAL
\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -833,7 +835,7 @@ CKA_ISSUER MULTILINE_OCTAL
\167\164\145\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\023\060\202\002\174\240\003\002\001\002\002\001\001
@@ -917,7 +919,7 @@ CKA_ISSUER MULTILINE_OCTAL
\167\164\145\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
@@ -966,7 +968,7 @@ CKA_ISSUER MULTILINE_OCTAL
\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\047\060\202\002\220\240\003\002\001\002\002\001\001
@@ -1052,7 +1054,7 @@ CKA_ISSUER MULTILINE_OCTAL
\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
@@ -1083,7 +1085,7 @@ CKA_ISSUER MULTILINE_OCTAL
\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\065\336\364\317
+\002\004\065\336\364\317
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\065
@@ -1160,7 +1162,7 @@ CKA_ISSUER MULTILINE_OCTAL
\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\065\336\364\317
+\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
@@ -1199,8 +1201,8 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\147\164\162\165\163\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000
+\000\000\004
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\265\060\202\002\235\240\003\002\001\002\002\021\000
@@ -1290,8 +1292,8 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\147\164\162\165\163\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000
+\000\000\004
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1322,7 +1324,7 @@ CKA_ISSUER MULTILINE_OCTAL
\104\123\124\103\101\040\105\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\160\025\226
+\002\004\066\160\025\226
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066
@@ -1399,7 +1401,7 @@ CKA_ISSUER MULTILINE_OCTAL
\104\123\124\103\101\040\105\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\160\025\226
+\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
@@ -1430,7 +1432,7 @@ CKA_ISSUER MULTILINE_OCTAL
\104\123\124\103\101\040\105\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\156\323\316
+\002\004\066\156\323\316
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066
@@ -1507,7 +1509,7 @@ CKA_ISSUER MULTILINE_OCTAL
\104\123\124\103\101\040\105\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\156\323\316
+\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
@@ -1550,8 +1552,8 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\147\164\162\165\163\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\002\174\000\000\000\002\000\000\000
-\001
+\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000
+\000\000\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000
@@ -1645,8 +1647,8 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\147\164\162\165\163\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\002\174\000\000\000\002\000\000\000
-\001
+\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000
+\000\000\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1689,8 +1691,8 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\147\164\162\165\163\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\167\155\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000
+\000\000\004
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000
@@ -1784,8 +1786,8 @@ CKA_ISSUER MULTILINE_OCTAL
\163\151\147\164\162\165\163\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\167\155\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000
+\000\000\004
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1820,8 +1822,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252
-\125
+\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263
+\162\252\125
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\075\060\202\001\246\002\021\000\315\272\177\126\360
@@ -1886,8 +1888,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252
-\125
+\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_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1922,7 +1924,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276\013
+\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105
+\276\013
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\074\060\202\001\245\002\020\055\033\374\112\027\215
@@ -1986,7 +1989,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276\013
+\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_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2021,7 +2025,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277
+\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314
+\272\277
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\074\060\202\001\245\002\020\160\272\344\035\020\331
@@ -2085,7 +2090,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277
+\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
@@ -2132,7 +2138,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222
+\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211
+\221\222
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\002\060\202\002\153\002\020\114\307\352\252\230\076
@@ -2215,7 +2222,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222
+\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_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2262,8 +2270,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212
-\257
+\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160
+\154\212\257
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\003\060\202\002\154\002\021\000\271\057\140\314\210
@@ -2346,8 +2354,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212
-\257
+\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_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2394,7 +2402,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306
+\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211
+\064\306
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\002\060\202\002\153\002\020\175\331\376\007\317\250
@@ -2477,7 +2486,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306
+\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
@@ -2524,7 +2534,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370
+\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067
+\045\370
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365
@@ -2607,7 +2618,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370
+\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
@@ -2640,7 +2652,7 @@ CKA_ISSUER MULTILINE_OCTAL
\156\040\122\157\157\164\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\000\000\000\326\170\267\224\005
+\002\013\002\000\000\000\000\000\326\170\267\224\005
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\165\060\202\002\135\240\003\002\001\002\002\013\002
@@ -2723,7 +2735,7 @@ CKA_ISSUER MULTILINE_OCTAL
\156\040\122\157\157\164\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\000\000\000\326\170\267\224\005
+\002\013\002\000\000\000\000\000\326\170\267\224\005
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2768,7 +2780,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\100\166\141\154\151\143\145\162\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
@@ -2848,7 +2860,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\100\166\141\154\151\143\145\162\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2893,7 +2905,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\100\166\141\154\151\143\145\162\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
@@ -2973,7 +2985,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\100\166\141\154\151\143\145\162\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3018,7 +3030,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\100\166\141\154\151\143\145\162\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
@@ -3098,7 +3110,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\100\166\141\154\151\143\145\162\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3145,8 +3157,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261
-\244
+\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110
+\316\261\244
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\032\060\202\003\002\002\021\000\213\133\165\126\204
@@ -3246,8 +3258,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261
-\244
+\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_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3294,7 +3306,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172
+\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120
+\133\172
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\031\060\202\003\001\002\020\141\160\313\111\214\137
@@ -3394,7 +3407,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172
+\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_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3441,8 +3455,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357
-\127
+\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161
+\051\357\127
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\032\060\202\003\002\002\021\000\233\176\006\111\243
@@ -3542,8 +3556,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357
-\127
+\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
@@ -3590,8 +3604,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136
-\327
+\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057
+\224\136\327
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\032\060\202\003\002\002\021\000\354\240\247\213\156
@@ -3691,8 +3705,8 @@ CKA_ISSUER MULTILINE_OCTAL
\165\164\150\157\162\151\164\171\040\055\040\107\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136
-\327
+\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
@@ -3739,7 +3753,7 @@ CKA_ISSUER MULTILINE_OCTAL
\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\112\322\103
+\002\004\067\112\322\103
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\330\060\202\004\101\240\003\002\001\002\002\004\067
@@ -3851,7 +3865,7 @@ CKA_ISSUER MULTILINE_OCTAL
\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\112\322\103
+\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
@@ -3898,7 +3912,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\156\040\101\165\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\003\221\356
+\002\004\070\003\221\356
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070
@@ -4012,7 +4026,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\156\040\101\165\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\003\221\356
+\002\004\070\003\221\356
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4057,7 +4071,7 @@ CKA_ISSUER MULTILINE_OCTAL
\040\050\062\060\064\070\051
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\143\271\146
+\002\004\070\143\271\146
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\134\060\202\003\104\240\003\002\001\002\002\004\070
@@ -4160,7 +4174,7 @@ CKA_ISSUER MULTILINE_OCTAL
\040\050\062\060\064\070\051
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\143\271\146
+\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
@@ -4205,7 +4219,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001
@@ -4291,7 +4305,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164\056\143\157\155
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4326,7 +4340,7 @@ CKA_ISSUER MULTILINE_OCTAL
\156\151\156\147\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\277
+\002\004\002\000\000\277
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\246\060\202\002\216\240\003\002\001\002\002\004\002
@@ -4413,7 +4427,7 @@ CKA_ISSUER MULTILINE_OCTAL
\156\151\156\147\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\277
+\002\004\002\000\000\277
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
@@ -4446,7 +4460,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\162\124\162\165\163\164\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\271
+\002\004\002\000\000\271
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\167\060\202\002\137\240\003\002\001\002\002\004\002
@@ -4529,7 +4543,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\162\124\162\165\163\164\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\271
+\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
@@ -4564,7 +4578,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\270
+\002\004\002\000\000\270
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\175\060\202\001\346\240\003\002\001\002\002\004\002
@@ -4633,7 +4647,7 @@ CKA_ISSUER MULTILINE_OCTAL
\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\270
+\002\004\002\000\000\270
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4666,7 +4680,7 @@ CKA_ISSUER MULTILINE_OCTAL
\165\163\151\156\145\163\163\040\103\101\055\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\220\060\202\001\371\240\003\002\001\002\002\001\001
@@ -4735,7 +4749,7 @@ CKA_ISSUER MULTILINE_OCTAL
\165\163\151\156\145\163\163\040\103\101\055\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4768,7 +4782,7 @@ CKA_ISSUER MULTILINE_OCTAL
\040\103\101\055\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\004
+\002\001\004
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\202\060\202\001\353\240\003\002\001\002\002\001\004
@@ -4836,7 +4850,7 @@ CKA_ISSUER MULTILINE_OCTAL
\040\103\101\055\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\004
+\002\001\004
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4867,7 +4881,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\160\317\265
+\002\004\067\160\317\265
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\067
@@ -4944,7 +4958,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\160\317\265
+\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
@@ -4979,7 +4993,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164\040\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\036
+\002\002\003\036
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\200\060\202\002\150\240\003\002\001\002\002\002\003
@@ -5064,7 +5078,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164\040\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\036
+\002\002\003\036
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5097,7 +5111,7 @@ CKA_ISSUER MULTILINE_OCTAL
\123\124\145\144\040\122\157\157\164\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\071\117\175\207
+\002\004\071\117\175\207
END
CKA_VALUE MULTILINE_OCTAL
\060\202\005\054\060\202\004\024\240\003\002\001\002\002\004\071
@@ -5207,7 +5221,7 @@ CKA_ISSUER MULTILINE_OCTAL
\123\124\145\144\040\122\157\157\164\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\071\117\175\207
+\002\004\071\117\175\207
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5242,7 +5256,7 @@ CKA_ISSUER MULTILINE_OCTAL
\103\101\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\030\060\202\003\000\240\003\002\001\002\002\001\001
@@ -5336,7 +5350,7 @@ CKA_ISSUER MULTILINE_OCTAL
\103\101\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5373,7 +5387,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\066\060\202\003\036\240\003\002\001\002\002\001\001
@@ -5470,7 +5484,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5505,7 +5519,7 @@ CKA_ISSUER MULTILINE_OCTAL
\101\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\025\060\202\002\375\240\003\002\001\002\002\001\001
@@ -5600,7 +5614,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5635,7 +5649,7 @@ CKA_ISSUER MULTILINE_OCTAL
\144\040\103\101\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\036\060\202\003\006\240\003\002\001\002\002\001\001
@@ -5730,7 +5744,7 @@ CKA_ISSUER MULTILINE_OCTAL
\144\040\103\101\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5769,7 +5783,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040
+\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177
+\047\040
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\053
@@ -5856,7 +5871,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040
+\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177
+\047\040
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5895,7 +5911,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247
+\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171
+\212\247
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\011
@@ -5982,7 +5999,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247
+\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171
+\212\247
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6021,7 +6039,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204
+\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154
+\301\204
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\242\060\202\003\013\240\003\002\001\002\002\020\056
@@ -6108,7 +6127,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204
+\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154
+\301\204
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6147,8 +6167,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117
-\336
+\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127
+\341\117\336
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\237\060\202\003\014\240\003\002\001\002\002\021\000
@@ -6235,8 +6255,8 @@ CKA_ISSUER MULTILINE_OCTAL
\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117
-\336
+\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127
+\341\117\336
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6281,7 +6301,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\123\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011
+\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364
+\007\011
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\315\060\202\003\066\240\003\002\001\002\002\020\123
@@ -6377,7 +6398,8 @@ CKA_ISSUER MULTILINE_OCTAL
\167\157\162\153
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\123\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011
+\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364
+\007\011
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6416,7 +6438,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\155\145\163\164\141\155\160\151\156\147\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000
@@ -6489,7 +6511,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\155\145\163\164\141\155\160\151\156\147\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6534,7 +6556,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\157\156\040\101\165\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\233\021\074
+\002\004\070\233\021\074
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070
@@ -6641,7 +6663,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\157\156\040\101\165\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\233\021\074
+\002\004\070\233\021\074
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6686,7 +6708,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\236\366\344
+\002\004\070\236\366\344
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070
@@ -6792,7 +6814,7 @@ CKA_ISSUER MULTILINE_OCTAL
\164\150\157\162\151\164\171
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\236\366\344
+\002\004\070\236\366\344
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6831,7 +6853,7 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001
@@ -6924,7 +6946,7 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6963,7 +6985,7 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001
@@ -7088,7 +7110,7 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7123,7 +7145,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\156\164\141\164\151\157\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\075\106
+\002\004\074\265\075\106
END
CKA_VALUE MULTILINE_OCTAL
\060\202\005\152\060\202\004\122\240\003\002\001\002\002\004\074
@@ -7238,7 +7260,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\156\164\141\164\151\157\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\075\106
+\002\004\074\265\075\106
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7273,7 +7295,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\156\164\141\164\151\157\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\117\100
+\002\004\074\265\117\100
END
CKA_VALUE MULTILINE_OCTAL
\060\202\006\121\060\202\005\071\240\003\002\001\002\002\004\074
@@ -7403,7 +7425,7 @@ CKA_ISSUER MULTILINE_OCTAL
\145\156\164\141\164\151\157\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\117\100
+\002\004\074\265\117\100
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7438,7 +7460,8 @@ CKA_ISSUER MULTILINE_OCTAL
\164\151\157\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\073\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032
+\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264
+\252\032
END
CKA_VALUE MULTILINE_OCTAL
\060\202\005\150\060\202\004\120\240\003\002\001\002\002\020\073
@@ -7553,7 +7576,8 @@ CKA_ISSUER MULTILINE_OCTAL
\164\151\157\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\073\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032
+\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264
+\252\032
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7582,7 +7606,8 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\062\060\064\070\040\126\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002
+\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000
+\000\002
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012
@@ -7662,7 +7687,8 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\062\060\064\070\040\126\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002
+\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
@@ -7691,7 +7717,8 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\061\060\062\064\040\126\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002
+\002\020\012\001\001\001\000\000\002\174\000\000\000\013\000\000
+\000\002
END
CKA_VALUE MULTILINE_OCTAL
\060\202\002\134\060\202\001\305\240\003\002\001\002\002\020\012
@@ -7754,7 +7781,8 @@ CKA_ISSUER MULTILINE_OCTAL
\162\151\164\171\040\061\060\062\064\040\126\063
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002
+\002\020\012\001\001\001\000\000\002\174\000\000\000\013\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
@@ -7785,7 +7813,7 @@ CKA_ISSUER MULTILINE_OCTAL
\154\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\064\126
+\002\003\002\064\126
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\124\060\202\002\074\240\003\002\001\002\002\003\002
@@ -7865,7 +7893,7 @@ CKA_ISSUER MULTILINE_OCTAL
\154\040\103\101
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\064\126
+\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
@@ -7908,7 +7936,8 @@ CKA_ISSUER MULTILINE_OCTAL
\141\164\151\157\156\163
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\104\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167
+\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300
+\063\167
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\144\060\202\003\114\240\003\002\001\002\002\020\104
@@ -8011,7 +8040,8 @@ CKA_ISSUER MULTILINE_OCTAL
\141\164\151\157\156\163
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\104\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167
+\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_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8046,7 +8076,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\164\171\040\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\244\060\202\002\214\240\003\002\001\002\002\001\001
@@ -8133,7 +8163,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\164\171\040\061
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8168,7 +8198,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\164\171\040\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\005\244\060\202\003\214\240\003\002\001\002\002\001\001
@@ -8287,7 +8317,7 @@ CKA_ISSUER MULTILINE_OCTAL
\151\164\171\040\062
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8322,7 +8352,8 @@ CKA_ISSUER MULTILINE_OCTAL
\103\157\155\155\145\162\143\145\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142
+\002\020\023\206\065\115\035\077\006\362\301\371\145\005\325\220
+\034\142
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\242\060\202\002\212\240\003\002\001\002\002\020\023
@@ -8409,7 +8440,8 @@ CKA_ISSUER MULTILINE_OCTAL
\103\157\155\155\145\162\143\145\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142
+\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
@@ -8454,7 +8486,7 @@ CKA_ISSUER MULTILINE_OCTAL
\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\352
+\002\002\003\352
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003
@@ -8541,7 +8573,7 @@ CKA_ISSUER MULTILINE_OCTAL
\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\352
+\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
@@ -8586,7 +8618,7 @@ CKA_ISSUER MULTILINE_OCTAL
\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\353
+\002\002\003\353
END
CKA_VALUE MULTILINE_OCTAL
\060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003
@@ -8673,7 +8705,7 @@ CKA_ISSUER MULTILINE_OCTAL
\100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\353
+\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