diff options
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.c | 117 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/certdata.txt | 113 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/nssckbi.h | 4 | ||||
-rw-r--r-- | security/nss/lib/nss/nss.h | 2 | ||||
-rw-r--r-- | security/nss/lib/pkcs7/certread.c | 6 |
5 files changed, 233 insertions, 9 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c index 727da1cbf..2df89f47f 100644 --- a/security/nss/lib/ckfw/builtins/certdata.c +++ b/security/nss/lib/ckfw/builtins/certdata.c @@ -803,6 +803,12 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_248 [] = { static const CK_ATTRIBUTE_TYPE nss_builtins_types_249 [] = { 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_250 [] = { + 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_251 [] = { + 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) }, @@ -16868,6 +16874,109 @@ static const NSSItem nss_builtins_items_249 [] = { { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } }; +static const NSSItem nss_builtins_items_250 [] = { + { (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 *)"COMODO ECC Certification Authority", (PRUint32)35 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102" +"\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164" +"\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060" +"\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061" +"\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117" +"\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006" +"\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103" +"\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)136 }, + { (void *)"0", (PRUint32)2 }, + { (void *)"\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102" +"\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164" +"\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060" +"\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061" +"\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117" +"\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006" +"\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103" +"\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)136 }, + { (void *)"\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143" +"\231\052" +, (PRUint32)18 }, + { (void *)"\060\202\002\211\060\202\002\017\240\003\002\001\002\002\020\037" +"\107\257\252\142\000\160\120\124\114\001\236\233\143\231\052\060" +"\012\006\010\052\206\110\316\075\004\003\003\060\201\205\061\013" +"\060\011\006\003\125\004\006\023\002\107\102\061\033\060\031\006" +"\003\125\004\010\023\022\107\162\145\141\164\145\162\040\115\141" +"\156\143\150\145\163\164\145\162\061\020\060\016\006\003\125\004" +"\007\023\007\123\141\154\146\157\162\144\061\032\060\030\006\003" +"\125\004\012\023\021\103\117\115\117\104\117\040\103\101\040\114" +"\151\155\151\164\145\144\061\053\060\051\006\003\125\004\003\023" +"\042\103\117\115\117\104\117\040\105\103\103\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\036\027\015\060\070\060\063\060\066\060\060\060" +"\060\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071" +"\065\071\132\060\201\205\061\013\060\011\006\003\125\004\006\023" +"\002\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162" +"\145\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162" +"\061\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157" +"\162\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115" +"\117\104\117\040\103\101\040\114\151\155\151\164\145\144\061\053" +"\060\051\006\003\125\004\003\023\042\103\117\115\117\104\117\040" +"\105\103\103\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\166\060\020\006" +"\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003" +"\142\000\004\003\107\173\057\165\311\202\025\205\373\165\344\221" +"\026\324\253\142\231\365\076\122\013\006\316\101\000\177\227\341" +"\012\044\074\035\001\004\356\075\322\215\011\227\014\340\165\344" +"\372\373\167\212\052\365\003\140\113\066\213\026\043\026\255\011" +"\161\364\112\364\050\120\264\376\210\034\156\077\154\057\057\011" +"\131\133\245\133\013\063\231\342\303\075\211\371\152\054\357\262" +"\323\006\351\243\102\060\100\060\035\006\003\125\035\016\004\026" +"\004\024\165\161\247\031\110\031\274\235\235\352\101\107\337\224" +"\304\110\167\231\323\171\060\016\006\003\125\035\017\001\001\377" +"\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377" +"\004\005\060\003\001\001\377\060\012\006\010\052\206\110\316\075" +"\004\003\003\003\150\000\060\145\002\061\000\357\003\133\172\254" +"\267\170\012\162\267\210\337\377\265\106\024\011\012\372\240\346" +"\175\010\306\032\207\275\030\250\163\275\046\312\140\014\235\316" +"\231\237\317\134\017\060\341\276\024\061\352\002\060\024\364\223" +"\074\111\247\063\172\220\106\107\263\143\175\023\233\116\267\157" +"\030\067\200\123\376\335\040\340\065\232\066\321\307\001\271\346" +"\334\335\363\377\035\054\072\026\127\331\222\071\326" +, (PRUint32)653 } +}; +static const NSSItem nss_builtins_items_251 [] = { + { (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 *)"COMODO ECC Certification Authority", (PRUint32)35 }, + { (void *)"\237\164\116\237\053\115\272\354\017\061\054\120\266\126\073\216" +"\055\223\303\021" +, (PRUint32)20 }, + { (void *)"\174\142\377\164\235\061\123\136\150\112\325\170\252\036\277\043" +, (PRUint32)16 }, + { (void *)"\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102" +"\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164" +"\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060" +"\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061" +"\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117" +"\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006" +"\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103" +"\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)136 }, + { (void *)"\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143" +"\231\052" +, (PRUint32)18 }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +}; builtinsInternalObject nss_builtins_data[] = { @@ -17122,11 +17231,13 @@ nss_builtins_data[] = { { 11, nss_builtins_types_246, nss_builtins_items_246, {NULL} }, { 13, nss_builtins_types_247, nss_builtins_items_247, {NULL} }, { 11, nss_builtins_types_248, nss_builtins_items_248, {NULL} }, - { 13, nss_builtins_types_249, nss_builtins_items_249, {NULL} } + { 13, nss_builtins_types_249, nss_builtins_items_249, {NULL} }, + { 11, nss_builtins_types_250, nss_builtins_items_250, {NULL} }, + { 13, nss_builtins_types_251, nss_builtins_items_251, {NULL} } }; const PRUint32 #ifdef DEBUG - nss_builtins_nObjects = 249+1; + nss_builtins_nObjects = 251+1; #else - nss_builtins_nObjects = 249; + nss_builtins_nObjects = 251; #endif /* DEBUG */ diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt index ac9dbafec..ad1c7e322 100644 --- a/security/nss/lib/ckfw/builtins/certdata.txt +++ b/security/nss/lib/ckfw/builtins/certdata.txt @@ -17388,3 +17388,116 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "COMODO ECC Certification Authority" +# +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 "COMODO ECC Certification Authority" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 +\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 +\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +\165\164\150\157\162\151\164\171 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 +\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 +\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +\165\164\150\157\162\151\164\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143 +\231\052 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\211\060\202\002\017\240\003\002\001\002\002\020\037 +\107\257\252\142\000\160\120\124\114\001\236\233\143\231\052\060 +\012\006\010\052\206\110\316\075\004\003\003\060\201\205\061\013 +\060\011\006\003\125\004\006\023\002\107\102\061\033\060\031\006 +\003\125\004\010\023\022\107\162\145\141\164\145\162\040\115\141 +\156\143\150\145\163\164\145\162\061\020\060\016\006\003\125\004 +\007\023\007\123\141\154\146\157\162\144\061\032\060\030\006\003 +\125\004\012\023\021\103\117\115\117\104\117\040\103\101\040\114 +\151\155\151\164\145\144\061\053\060\051\006\003\125\004\003\023 +\042\103\117\115\117\104\117\040\105\103\103\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\036\027\015\060\070\060\063\060\066\060\060\060 +\060\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071 +\065\071\132\060\201\205\061\013\060\011\006\003\125\004\006\023 +\002\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162 +\145\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162 +\061\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157 +\162\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115 +\117\104\117\040\103\101\040\114\151\155\151\164\145\144\061\053 +\060\051\006\003\125\004\003\023\042\103\117\115\117\104\117\040 +\105\103\103\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\166\060\020\006 +\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003 +\142\000\004\003\107\173\057\165\311\202\025\205\373\165\344\221 +\026\324\253\142\231\365\076\122\013\006\316\101\000\177\227\341 +\012\044\074\035\001\004\356\075\322\215\011\227\014\340\165\344 +\372\373\167\212\052\365\003\140\113\066\213\026\043\026\255\011 +\161\364\112\364\050\120\264\376\210\034\156\077\154\057\057\011 +\131\133\245\133\013\063\231\342\303\075\211\371\152\054\357\262 +\323\006\351\243\102\060\100\060\035\006\003\125\035\016\004\026 +\004\024\165\161\247\031\110\031\274\235\235\352\101\107\337\224 +\304\110\167\231\323\171\060\016\006\003\125\035\017\001\001\377 +\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377 +\004\005\060\003\001\001\377\060\012\006\010\052\206\110\316\075 +\004\003\003\003\150\000\060\145\002\061\000\357\003\133\172\254 +\267\170\012\162\267\210\337\377\265\106\024\011\012\372\240\346 +\175\010\306\032\207\275\030\250\163\275\046\312\140\014\235\316 +\231\237\317\134\017\060\341\276\024\061\352\002\060\024\364\223 +\074\111\247\063\172\220\106\107\263\143\175\023\233\116\267\157 +\030\067\200\123\376\335\040\340\065\232\066\321\307\001\271\346 +\334\335\363\377\035\054\072\026\127\331\222\071\326 +END + +# Trust for Certificate "COMODO ECC Certification Authority" +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 "COMODO ECC Certification Authority" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\237\164\116\237\053\115\272\354\017\061\054\120\266\126\073\216 +\055\223\303\021 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\174\142\377\164\235\061\123\136\150\112\325\170\252\036\277\043 +END +CKA_ISSUER MULTILINE_OCTAL +\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102 +\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164 +\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060 +\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061 +\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117 +\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006 +\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103 +\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101 +\165\164\150\157\162\151\164\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143 +\231\052 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_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 2538bb087..d564ec303 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 71 -#define NSS_BUILTINS_LIBRARY_VERSION "1.71" +#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 72 +#define NSS_BUILTINS_LIBRARY_VERSION "1.72" /* These version numbers detail the semantic changes to the ckfw engine. */ #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 5273af44e..5e78a7d30 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -70,7 +70,7 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]" */ -#define NSS_VERSION "3.12.1.0" _NSS_ECC_STRING _NSS_CUSTOMIZED +#define NSS_VERSION "3.12.1.1" _NSS_ECC_STRING _NSS_CUSTOMIZED #define NSS_VMAJOR 3 #define NSS_VMINOR 12 #define NSS_VPATCH 1 diff --git a/security/nss/lib/pkcs7/certread.c b/security/nss/lib/pkcs7/certread.c index 7b229d29e..4e7bd21b7 100644 --- a/security/nss/lib/pkcs7/certread.c +++ b/security/nss/lib/pkcs7/certread.c @@ -332,8 +332,8 @@ notder: while ( cl > NS_CERT_HEADER_LEN ) { if ( !PORT_Strncasecmp((char *)cp, NS_CERT_HEADER, NS_CERT_HEADER_LEN) ) { - cl -= NS_CERT_HEADER_LEN; - cp += NS_CERT_HEADER_LEN; + cl -= NS_CERT_HEADER_LEN + 1; /* skip char after header */ + cp += NS_CERT_HEADER_LEN + 1; /* as all prior versions did. */ certbegin = cp; break; } @@ -353,7 +353,7 @@ notder: if ( certbegin ) { /* find the ending marker */ - while ( cl > NS_CERT_TRAILER_LEN ) { + while ( cl >= NS_CERT_TRAILER_LEN ) { if ( !PORT_Strncasecmp((char *)cp, NS_CERT_TRAILER, NS_CERT_TRAILER_LEN) ) { certend = (unsigned char *)cp; |