From a07f869b7a1a16a4e341e173b2b5bafb68e4b5d0 Mon Sep 17 00:00:00 2001 From: "wtchang%redhat.com" Date: Wed, 31 May 2006 17:18:54 +0000 Subject: [PATCH] Bugzilla Bug 338552: added StartCom CA certificate to NSS. The patch is contributed by Eddy Nigg, StartCom Ltd. . r=wtc. a=hecker. Modified Files: certdata.c certdata.txt nssckbi.h --- security/nss/lib/ckfw/builtins/certdata.c | 169 +++++++++++++++++++- security/nss/lib/ckfw/builtins/certdata.txt | 163 ++++++++++++++++++- security/nss/lib/ckfw/builtins/nssckbi.h | 4 +- 3 files changed, 328 insertions(+), 8 deletions(-) diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index 5b1d946cedfc..75ce7ec526a1 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $"; +static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.37 $ $Date: 2006/05/31 17:18:54 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.37 $ $Date: 2006/05/31 17:18:54 $"; #endif /* DEBUG */ #ifndef BUILTINS_H @@ -623,6 +623,12 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_188 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_189 [] = { CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED }; +static const CK_ATTRIBUTE_TYPE nss_builtins_types_190 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +}; +static const CK_ATTRIBUTE_TYPE nss_builtins_types_191 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +}; #ifdef DEBUG static const NSSItem nss_builtins_items_0 [] = { { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, @@ -631,7 +637,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: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.36 $ $Date: 2005/04/18 16:08:10 $", (PRUint32)160 } + { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.37 $ $Date: 2006/05/31 17:18:54 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.37 $ $Date: 2006/05/31 17:18:54 $", (PRUint32)160 } }; #endif /* DEBUG */ static const NSSItem nss_builtins_items_1 [] = { @@ -12668,6 +12674,157 @@ static const NSSItem nss_builtins_items_189 [] = { { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; +static const NSSItem nss_builtins_items_190 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"StartCom Ltd.", (PRUint32)14 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\201\260\061\013\060\011\006\003\125\004\006\023\002\111\114" +"\061\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145" +"\154\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141" +"\164\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162" +"\164\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125" +"\004\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171" +"\040\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040" +"\106\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151" +"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +"\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026" +"\022\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056" +"\157\162\147" +, (PRUint32)179 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\201\260\061\013\060\011\006\003\125\004\006\023\002\111\114" +"\061\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145" +"\154\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141" +"\164\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162" +"\164\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125" +"\004\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171" +"\040\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040" +"\106\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151" +"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +"\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026" +"\022\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056" +"\157\162\147" +, (PRUint32)179 }, + { (void *)"\002\001\000" +, (PRUint32)3 }, + { (void *)"\060\202\005\026\060\202\004\177\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\260\061\013\060\011\006\003\125\004\006\023\002\111\114\061" +"\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145\154" +"\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141\164" +"\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162\164" +"\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125\004" +"\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171\040" +"\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040\106" +"\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151\143" +"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061" +"\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022" +"\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056\157" +"\162\147\060\036\027\015\060\065\060\063\061\067\061\067\063\067" +"\064\070\132\027\015\063\065\060\063\061\060\061\067\063\067\064" +"\070\132\060\201\260\061\013\060\011\006\003\125\004\006\023\002" +"\111\114\061\017\060\015\006\003\125\004\010\023\006\111\163\162" +"\141\145\154\061\016\060\014\006\003\125\004\007\023\005\105\151" +"\154\141\164\061\026\060\024\006\003\125\004\012\023\015\123\164" +"\141\162\164\103\157\155\040\114\164\144\056\061\032\060\030\006" +"\003\125\004\013\023\021\103\101\040\101\165\164\150\157\162\151" +"\164\171\040\104\145\160\056\061\051\060\047\006\003\125\004\003" +"\023\040\106\162\145\145\040\123\123\114\040\103\145\162\164\151" +"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151" +"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" +"\001\026\022\141\144\155\151\156\100\163\164\141\162\164\143\157" +"\155\056\157\162\147\060\201\237\060\015\006\011\052\206\110\206" +"\367\015\001\001\001\005\000\003\201\215\000\060\201\211\002\201" +"\201\000\355\204\140\000\043\236\310\112\121\051\047\336\072\241" +"\071\265\151\253\011\262\057\064\375\141\334\075\323\260\317\261" +"\327\302\304\302\261\344\226\126\304\276\252\024\016\347\314\072" +"\120\310\072\142\235\303\243\254\131\173\216\356\125\032\034\107" +"\276\243\227\071\263\265\357\043\054\010\350\330\257\163\057\271" +"\311\203\350\355\000\017\310\165\245\057\064\114\030\350\166\210" +"\043\111\212\333\266\355\150\332\303\265\142\051\114\245\113\267" +"\230\264\011\024\020\240\370\376\142\166\042\025\013\244\326\010" +"\057\065\002\003\001\000\001\243\202\002\074\060\202\002\070\060" +"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377" +"\060\013\006\003\125\035\017\004\004\003\002\001\346\060\035\006" +"\003\125\035\016\004\026\004\024\034\211\303\226\314\275\376\062" +"\325\015\214\201\061\266\230\235\215\050\144\215\060\201\335\006" +"\003\125\035\043\004\201\325\060\201\322\200\024\034\211\303\226" +"\314\275\376\062\325\015\214\201\061\266\230\235\215\050\144\215" +"\241\201\266\244\201\263\060\201\260\061\013\060\011\006\003\125" +"\004\006\023\002\111\114\061\017\060\015\006\003\125\004\010\023" +"\006\111\163\162\141\145\154\061\016\060\014\006\003\125\004\007" +"\023\005\105\151\154\141\164\061\026\060\024\006\003\125\004\012" +"\023\015\123\164\141\162\164\103\157\155\040\114\164\144\056\061" +"\032\060\030\006\003\125\004\013\023\021\103\101\040\101\165\164" +"\150\157\162\151\164\171\040\104\145\160\056\061\051\060\047\006" +"\003\125\004\003\023\040\106\162\145\145\040\123\123\114\040\103" +"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164" +"\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110\206" +"\367\015\001\011\001\026\022\141\144\155\151\156\100\163\164\141" +"\162\164\143\157\155\056\157\162\147\202\001\000\060\035\006\003" +"\125\035\021\004\026\060\024\201\022\141\144\155\151\156\100\163" +"\164\141\162\164\143\157\155\056\157\162\147\060\035\006\003\125" +"\035\022\004\026\060\024\201\022\141\144\155\151\156\100\163\164" +"\141\162\164\143\157\155\056\157\162\147\060\021\006\011\140\206" +"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\057\006" +"\011\140\206\110\001\206\370\102\001\015\004\042\026\040\106\162" +"\145\145\040\123\123\114\040\103\145\162\164\151\146\151\143\141" +"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\062" +"\006\011\140\206\110\001\206\370\102\001\004\004\045\026\043\150" +"\164\164\160\072\057\057\143\145\162\164\056\163\164\141\162\164" +"\143\157\155\056\157\162\147\057\143\141\055\143\162\154\056\143" +"\162\154\060\050\006\011\140\206\110\001\206\370\102\001\002\004" +"\033\026\031\150\164\164\160\072\057\057\143\145\162\164\056\163" +"\164\141\162\164\143\157\155\056\157\162\147\057\060\071\006\011" +"\140\206\110\001\206\370\102\001\010\004\054\026\052\150\164\164" +"\160\072\057\057\143\145\162\164\056\163\164\141\162\164\143\157" +"\155\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077" +"\141\160\160\075\061\061\061\060\015\006\011\052\206\110\206\367" +"\015\001\001\004\005\000\003\201\201\000\154\161\045\341\236\064" +"\221\041\357\333\154\275\001\010\126\217\210\330\101\072\123\365" +"\162\337\047\127\113\166\204\367\150\244\376\353\077\011\176\050" +"\270\127\352\037\301\252\342\377\226\237\111\231\346\262\225\163" +"\226\306\110\307\136\215\007\162\126\370\203\217\237\167\257\051" +"\323\105\016\244\356\260\066\164\055\360\315\230\043\173\067\113" +"\332\376\121\230\304\036\064\074\210\375\231\073\120\247\301\213" +"\063\307\302\122\026\022\225\123\145\042\357\272\213\316\142\333" +"\160\043\261\200\337\032\040\070\347\176" +, (PRUint32)1306 } +}; +static const NSSItem nss_builtins_items_191 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"StartCom Ltd.", (PRUint32)14 }, + { (void *)"\225\346\255\370\327\161\106\002\115\325\152\041\262\347\077\315" +"\362\073\065\377" +, (PRUint32)20 }, + { (void *)"\010\174\130\037\122\053\104\264\073\171\315\001\370\305\303\311" +, (PRUint32)16 }, + { (void *)"\060\201\260\061\013\060\011\006\003\125\004\006\023\002\111\114" +"\061\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145" +"\154\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141" +"\164\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162" +"\164\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125" +"\004\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171" +"\040\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040" +"\106\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151" +"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" +"\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026" +"\022\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056" +"\157\162\147" +, (PRUint32)179 }, + { (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_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +}; PR_IMPLEMENT_DATA(builtinsInternalObject) nss_builtins_data[] = { @@ -12862,11 +13019,13 @@ nss_builtins_data[] = { { 11, nss_builtins_types_186, nss_builtins_items_186, {NULL} }, { 13, nss_builtins_types_187, nss_builtins_items_187, {NULL} }, { 11, nss_builtins_types_188, nss_builtins_items_188, {NULL} }, - { 13, nss_builtins_types_189, nss_builtins_items_189, {NULL} } + { 13, nss_builtins_types_189, nss_builtins_items_189, {NULL} }, + { 11, nss_builtins_types_190, nss_builtins_items_190, {NULL} }, + { 13, nss_builtins_types_191, nss_builtins_items_191, {NULL} } }; PR_IMPLEMENT_DATA(const PRUint32) #ifdef DEBUG - nss_builtins_nObjects = 189+1; + nss_builtins_nObjects = 191+1; #else - nss_builtins_nObjects = 189; + nss_builtins_nObjects = 191; #endif /* DEBUG */ diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index 07dbb10f2e5b..d81bf351ba89 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -34,7 +34,7 @@ # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.37 $ $Date: 2005/04/18 16:08:07 $" +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.38 $ $Date: 2006/05/31 17:18:54 $" # # certdata.txt @@ -13068,3 +13068,164 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "StartCom Ltd." +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "StartCom Ltd." +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\201\260\061\013\060\011\006\003\125\004\006\023\002\111\114 +\061\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145 +\154\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141 +\164\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162 +\164\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125 +\004\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171 +\040\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040 +\106\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151 +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 +\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026 +\022\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056 +\157\162\147 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\201\260\061\013\060\011\006\003\125\004\006\023\002\111\114 +\061\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145 +\154\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141 +\164\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162 +\164\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125 +\004\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171 +\040\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040 +\106\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151 +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 +\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026 +\022\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056 +\157\162\147 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\001\000 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\026\060\202\004\177\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\260\061\013\060\011\006\003\125\004\006\023\002\111\114\061 +\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145\154 +\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141\164 +\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162\164 +\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125\004 +\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171\040 +\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040\106 +\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151\143 +\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061 +\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022 +\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056\157 +\162\147\060\036\027\015\060\065\060\063\061\067\061\067\063\067 +\064\070\132\027\015\063\065\060\063\061\060\061\067\063\067\064 +\070\132\060\201\260\061\013\060\011\006\003\125\004\006\023\002 +\111\114\061\017\060\015\006\003\125\004\010\023\006\111\163\162 +\141\145\154\061\016\060\014\006\003\125\004\007\023\005\105\151 +\154\141\164\061\026\060\024\006\003\125\004\012\023\015\123\164 +\141\162\164\103\157\155\040\114\164\144\056\061\032\060\030\006 +\003\125\004\013\023\021\103\101\040\101\165\164\150\157\162\151 +\164\171\040\104\145\160\056\061\051\060\047\006\003\125\004\003 +\023\040\106\162\145\145\040\123\123\114\040\103\145\162\164\151 +\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151 +\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 +\001\026\022\141\144\155\151\156\100\163\164\141\162\164\143\157 +\155\056\157\162\147\060\201\237\060\015\006\011\052\206\110\206 +\367\015\001\001\001\005\000\003\201\215\000\060\201\211\002\201 +\201\000\355\204\140\000\043\236\310\112\121\051\047\336\072\241 +\071\265\151\253\011\262\057\064\375\141\334\075\323\260\317\261 +\327\302\304\302\261\344\226\126\304\276\252\024\016\347\314\072 +\120\310\072\142\235\303\243\254\131\173\216\356\125\032\034\107 +\276\243\227\071\263\265\357\043\054\010\350\330\257\163\057\271 +\311\203\350\355\000\017\310\165\245\057\064\114\030\350\166\210 +\043\111\212\333\266\355\150\332\303\265\142\051\114\245\113\267 +\230\264\011\024\020\240\370\376\142\166\042\025\013\244\326\010 +\057\065\002\003\001\000\001\243\202\002\074\060\202\002\070\060 +\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +\060\013\006\003\125\035\017\004\004\003\002\001\346\060\035\006 +\003\125\035\016\004\026\004\024\034\211\303\226\314\275\376\062 +\325\015\214\201\061\266\230\235\215\050\144\215\060\201\335\006 +\003\125\035\043\004\201\325\060\201\322\200\024\034\211\303\226 +\314\275\376\062\325\015\214\201\061\266\230\235\215\050\144\215 +\241\201\266\244\201\263\060\201\260\061\013\060\011\006\003\125 +\004\006\023\002\111\114\061\017\060\015\006\003\125\004\010\023 +\006\111\163\162\141\145\154\061\016\060\014\006\003\125\004\007 +\023\005\105\151\154\141\164\061\026\060\024\006\003\125\004\012 +\023\015\123\164\141\162\164\103\157\155\040\114\164\144\056\061 +\032\060\030\006\003\125\004\013\023\021\103\101\040\101\165\164 +\150\157\162\151\164\171\040\104\145\160\056\061\051\060\047\006 +\003\125\004\003\023\040\106\162\145\145\040\123\123\114\040\103 +\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164 +\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110\206 +\367\015\001\011\001\026\022\141\144\155\151\156\100\163\164\141 +\162\164\143\157\155\056\157\162\147\202\001\000\060\035\006\003 +\125\035\021\004\026\060\024\201\022\141\144\155\151\156\100\163 +\164\141\162\164\143\157\155\056\157\162\147\060\035\006\003\125 +\035\022\004\026\060\024\201\022\141\144\155\151\156\100\163\164 +\141\162\164\143\157\155\056\157\162\147\060\021\006\011\140\206 +\110\001\206\370\102\001\001\004\004\003\002\000\007\060\057\006 +\011\140\206\110\001\206\370\102\001\015\004\042\026\040\106\162 +\145\145\040\123\123\114\040\103\145\162\164\151\146\151\143\141 +\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\062 +\006\011\140\206\110\001\206\370\102\001\004\004\045\026\043\150 +\164\164\160\072\057\057\143\145\162\164\056\163\164\141\162\164 +\143\157\155\056\157\162\147\057\143\141\055\143\162\154\056\143 +\162\154\060\050\006\011\140\206\110\001\206\370\102\001\002\004 +\033\026\031\150\164\164\160\072\057\057\143\145\162\164\056\163 +\164\141\162\164\143\157\155\056\157\162\147\057\060\071\006\011 +\140\206\110\001\206\370\102\001\010\004\054\026\052\150\164\164 +\160\072\057\057\143\145\162\164\056\163\164\141\162\164\143\157 +\155\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 +\141\160\160\075\061\061\061\060\015\006\011\052\206\110\206\367 +\015\001\001\004\005\000\003\201\201\000\154\161\045\341\236\064 +\221\041\357\333\154\275\001\010\126\217\210\330\101\072\123\365 +\162\337\047\127\113\166\204\367\150\244\376\353\077\011\176\050 +\270\127\352\037\301\252\342\377\226\237\111\231\346\262\225\163 +\226\306\110\307\136\215\007\162\126\370\203\217\237\167\257\051 +\323\105\016\244\356\260\066\164\055\360\315\230\043\173\067\113 +\332\376\121\230\304\036\064\074\210\375\231\073\120\247\301\213 +\063\307\302\122\026\022\225\123\145\042\357\272\213\316\142\333 +\160\043\261\200\337\032\040\070\347\176 +END + +# Trust for Certificate "StartCom Ltd." +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "StartCom Ltd." +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\225\346\255\370\327\161\106\002\115\325\152\041\262\347\077\315 +\362\073\065\377 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\010\174\130\037\122\053\104\264\073\171\315\001\370\305\303\311 +END +CKA_ISSUER MULTILINE_OCTAL +\060\201\260\061\013\060\011\006\003\125\004\006\023\002\111\114 +\061\017\060\015\006\003\125\004\010\023\006\111\163\162\141\145 +\154\061\016\060\014\006\003\125\004\007\023\005\105\151\154\141 +\164\061\026\060\024\006\003\125\004\012\023\015\123\164\141\162 +\164\103\157\155\040\114\164\144\056\061\032\060\030\006\003\125 +\004\013\023\021\103\101\040\101\165\164\150\157\162\151\164\171 +\040\104\145\160\056\061\051\060\047\006\003\125\004\003\023\040 +\106\162\145\145\040\123\123\114\040\103\145\162\164\151\146\151 +\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 +\061\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026 +\022\141\144\155\151\156\100\163\164\141\162\164\143\157\155\056 +\157\162\147 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\001\000 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h index b0378eea99e4..2133bb3c03d0 100644 --- a/security/nss/lib/ckfw/builtins/nssckbi.h +++ b/security/nss/lib/ckfw/builtins/nssckbi.h @@ -75,8 +75,8 @@ * of the comment in the CK_VERSION type definition. */ #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 -#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 60 -#define NSS_BUILTINS_LIBRARY_VERSION "1.60" +#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 70 +#define NSS_BUILTINS_LIBRARY_VERSION "1.70" /* These version numbers detail the semantic changes to the ckfw engine. */ #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1