fixup commit for tag 'NSS_3_12_4_RTM' NSS_3_12_4_RTM
authorcvs2hg
Thu, 13 Aug 2009 23:40:30 +0000
changeset 9369 8f536087ab4dc16fe776dd9e497c3411f60bb7eb
parent 9366 27e03dc08630164563e1692a5e0c0f2d7304d5d7
child 9370 93041d2debb1d057b497760ae20ff8dd3604e7f3
push idunknown
push userunknown
push dateunknown
fixup commit for tag 'NSS_3_12_4_RTM'
security/nss/lib/ckfw/builtins/certdata.c
security/nss/lib/ckfw/builtins/certdata.txt
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -17976,17 +17976,17 @@ static const NSSItem nss_builtins_items_
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
 static const NSSItem nss_builtins_items_266 [] = {
   { (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 *)"AC Ra+íz Certic+Ýmara S.A.", (PRUint32)27 },
+  { (void *)"AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.", (PRUint32)39 },
   { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
   { (void *)"\060\173\061\013\060\011\006\003\125\004\006\023\002\103\117\061"
 "\107\060\105\006\003\125\004\012\014\076\123\157\143\151\145\144"
 "\141\144\040\103\141\155\145\162\141\154\040\144\145\040\103\145"
 "\162\164\151\146\151\143\141\143\151\303\263\156\040\104\151\147"
 "\151\164\141\154\040\055\040\103\145\162\164\151\143\303\241\155"
 "\141\162\141\040\123\056\101\056\061\043\060\041\006\003\125\004"
 "\003\014\032\101\103\040\122\141\303\255\172\040\103\145\162\164"
@@ -18110,17 +18110,17 @@ static const NSSItem nss_builtins_items_
 "\005\211\374\170\326\134\054\046\103\251"
 , (PRUint32)1642 }
 };
 static const NSSItem nss_builtins_items_267 [] = {
   { (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 *)"AC Ra+íz Certic+Ýmara S.A.", (PRUint32)27 },
+  { (void *)"AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.", (PRUint32)39 },
   { (void *)"\313\241\305\370\260\343\136\270\271\105\022\323\371\064\242\351"
 "\006\020\323\066"
 , (PRUint32)20 },
   { (void *)"\223\052\076\366\375\043\151\015\161\040\324\053\107\231\053\246"
 , (PRUint32)16 },
   { (void *)"\060\173\061\013\060\011\006\003\125\004\006\023\002\103\117\061"
 "\107\060\105\006\003\125\004\012\014\076\123\157\143\151\145\144"
 "\141\144\040\103\141\155\145\162\141\154\040\144\145\040\103\145"
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -18476,23 +18476,23 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
 \002\011\000\376\334\343\001\017\311\110\377
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "AC Ra+íz Certic+Ýmara S.A."
-#
-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 "AC Ra+íz Certic+Ýmara S.A."
+# Certificate "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
+#
+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 "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
 \060\173\061\013\060\011\006\003\125\004\006\023\002\103\117\061
 \107\060\105\006\003\125\004\012\014\076\123\157\143\151\145\144
 \141\144\040\103\141\155\145\162\141\154\040\144\145\040\103\145
 \162\164\151\146\151\143\141\143\151\303\263\156\040\104\151\147
 \151\164\141\154\040\055\040\103\145\162\164\151\143\303\241\155
 \141\162\141\040\123\056\101\056\061\043\060\041\006\003\125\004
@@ -18615,22 +18615,22 @@ CKA_VALUE MULTILINE_OCTAL
 \147\100\136\154\010\121\137\064\132\214\226\150\315\327\367\211
 \302\034\323\062\000\257\122\313\323\140\133\052\072\107\176\153
 \060\063\241\142\051\177\112\271\341\055\347\024\043\016\016\030
 \107\341\171\374\025\125\320\261\374\045\161\143\165\063\034\043
 \053\257\134\331\355\107\167\140\016\073\017\036\322\300\334\144
 \005\211\374\170\326\134\054\046\103\251
 END
 
-# Trust for Certificate "AC Ra+íz Certic+Ýmara S.A."
-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 "AC Ra+íz Certic+Ýmara S.A."
+# Trust for Certificate "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
+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 "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
 \313\241\305\370\260\343\136\270\271\105\022\323\371\064\242\351
 \006\020\323\066
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
 \223\052\076\366\375\043\151\015\161\040\324\053\107\231\053\246
 END
 CKA_ISSUER MULTILINE_OCTAL