Bug 527659, Update Mozilla-central to NSS 3.12.6 RTM (RC2)
authorKai Engert <kaie@kuix.de>
Fri, 05 Mar 2010 14:44:10 +0100
changeset 38992 d9f4a1b15192bb4475e0e58485c91d8307594506
parent 38991 c3b3b30a08fad220b5a7c2f4f7def884187b6a5f
child 38993 8b392f5c0c8598a7e45f5df91bacfe6514781551
push idunknown
push userunknown
push dateunknown
bugs527659
milestone1.9.3a3pre
Bug 527659, Update Mozilla-central to NSS 3.12.6 RTM (RC2) === pushing final release, r=wtc === adding a directory with on-top-patches, r=wtc === also, update to NSPR 4.8.4 final, r=wtc
nsprpub/config/prdepend.h
nsprpub/pr/include/prinit.h
security/nss/cmd/ssltap/ssltap.c
security/nss/lib/ckfw/builtins/certdata.c
security/nss/lib/ckfw/builtins/certdata.txt
security/nss/lib/ckfw/builtins/nssckbi.h
security/nss/lib/nss/nss.h
security/nss/lib/ssl/ssl.h
security/nss/lib/ssl/ssl3con.c
security/nss/lib/ssl/ssl3ext.c
security/nss/lib/ssl/sslproto.h
security/nss/lib/ssl/sslsock.c
security/nss/lib/sysinit/config.mk
security/nss/lib/sysinit/manifest.mn
security/nss/lib/util/nssutil.h
security/nss/tests/chains/chains.sh
security/nss/tests/fips/fips.sh
security/nss/tests/memleak/ignored
security/patches/README
security/patches/bug-519550.patch
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -37,8 +37,9 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
+
--- a/nsprpub/pr/include/prinit.h
+++ b/nsprpub/pr/include/prinit.h
@@ -58,21 +58,21 @@ PR_BEGIN_EXTERN_C
 /*
 ** NSPR's version is used to determine the likelihood that the version you
 ** used to build your component is anywhere close to being compatible with
 ** what is in the underlying library.
 **
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.8.4 Beta 2"
+#define PR_VERSION  "4.8.4"
 #define PR_VMAJOR   4
 #define PR_VMINOR   8
 #define PR_VPATCH   4
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck
 **
 ** The basic signature of the function that is called to provide version
 ** checking. The result will be a boolean that indicates the likelihood
 ** that the underling library will perform as the caller expects.
 **
--- a/security/nss/cmd/ssltap/ssltap.c
+++ b/security/nss/cmd/ssltap/ssltap.c
@@ -61,17 +61,17 @@
 #include <string.h>
 #include <time.h>
 
 #include "plgetopt.h"
 #include "nss.h"
 #include "cert.h"
 #include "sslproto.h"
 
-#define VERSIONSTRING "$Revision: 1.18 $ ($Date: 2010/02/10 02:00:56 $) $Author: wtc%google.com $"
+#define VERSIONSTRING "$Revision: 1.19 $ ($Date: 2010/02/16 18:56:47 $) $Author: wtc%google.com $"
 
 
 struct _DataBufferList;
 struct _DataBuffer;
 
 typedef struct _DataBufferList {
   struct _DataBuffer *first,*last;
   int size;
@@ -421,17 +421,17 @@ const char * V2CipherString(int cs_int)
   case 0x000095:    cs_str = "TLS/RSA-PSK/AES256-CBC/SHA";	break;  
   case 0x000096:    cs_str = "TLS/RSA/SEED-CBC/SHA";		break;         
   case 0x000097:    cs_str = "TLS/DH-DSS/SEED-CBC/SHA";		break;      
   case 0x000098:    cs_str = "TLS/DH-RSA/SEED-CBC/SHA";		break;      
   case 0x000099:    cs_str = "TLS/DHE-DSS/SEED-CBC/SHA";	break;     
   case 0x00009A:    cs_str = "TLS/DHE-RSA/SEED-CBC/SHA";	break;     
   case 0x00009B:    cs_str = "TLS/DH-ANON/SEED-CBC/SHA";	break;     
 
-  case 0x0000FF:    cs_str = "TLS_RENEGO_PROTECTION_REQUEST";	break;
+  case 0x0000FF:    cs_str = "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"; break;
 
   case 0x00C001:    cs_str = "TLS/ECDH-ECDSA/NULL/SHA";         break;
   case 0x00C002:    cs_str = "TLS/ECDH-ECDSA/RC4-128/SHA";      break;
   case 0x00C003:    cs_str = "TLS/ECDH-ECDSA/3DES-EDE-CBC/SHA"; break;
   case 0x00C004:    cs_str = "TLS/ECDH-ECDSA/AES128-CBC/SHA";   break;
   case 0x00C005:    cs_str = "TLS/ECDH-ECDSA/AES256-CBC/SHA";   break;
   case 0x00C006:    cs_str = "TLS/ECDHE-ECDSA/NULL/SHA";        break;
   case 0x00C007:    cs_str = "TLS/ECDHE-ECDSA/RC4-128/SHA";     break;
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -30,17 +30,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.58 $ $Date: 2009/12/03 21:09:30 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.58 $ $Date: 2009/12/03 21:09:30 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
 #include "builtins.h"
 #endif /* BUILTINS_H */
 
 static const CK_BBOOL ck_false = CK_FALSE;
 static const CK_BBOOL ck_true = CK_TRUE;
@@ -979,25 +979,61 @@ static const CK_ATTRIBUTE_TYPE nss_built
  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_308 [] = {
  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_309 [] = {
  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_310 [] = {
+ 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_311 [] = {
+ 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_312 [] = {
+ 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_313 [] = {
+ 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_314 [] = {
+ 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_315 [] = {
+ 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_316 [] = {
+ 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_317 [] = {
+ 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_318 [] = {
+ 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_319 [] = {
+ 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_320 [] = {
+ 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_321 [] = {
+ 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) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"CVS ID", (PRUint32)7 },
   { (void *)"NSS", (PRUint32)4 },
-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.58 $ $Date: 2009/12/03 21:09:30 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.58 $ $Date: 2009/12/03 21:09:30 $", (PRUint32)160 }
+  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $", (PRUint32)160 }
 };
 #endif /* DEBUG */
 static const NSSItem nss_builtins_items_1 [] = {
   { (void *)&cko_netscape_builtin_root_list, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"Mozilla Builtin Roots", (PRUint32)22 }
@@ -20769,16 +20805,743 @@ static const NSSItem nss_builtins_items_
   { (void *)"\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207"
 "\254\263"
 , (PRUint32)18 },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
+static const NSSItem nss_builtins_items_310 [] = {
+  { (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 *)"NetLock Arany (Class Gold) Főtanúsítvány", (PRUint32)45 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125"
+"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160"
+"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145"
+"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003"
+"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303"
+"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143"
+"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145"
+"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141"
+"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303"
+"\272\163\303\255\164\166\303\241\156\171"
+, (PRUint32)170 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125"
+"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160"
+"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145"
+"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003"
+"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303"
+"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143"
+"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145"
+"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141"
+"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303"
+"\272\163\303\255\164\166\303\241\156\171"
+, (PRUint32)170 },
+  { (void *)"\002\006\111\101\054\344\000\020"
+, (PRUint32)8 },
+  { (void *)"\060\202\004\025\060\202\002\375\240\003\002\001\002\002\006\111"
+"\101\054\344\000\020\060\015\006\011\052\206\110\206\367\015\001"
+"\001\013\005\000\060\201\247\061\013\060\011\006\003\125\004\006"
+"\023\002\110\125\061\021\060\017\006\003\125\004\007\014\010\102"
+"\165\144\141\160\145\163\164\061\025\060\023\006\003\125\004\012"
+"\014\014\116\145\164\114\157\143\153\040\113\146\164\056\061\067"
+"\060\065\006\003\125\004\013\014\056\124\141\156\303\272\163\303"
+"\255\164\166\303\241\156\171\153\151\141\144\303\263\153\040\050"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145"
+"\162\166\151\143\145\163\051\061\065\060\063\006\003\125\004\003"
+"\014\054\116\145\164\114\157\143\153\040\101\162\141\156\171\040"
+"\050\103\154\141\163\163\040\107\157\154\144\051\040\106\305\221"
+"\164\141\156\303\272\163\303\255\164\166\303\241\156\171\060\036"
+"\027\015\060\070\061\062\061\061\061\065\060\070\062\061\132\027"
+"\015\062\070\061\062\060\066\061\065\060\070\062\061\132\060\201"
+"\247\061\013\060\011\006\003\125\004\006\023\002\110\125\061\021"
+"\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145\163"
+"\164\061\025\060\023\006\003\125\004\012\014\014\116\145\164\114"
+"\157\143\153\040\113\146\164\056\061\067\060\065\006\003\125\004"
+"\013\014\056\124\141\156\303\272\163\303\255\164\166\303\241\156"
+"\171\153\151\141\144\303\263\153\040\050\103\145\162\164\151\146"
+"\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163"
+"\051\061\065\060\063\006\003\125\004\003\014\054\116\145\164\114"
+"\157\143\153\040\101\162\141\156\171\040\050\103\154\141\163\163"
+"\040\107\157\154\144\051\040\106\305\221\164\141\156\303\272\163"
+"\303\255\164\166\303\241\156\171\060\202\001\042\060\015\006\011"
+"\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000"
+"\060\202\001\012\002\202\001\001\000\304\044\136\163\276\113\155"
+"\024\303\241\364\343\227\220\156\322\060\105\036\074\356\147\331"
+"\144\340\032\212\177\312\060\312\203\343\040\301\343\364\072\323"
+"\224\137\032\174\133\155\277\060\117\204\047\366\237\037\111\274"
+"\306\231\012\220\362\017\365\177\103\204\067\143\121\213\172\245"
+"\160\374\172\130\315\216\233\355\303\106\154\204\160\135\332\363"
+"\001\220\043\374\116\060\251\176\341\047\143\347\355\144\074\240"
+"\270\311\063\143\376\026\220\377\260\270\375\327\250\300\300\224"
+"\103\013\266\325\131\246\236\126\320\044\037\160\171\257\333\071"
+"\124\015\145\165\331\025\101\224\001\257\136\354\366\215\361\377"
+"\255\144\376\040\232\327\134\353\376\246\037\010\144\243\213\166"
+"\125\255\036\073\050\140\056\207\045\350\252\257\037\306\144\106"
+"\040\267\160\177\074\336\110\333\226\123\267\071\167\344\032\342"
+"\307\026\204\166\227\133\057\273\031\025\205\370\151\205\365\231"
+"\247\251\362\064\247\251\266\246\003\374\157\206\075\124\174\166"
+"\004\233\153\371\100\135\000\064\307\056\231\165\235\345\210\003"
+"\252\115\370\003\322\102\166\300\033\002\003\000\250\213\243\105"
+"\060\103\060\022\006\003\125\035\023\001\001\377\004\010\060\006"
+"\001\001\377\002\001\004\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004"
+"\024\314\372\147\223\360\266\270\320\245\300\036\363\123\375\214"
+"\123\337\203\327\226\060\015\006\011\052\206\110\206\367\015\001"
+"\001\013\005\000\003\202\001\001\000\253\177\356\034\026\251\234"
+"\074\121\000\240\300\021\010\005\247\231\346\157\001\210\124\141"
+"\156\361\271\030\255\112\255\376\201\100\043\224\057\373\165\174"
+"\057\050\113\142\044\201\202\013\365\141\361\034\156\270\141\070"
+"\353\201\372\142\241\073\132\142\323\224\145\304\341\346\155\202"
+"\370\057\045\160\262\041\046\301\162\121\037\214\054\303\204\220"
+"\303\132\217\272\317\364\247\145\245\353\230\321\373\005\262\106"
+"\165\025\043\152\157\205\143\060\200\360\325\236\037\051\034\302"
+"\154\260\120\131\135\220\133\073\250\015\060\317\277\175\177\316"
+"\361\235\203\275\311\106\156\040\246\371\141\121\272\041\057\173"
+"\276\245\025\143\241\324\225\207\361\236\271\363\211\363\075\205"
+"\270\270\333\276\265\271\051\371\332\067\005\000\111\224\003\204"
+"\104\347\277\103\061\317\165\213\045\321\364\246\144\365\222\366"
+"\253\005\353\075\351\245\013\066\142\332\314\006\137\066\213\266"
+"\136\061\270\052\373\136\366\161\337\104\046\236\304\346\015\221"
+"\264\056\165\225\200\121\152\113\060\246\260\142\241\223\361\233"
+"\330\316\304\143\165\077\131\107\261"
+, (PRUint32)1049 }
+};
+static const NSSItem nss_builtins_items_311 [] = {
+  { (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 *)"NetLock Arany (Class Gold) Főtanúsítvány", (PRUint32)45 },
+  { (void *)"\006\010\077\131\077\025\241\004\240\151\244\153\251\003\320\006"
+"\267\227\011\221"
+, (PRUint32)20 },
+  { (void *)"\305\241\267\377\163\335\326\327\064\062\030\337\374\074\255\210"
+, (PRUint32)16 },
+  { (void *)"\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125"
+"\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160"
+"\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145"
+"\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003"
+"\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303"
+"\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143"
+"\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145"
+"\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141"
+"\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303"
+"\272\163\303\255\164\166\303\241\156\171"
+, (PRUint32)170 },
+  { (void *)"\002\006\111\101\054\344\000\020"
+, (PRUint32)8 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_312 [] = {
+  { (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 *)"Staat der Nederlanden Root CA - G2", (PRUint32)35 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040"
+"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061"
+"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040"
+"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040"
+"\122\157\157\164\040\103\101\040\055\040\107\062"
+, (PRUint32)92 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040"
+"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061"
+"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040"
+"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040"
+"\122\157\157\164\040\103\101\040\055\040\107\062"
+, (PRUint32)92 },
+  { (void *)"\002\004\000\230\226\214"
+, (PRUint32)6 },
+  { (void *)"\060\202\005\312\060\202\003\262\240\003\002\001\002\002\004\000"
+"\230\226\214\060\015\006\011\052\206\110\206\367\015\001\001\013"
+"\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116"
+"\114\061\036\060\034\006\003\125\004\012\014\025\123\164\141\141"
+"\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145"
+"\156\061\053\060\051\006\003\125\004\003\014\042\123\164\141\141"
+"\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145"
+"\156\040\122\157\157\164\040\103\101\040\055\040\107\062\060\036"
+"\027\015\060\070\060\063\062\066\061\061\061\070\061\067\132\027"
+"\015\062\060\060\063\062\065\061\061\060\063\061\060\132\060\132"
+"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\036\060"
+"\034\006\003\125\004\012\014\025\123\164\141\141\164\040\144\145"
+"\162\040\116\145\144\145\162\154\141\156\144\145\156\061\053\060"
+"\051\006\003\125\004\003\014\042\123\164\141\141\164\040\144\145"
+"\162\040\116\145\144\145\162\154\141\156\144\145\156\040\122\157"
+"\157\164\040\103\101\040\055\040\107\062\060\202\002\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002"
+"\017\000\060\202\002\012\002\202\002\001\000\305\131\347\157\165"
+"\252\076\113\234\265\270\254\236\013\344\371\331\312\253\135\217"
+"\265\071\020\202\327\257\121\340\073\341\000\110\152\317\332\341"
+"\006\103\021\231\252\024\045\022\255\042\350\000\155\103\304\251"
+"\270\345\037\211\113\147\275\141\110\357\375\322\340\140\210\345"
+"\271\030\140\050\303\167\053\255\260\067\252\067\336\144\131\052"
+"\106\127\344\113\271\370\067\174\325\066\347\200\301\266\363\324"
+"\147\233\226\350\316\327\306\012\123\320\153\111\226\363\243\013"
+"\005\167\110\367\045\345\160\254\060\024\040\045\343\177\165\132"
+"\345\110\370\116\173\003\007\004\372\202\141\207\156\360\073\304"
+"\244\307\320\365\164\076\245\135\032\010\362\233\045\322\366\254"
+"\004\046\076\125\072\142\050\245\173\262\060\257\370\067\302\321"
+"\272\326\070\375\364\357\111\060\067\231\046\041\110\205\001\251"
+"\345\026\347\334\220\125\337\017\350\070\315\231\067\041\117\135"
+"\365\042\157\152\305\022\026\140\027\125\362\145\146\246\247\060"
+"\221\070\301\070\035\206\004\204\272\032\045\170\136\235\257\314"
+"\120\140\326\023\207\122\355\143\037\155\145\175\302\025\030\164"
+"\312\341\176\144\051\214\162\330\026\023\175\013\111\112\361\050"
+"\033\040\164\153\305\075\335\260\252\110\011\075\056\202\224\315"
+"\032\145\331\053\210\232\231\274\030\176\237\356\175\146\174\076"
+"\275\224\270\201\316\315\230\060\170\301\157\147\320\276\137\340"
+"\150\355\336\342\261\311\054\131\170\222\252\337\053\140\143\362"
+"\345\136\271\343\312\372\177\120\206\076\242\064\030\014\011\150"
+"\050\021\034\344\341\271\134\076\107\272\062\077\030\314\133\204"
+"\365\363\153\164\304\162\164\341\343\213\240\112\275\215\146\057"
+"\352\255\065\332\040\323\210\202\141\360\022\042\266\274\320\325"
+"\244\354\257\124\210\045\044\074\247\155\261\162\051\077\076\127"
+"\246\177\125\257\156\046\306\376\347\314\100\134\121\104\201\012"
+"\170\336\112\316\125\277\035\325\331\267\126\357\360\166\377\013"
+"\171\265\257\275\373\251\151\221\106\227\150\200\024\066\035\263"
+"\177\273\051\230\066\245\040\372\202\140\142\063\244\354\326\272"
+"\007\247\156\305\317\024\246\347\326\222\064\330\201\365\374\035"
+"\135\252\134\036\366\243\115\073\270\367\071\002\003\001\000\001"
+"\243\201\227\060\201\224\060\017\006\003\125\035\023\001\001\377"
+"\004\005\060\003\001\001\377\060\122\006\003\125\035\040\004\113"
+"\060\111\060\107\006\004\125\035\040\000\060\077\060\075\006\010"
+"\053\006\001\005\005\007\002\001\026\061\150\164\164\160\072\057"
+"\057\167\167\167\056\160\153\151\157\166\145\162\150\145\151\144"
+"\056\156\154\057\160\157\154\151\143\151\145\163\057\162\157\157"
+"\164\055\160\157\154\151\143\171\055\107\062\060\016\006\003\125"
+"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125"
+"\035\016\004\026\004\024\221\150\062\207\025\035\211\342\265\361"
+"\254\066\050\064\215\013\174\142\210\353\060\015\006\011\052\206"
+"\110\206\367\015\001\001\013\005\000\003\202\002\001\000\250\101"
+"\112\147\052\222\201\202\120\156\341\327\330\263\071\073\363\002"
+"\025\011\120\121\357\055\275\044\173\210\206\073\371\264\274\222"
+"\011\226\271\366\300\253\043\140\006\171\214\021\116\121\322\171"
+"\200\063\373\235\110\276\354\101\103\201\037\176\107\100\034\345"
+"\172\010\312\252\213\165\255\024\304\302\350\146\074\202\007\247"
+"\346\047\202\133\030\346\017\156\331\120\076\212\102\030\051\306"
+"\264\126\374\126\020\240\005\027\275\014\043\177\364\223\355\234"
+"\032\121\276\335\105\101\277\221\044\264\037\214\351\137\317\173"
+"\041\231\237\225\237\071\072\106\034\154\371\315\173\234\220\315"
+"\050\251\307\251\125\273\254\142\064\142\065\023\113\024\072\125"
+"\203\271\206\215\222\246\306\364\007\045\124\314\026\127\022\112"
+"\202\170\310\024\331\027\202\046\055\135\040\037\171\256\376\324"
+"\160\026\026\225\203\330\065\071\377\122\135\165\034\026\305\023"
+"\125\317\107\314\165\145\122\112\336\360\260\247\344\012\226\013"
+"\373\255\302\342\045\204\262\335\344\275\176\131\154\233\360\360"
+"\330\347\312\362\351\227\070\176\211\276\314\373\071\027\141\077"
+"\162\333\072\221\330\145\001\031\035\255\120\244\127\012\174\113"
+"\274\234\161\163\052\105\121\031\205\314\216\375\107\247\164\225"
+"\035\250\321\257\116\027\261\151\046\302\252\170\127\133\305\115"
+"\247\345\236\005\027\224\312\262\137\240\111\030\215\064\351\046"
+"\154\110\036\252\150\222\005\341\202\163\132\233\334\007\133\010"
+"\155\175\235\327\215\041\331\374\024\040\252\302\105\337\077\347"
+"\000\262\121\344\302\370\005\271\171\032\214\064\363\236\133\344"
+"\067\133\153\112\337\054\127\212\100\132\066\272\335\165\104\010"
+"\067\102\160\014\376\334\136\041\240\243\212\300\220\234\150\332"
+"\120\346\105\020\107\170\266\116\322\145\311\303\067\337\341\102"
+"\143\260\127\067\105\055\173\212\234\277\005\352\145\125\063\367"
+"\071\020\305\050\052\041\172\033\212\304\044\371\077\025\310\232"
+"\025\040\365\125\142\226\355\155\223\120\274\344\252\170\255\331"
+"\313\012\145\207\246\146\301\304\201\243\167\072\130\036\013\356"
+"\203\213\235\036\322\122\244\314\035\157\260\230\155\224\061\265"
+"\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
+, (PRUint32)1486 }
+};
+static const NSSItem nss_builtins_items_313 [] = {
+  { (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 *)"Staat der Nederlanden Root CA - G2", (PRUint32)35 },
+  { (void *)"\131\257\202\171\221\206\307\264\165\007\313\317\003\127\106\353"
+"\004\335\267\026"
+, (PRUint32)20 },
+  { (void *)"\174\245\017\370\133\232\175\155\060\256\124\132\343\102\242\212"
+, (PRUint32)16 },
+  { (void *)"\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
+"\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040"
+"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061"
+"\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040"
+"\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040"
+"\122\157\157\164\040\103\101\040\055\040\107\062"
+, (PRUint32)92 },
+  { (void *)"\002\004\000\230\226\214"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_314 [] = {
+  { (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 *)"CA Disig", (PRUint32)9 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061"
+"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163"
+"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104"
+"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125"
+"\004\003\023\010\103\101\040\104\151\163\151\147"
+, (PRUint32)76 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061"
+"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163"
+"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104"
+"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125"
+"\004\003\023\010\103\101\040\104\151\163\151\147"
+, (PRUint32)76 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061\023"
+"\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163\154"
+"\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104\151"
+"\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125\004"
+"\003\023\010\103\101\040\104\151\163\151\147\060\036\027\015\060"
+"\066\060\063\062\062\060\061\063\071\063\064\132\027\015\061\066"
+"\060\063\062\062\060\061\063\071\063\064\132\060\112\061\013\060"
+"\011\006\003\125\004\006\023\002\123\113\061\023\060\021\006\003"
+"\125\004\007\023\012\102\162\141\164\151\163\154\141\166\141\061"
+"\023\060\021\006\003\125\004\012\023\012\104\151\163\151\147\040"
+"\141\056\163\056\061\021\060\017\006\003\125\004\003\023\010\103"
+"\101\040\104\151\163\151\147\060\202\001\042\060\015\006\011\052"
+"\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060"
+"\202\001\012\002\202\001\001\000\222\366\061\301\175\210\375\231"
+"\001\251\330\173\362\161\165\361\061\306\363\165\146\372\121\050"
+"\106\204\227\170\064\274\154\374\274\105\131\210\046\030\112\304"
+"\067\037\241\112\104\275\343\161\004\365\104\027\342\077\374\110"
+"\130\157\134\236\172\011\272\121\067\042\043\146\103\041\260\074"
+"\144\242\370\152\025\016\077\353\121\341\124\251\335\006\231\327"
+"\232\074\124\213\071\003\077\017\305\316\306\353\203\162\002\250"
+"\037\161\363\055\370\165\010\333\142\114\350\372\316\371\347\152"
+"\037\266\153\065\202\272\342\217\026\222\175\005\014\154\106\003"
+"\135\300\355\151\277\072\301\212\240\350\216\331\271\105\050\207"
+"\010\354\264\312\025\276\202\335\265\104\213\055\255\206\014\150"
+"\142\155\205\126\362\254\024\143\072\306\321\231\254\064\170\126"
+"\113\317\266\255\077\214\212\327\004\345\343\170\114\365\206\252"
+"\365\217\372\075\154\161\243\055\312\147\353\150\173\156\063\251"
+"\014\202\050\250\114\152\041\100\025\040\014\046\133\203\302\251"
+"\026\025\300\044\202\135\053\026\255\312\143\366\164\000\260\337"
+"\103\304\020\140\126\147\143\105\002\003\001\000\001\243\201\377"
+"\060\201\374\060\017\006\003\125\035\023\001\001\377\004\005\060"
+"\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\215"
+"\262\111\150\235\162\010\045\271\300\047\365\120\223\126\110\106"
+"\161\371\217\060\016\006\003\125\035\017\001\001\377\004\004\003"
+"\002\001\006\060\066\006\003\125\035\021\004\057\060\055\201\023"
+"\143\141\157\160\145\162\141\164\157\162\100\144\151\163\151\147"
+"\056\163\153\206\026\150\164\164\160\072\057\057\167\167\167\056"
+"\144\151\163\151\147\056\163\153\057\143\141\060\146\006\003\125"
+"\035\037\004\137\060\135\060\055\240\053\240\051\206\047\150\164"
+"\164\160\072\057\057\167\167\167\056\144\151\163\151\147\056\163"
+"\153\057\143\141\057\143\162\154\057\143\141\137\144\151\163\151"
+"\147\056\143\162\154\060\054\240\052\240\050\206\046\150\164\164"
+"\160\072\057\057\143\141\056\144\151\163\151\147\056\163\153\057"
+"\143\141\057\143\162\154\057\143\141\137\144\151\163\151\147\056"
+"\143\162\154\060\032\006\003\125\035\040\004\023\060\021\060\017"
+"\006\015\053\201\036\221\223\346\012\000\000\000\001\001\001\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
+"\001\001\000\135\064\164\141\114\257\073\330\377\237\155\130\066"
+"\034\075\013\201\015\022\053\106\020\200\375\347\074\047\320\172"
+"\310\251\266\176\164\060\063\243\072\212\173\164\300\171\171\102"
+"\223\155\377\261\051\024\202\253\041\214\057\027\371\077\046\057"
+"\365\131\306\357\200\006\267\232\111\051\354\316\176\161\074\152"
+"\020\101\300\366\323\232\262\174\132\221\234\300\254\133\310\115"
+"\136\367\341\123\377\103\167\374\236\113\147\154\327\363\203\321"
+"\240\340\177\045\337\270\230\013\232\062\070\154\060\240\363\377"
+"\010\025\063\367\120\112\173\076\243\076\040\251\334\057\126\200"
+"\012\355\101\120\260\311\364\354\262\343\046\104\000\016\157\236"
+"\006\274\042\226\123\160\145\304\120\012\106\153\244\057\047\201"
+"\022\047\023\137\020\241\166\316\212\173\067\352\303\071\141\003"
+"\225\230\072\347\154\210\045\010\374\171\150\015\207\175\142\370"
+"\264\137\373\305\330\114\275\130\274\077\103\133\324\036\001\115"
+"\074\143\276\043\357\214\315\132\120\270\150\124\371\012\231\063"
+"\021\000\341\236\302\106\167\202\365\131\006\214\041\114\207\011"
+"\315\345\250"
+, (PRUint32)1043 }
+};
+static const NSSItem nss_builtins_items_315 [] = {
+  { (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 *)"CA Disig", (PRUint32)9 },
+  { (void *)"\052\310\325\213\127\316\277\057\111\257\362\374\166\217\121\024"
+"\142\220\172\101"
+, (PRUint32)20 },
+  { (void *)"\077\105\226\071\342\120\207\367\273\376\230\014\074\040\230\346"
+, (PRUint32)16 },
+  { (void *)"\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061"
+"\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163"
+"\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104"
+"\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125"
+"\004\003\023\010\103\101\040\104\151\163\151\147"
+, (PRUint32)76 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_316 [] = {
+  { (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 *)"Juur-SK", (PRUint32)8 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011"
+"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011"
+"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125"
+"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163"
+"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060"
+"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113"
+, (PRUint32)95 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011"
+"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011"
+"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125"
+"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163"
+"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060"
+"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113"
+, (PRUint32)95 },
+  { (void *)"\002\004\073\216\113\374"
+, (PRUint32)6 },
+  { (void *)"\060\202\004\346\060\202\003\316\240\003\002\001\002\002\004\073"
+"\216\113\374\060\015\006\011\052\206\110\206\367\015\001\001\005"
+"\005\000\060\135\061\030\060\026\006\011\052\206\110\206\367\015"
+"\001\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013"
+"\060\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006"
+"\003\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151"
+"\164\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061"
+"\020\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123"
+"\113\060\036\027\015\060\061\060\070\063\060\061\064\062\063\060"
+"\061\132\027\015\061\066\060\070\062\066\061\064\062\063\060\061"
+"\132\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001"
+"\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060"
+"\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003"
+"\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164"
+"\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020"
+"\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113"
+"\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001"
+"\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001"
+"\000\201\161\066\076\063\007\326\343\060\215\023\176\167\062\106"
+"\313\317\031\262\140\061\106\227\206\364\230\106\244\302\145\105"
+"\317\323\100\174\343\132\042\250\020\170\063\314\210\261\323\201"
+"\112\366\142\027\173\137\115\012\056\320\317\213\043\356\117\002"
+"\116\273\353\016\312\275\030\143\350\200\034\215\341\034\215\075"
+"\340\377\133\137\352\144\345\227\350\077\231\177\014\012\011\063"
+"\000\032\123\247\041\341\070\113\326\203\033\255\257\144\302\371"
+"\034\172\214\146\110\115\146\037\030\012\342\076\273\037\007\145"
+"\223\205\271\032\260\271\304\373\015\021\366\365\326\371\033\307"
+"\054\053\267\030\121\376\340\173\366\250\110\257\154\073\117\057"
+"\357\370\321\107\036\046\127\360\121\035\063\226\377\357\131\075"
+"\332\115\321\025\064\307\352\077\026\110\173\221\034\200\103\017"
+"\075\270\005\076\321\263\225\315\330\312\017\302\103\147\333\267"
+"\223\340\042\202\056\276\365\150\050\203\271\301\073\151\173\040"
+"\332\116\234\155\341\272\315\217\172\154\260\011\042\327\213\013"
+"\333\034\325\132\046\133\015\300\352\345\140\320\237\376\065\337"
+"\077\002\003\001\000\001\243\202\001\254\060\202\001\250\060\017"
+"\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060"
+"\202\001\026\006\003\125\035\040\004\202\001\015\060\202\001\011"
+"\060\202\001\005\006\012\053\006\001\004\001\316\037\001\001\001"
+"\060\201\366\060\201\320\006\010\053\006\001\005\005\007\002\002"
+"\060\201\303\036\201\300\000\123\000\145\000\145\000\040\000\163"
+"\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141"
+"\000\141\000\164\000\040\000\157\000\156\000\040\000\166\000\344"
+"\000\154\000\152\000\141\000\163\000\164\000\141\000\164\000\165"
+"\000\144\000\040\000\101\000\123\000\055\000\151\000\163\000\040"
+"\000\123\000\145\000\162\000\164\000\151\000\146\000\151\000\164"
+"\000\163\000\145\000\145\000\162\000\151\000\155\000\151\000\163"
+"\000\153\000\145\000\163\000\153\000\165\000\163\000\040\000\141"
+"\000\154\000\141\000\155\000\055\000\123\000\113\000\040\000\163"
+"\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141"
+"\000\141\000\164\000\151\000\144\000\145\000\040\000\153\000\151"
+"\000\156\000\156\000\151\000\164\000\141\000\155\000\151\000\163"
+"\000\145\000\153\000\163\060\041\006\010\053\006\001\005\005\007"
+"\002\001\026\025\150\164\164\160\072\057\057\167\167\167\056\163"
+"\153\056\145\145\057\143\160\163\057\060\053\006\003\125\035\037"
+"\004\044\060\042\060\040\240\036\240\034\206\032\150\164\164\160"
+"\072\057\057\167\167\167\056\163\153\056\145\145\057\152\165\165"
+"\162\057\143\162\154\057\060\035\006\003\125\035\016\004\026\004"
+"\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030\077"
+"\157\357\351\175\276\060\037\006\003\125\035\043\004\030\060\026"
+"\200\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030"
+"\077\157\357\351\175\276\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\346\060\015\006\011\052\206\110\206\367\015"
+"\001\001\005\005\000\003\202\001\001\000\173\301\030\224\123\242"
+"\011\363\376\046\147\232\120\344\303\005\057\053\065\170\221\114"
+"\174\250\021\021\171\114\111\131\254\310\367\205\145\134\106\273"
+"\073\020\240\002\257\315\117\265\314\066\052\354\135\376\357\240"
+"\221\311\266\223\157\174\200\124\354\307\010\160\015\216\373\202"
+"\354\052\140\170\151\066\066\321\305\234\213\151\265\100\310\224"
+"\145\167\362\127\041\146\073\316\205\100\266\063\143\032\277\171"
+"\036\374\134\035\323\035\223\033\213\014\135\205\275\231\060\062"
+"\030\011\221\122\351\174\241\272\377\144\222\232\354\376\065\356"
+"\214\057\256\374\040\206\354\112\336\033\170\062\067\246\201\322"
+"\235\257\132\022\026\312\231\133\374\157\155\016\305\240\036\206"
+"\311\221\320\134\230\202\137\143\014\212\132\253\330\225\246\314"
+"\313\212\326\277\144\113\216\312\212\262\260\351\041\062\236\252"
+"\250\205\230\064\201\071\041\073\250\072\122\062\075\366\153\067"
+"\206\006\132\025\230\334\360\021\146\376\064\040\267\003\364\101"
+"\020\175\071\204\171\226\162\143\266\226\002\345\153\271\255\031"
+"\115\273\306\104\333\066\313\052\234\216"
+, (PRUint32)1258 }
+};
+static const NSSItem nss_builtins_items_317 [] = {
+  { (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 *)"Juur-SK", (PRUint32)8 },
+  { (void *)"\100\235\113\331\027\265\134\047\266\233\144\313\230\042\104\015"
+"\315\011\270\211"
+, (PRUint32)20 },
+  { (void *)"\252\216\135\331\370\333\012\130\267\215\046\207\154\202\065\125"
+, (PRUint32)16 },
+  { (void *)"\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011"
+"\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011"
+"\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125"
+"\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163"
+"\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060"
+"\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113"
+, (PRUint32)95 },
+  { (void *)"\002\004\073\216\113\374"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_318 [] = {
+  { (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 *)"Hongkong Post Root CA 1", (PRUint32)24 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061"
+"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157"
+"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003"
+"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040"
+"\122\157\157\164\040\103\101\040\061"
+, (PRUint32)73 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061"
+"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157"
+"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003"
+"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040"
+"\122\157\157\164\040\103\101\040\061"
+, (PRUint32)73 },
+  { (void *)"\002\002\003\350"
+, (PRUint32)4 },
+  { (void *)"\060\202\003\060\060\202\002\030\240\003\002\001\002\002\002\003"
+"\350\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000"
+"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061"
+"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157"
+"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003"
+"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040"
+"\122\157\157\164\040\103\101\040\061\060\036\027\015\060\063\060"
+"\065\061\065\060\065\061\063\061\064\132\027\015\062\063\060\065"
+"\061\065\060\064\065\062\062\071\132\060\107\061\013\060\011\006"
+"\003\125\004\006\023\002\110\113\061\026\060\024\006\003\125\004"
+"\012\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164"
+"\061\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153"
+"\157\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101"
+"\040\061\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+"\001\001\000\254\377\070\266\351\146\002\111\343\242\264\341\220"
+"\371\100\217\171\371\342\275\171\376\002\275\356\044\222\035\042"
+"\366\332\205\162\151\376\327\077\011\324\335\221\265\002\234\320"
+"\215\132\341\125\303\120\206\271\051\046\302\343\331\240\361\151"
+"\003\050\040\200\105\042\055\126\247\073\124\225\126\042\131\037"
+"\050\337\037\040\075\155\242\066\276\043\240\261\156\265\261\047"
+"\077\071\123\011\352\253\152\350\164\262\302\145\134\216\277\174"
+"\303\170\204\315\236\026\374\365\056\117\040\052\010\237\167\363"
+"\305\036\304\232\122\146\036\110\136\343\020\006\217\042\230\341"
+"\145\216\033\135\043\146\073\270\245\062\121\310\206\252\241\251"
+"\236\177\166\224\302\246\154\267\101\360\325\310\006\070\346\324"
+"\014\342\363\073\114\155\120\214\304\203\047\301\023\204\131\075"
+"\236\165\164\266\330\002\136\072\220\172\300\102\066\162\354\152"
+"\115\334\357\304\000\337\023\030\127\137\046\170\310\326\012\171"
+"\167\277\367\257\267\166\271\245\013\204\027\135\020\352\157\341"
+"\253\225\021\137\155\074\243\134\115\203\133\362\263\031\212\200"
+"\213\013\207\002\003\001\000\001\243\046\060\044\060\022\006\003"
+"\125\035\023\001\001\377\004\010\060\006\001\001\377\002\001\003"
+"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\306"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
+"\202\001\001\000\016\106\325\074\256\342\207\331\136\201\213\002"
+"\230\101\010\214\114\274\332\333\356\047\033\202\347\152\105\354"
+"\026\213\117\205\240\363\262\160\275\132\226\272\312\156\155\356"
+"\106\213\156\347\052\056\226\263\031\063\353\264\237\250\262\067"
+"\356\230\250\227\266\056\266\147\047\324\246\111\375\034\223\145"
+"\166\236\102\057\334\042\154\232\117\362\132\025\071\261\161\327"
+"\053\121\350\155\034\230\300\331\052\364\241\202\173\325\311\101"
+"\242\043\001\164\070\125\213\017\271\056\147\242\040\004\067\332"
+"\234\013\323\027\041\340\217\227\171\064\157\204\110\002\040\063"
+"\033\346\064\104\237\221\160\364\200\136\204\103\302\051\322\154"
+"\022\024\344\141\215\254\020\220\236\204\120\273\360\226\157\105"
+"\237\212\363\312\154\117\372\021\072\025\025\106\303\315\037\203"
+"\133\055\101\022\355\120\147\101\023\075\041\253\224\212\252\116"
+"\174\301\261\373\247\326\265\047\057\227\253\156\340\035\342\321"
+"\034\054\037\104\342\374\276\221\241\234\373\326\051\123\163\206"
+"\237\123\330\103\016\135\326\143\202\161\035\200\164\312\366\342"
+"\002\153\331\132"
+, (PRUint32)820 }
+};
+static const NSSItem nss_builtins_items_319 [] = {
+  { (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 *)"Hongkong Post Root CA 1", (PRUint32)24 },
+  { (void *)"\326\332\250\040\215\011\322\025\115\044\265\057\313\064\156\262"
+"\130\262\212\130"
+, (PRUint32)20 },
+  { (void *)"\250\015\157\071\170\271\103\155\167\102\155\230\132\314\043\312"
+, (PRUint32)16 },
+  { (void *)"\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061"
+"\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157"
+"\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003"
+"\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040"
+"\122\157\157\164\040\103\101\040\061"
+, (PRUint32)73 },
+  { (void *)"\002\002\003\350"
+, (PRUint32)4 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_320 [] = {
+  { (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 *)"SecureSign RootCA11", (PRUint32)20 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
+"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145"
+"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032"
+"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147"
+"\156\040\122\157\157\164\103\101\061\061"
+, (PRUint32)90 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
+"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145"
+"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032"
+"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147"
+"\156\040\122\157\157\164\103\101\061\061"
+, (PRUint32)90 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\155\060\202\002\125\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061\053"
+"\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162"
+"\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032\006"
+"\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147\156"
+"\040\122\157\157\164\103\101\061\061\060\036\027\015\060\071\060"
+"\064\060\070\060\064\065\066\064\067\132\027\015\062\071\060\064"
+"\060\070\060\064\065\066\064\067\132\060\130\061\013\060\011\006"
+"\003\125\004\006\023\002\112\120\061\053\060\051\006\003\125\004"
+"\012\023\042\112\141\160\141\156\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163\054"
+"\040\111\156\143\056\061\034\060\032\006\003\125\004\003\023\023"
+"\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164\103"
+"\101\061\061\060\202\001\042\060\015\006\011\052\206\110\206\367"
+"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002"
+"\202\001\001\000\375\167\252\245\034\220\005\073\313\114\233\063"
+"\213\132\024\105\244\347\220\026\321\337\127\322\041\020\244\027"
+"\375\337\254\326\037\247\344\333\174\367\354\337\270\003\332\224"
+"\130\375\135\162\174\214\077\137\001\147\164\025\226\343\002\074"
+"\207\333\256\313\001\216\302\363\146\306\205\105\364\002\306\072"
+"\265\142\262\257\372\234\277\244\346\324\200\060\230\363\015\266"
+"\223\217\251\324\330\066\362\260\374\212\312\054\241\025\063\225"
+"\061\332\300\033\362\356\142\231\206\143\077\277\335\223\052\203"
+"\250\166\271\023\037\267\316\116\102\205\217\042\347\056\032\362"
+"\225\011\262\005\265\104\116\167\241\040\275\251\362\116\012\175"
+"\120\255\365\005\015\105\117\106\161\375\050\076\123\373\004\330"
+"\055\327\145\035\112\033\372\317\073\260\061\232\065\156\310\213"
+"\006\323\000\221\362\224\010\145\114\261\064\006\000\172\211\342"
+"\360\307\003\131\317\325\326\350\247\062\263\346\230\100\206\305"
+"\315\047\022\213\314\173\316\267\021\074\142\140\007\043\076\053"
+"\100\156\224\200\011\155\266\263\157\167\157\065\010\120\373\002"
+"\207\305\076\211\002\003\001\000\001\243\102\060\100\060\035\006"
+"\003\125\035\016\004\026\004\024\133\370\115\117\262\245\206\324"
+"\072\322\361\143\232\240\276\011\366\127\267\336\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\015\006"
+"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001"
+"\000\240\241\070\026\146\056\247\126\037\041\234\006\372\035\355"
+"\271\042\305\070\046\330\116\117\354\243\177\171\336\106\041\241"
+"\207\167\217\007\010\232\262\244\305\257\017\062\230\013\174\146"
+"\051\266\233\175\045\122\111\103\253\114\056\053\156\172\160\257"
+"\026\016\343\002\154\373\102\346\030\235\105\330\125\310\350\073"
+"\335\347\341\364\056\013\034\064\134\154\130\112\373\214\210\120"
+"\137\225\034\277\355\253\042\265\145\263\205\272\236\017\270\255"
+"\345\172\033\212\120\072\035\275\015\274\173\124\120\013\271\102"
+"\257\125\240\030\201\255\145\231\357\276\344\234\277\304\205\253"
+"\101\262\124\157\334\045\315\355\170\342\216\014\215\011\111\335"
+"\143\173\132\151\226\002\041\250\275\122\131\351\175\065\313\310"
+"\122\312\177\201\376\331\153\323\367\021\355\045\337\370\347\371"
+"\244\372\162\227\204\123\015\245\320\062\030\121\166\131\024\154"
+"\017\353\354\137\200\214\165\103\203\303\205\230\377\114\236\055"
+"\015\344\167\203\223\116\265\226\007\213\050\023\233\214\031\215"
+"\101\047\111\100\356\336\346\043\104\071\334\241\042\326\272\003"
+"\362"
+, (PRUint32)881 }
+};
+static const NSSItem nss_builtins_items_321 [] = {
+  { (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 *)"SecureSign RootCA11", (PRUint32)20 },
+  { (void *)"\073\304\237\110\370\363\163\240\234\036\275\370\133\261\303\145"
+"\307\330\021\263"
+, (PRUint32)20 },
+  { (void *)"\267\122\164\342\222\264\200\223\362\165\344\314\327\362\352\046"
+, (PRUint32)16 },
+  { (void *)"\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061"
+"\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145"
+"\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032"
+"\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147"
+"\156\040\122\157\157\164\103\101\061\061"
+, (PRUint32)90 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
 
 builtinsInternalObject
 nss_builtins_data[] = {
 #ifdef DEBUG
   { 7, nss_builtins_types_0, nss_builtins_items_0, {NULL} },
 #endif /* DEBUG */
   { 5, nss_builtins_types_1, nss_builtins_items_1, {NULL} },
   { 11, nss_builtins_types_2, nss_builtins_items_2, {NULL} },
@@ -21083,16 +21846,28 @@ nss_builtins_data[] = {
   { 13, nss_builtins_types_301, nss_builtins_items_301, {NULL} },
   { 11, nss_builtins_types_302, nss_builtins_items_302, {NULL} },
   { 13, nss_builtins_types_303, nss_builtins_items_303, {NULL} },
   { 11, nss_builtins_types_304, nss_builtins_items_304, {NULL} },
   { 13, nss_builtins_types_305, nss_builtins_items_305, {NULL} },
   { 11, nss_builtins_types_306, nss_builtins_items_306, {NULL} },
   { 13, nss_builtins_types_307, nss_builtins_items_307, {NULL} },
   { 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} },
-  { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} }
+  { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} },
+  { 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} },
+  { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} },
+  { 11, nss_builtins_types_312, nss_builtins_items_312, {NULL} },
+  { 13, nss_builtins_types_313, nss_builtins_items_313, {NULL} },
+  { 11, nss_builtins_types_314, nss_builtins_items_314, {NULL} },
+  { 13, nss_builtins_types_315, nss_builtins_items_315, {NULL} },
+  { 11, nss_builtins_types_316, nss_builtins_items_316, {NULL} },
+  { 13, nss_builtins_types_317, nss_builtins_items_317, {NULL} },
+  { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
+  { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
+  { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
+  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
 };
 const PRUint32
 #ifdef DEBUG
-  nss_builtins_nObjects = 309+1;
+  nss_builtins_nObjects = 321+1;
 #else
-  nss_builtins_nObjects = 309;
+  nss_builtins_nObjects = 321;
 #endif /* DEBUG */
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -29,17 +29,17 @@
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.57 $ $Date: 2009/12/03 21:09:32 $"
+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $"
 
 #
 # certdata.txt
 #
 # This file contains the object definitions for the certs and other
 # information "built into" NSS.
 #
 # Object definitions:
@@ -21408,8 +21408,795 @@ END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
 \002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207
 \254\263
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "NetLock Arany (Class Gold) Főtanúsítvány"
+#
+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 "NetLock Arany (Class Gold) Főtanúsítvány"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125
+\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160
+\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145
+\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003
+\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303
+\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143
+\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145
+\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141
+\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303
+\272\163\303\255\164\166\303\241\156\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125
+\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160
+\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145
+\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003
+\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303
+\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143
+\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145
+\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141
+\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303
+\272\163\303\255\164\166\303\241\156\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\111\101\054\344\000\020
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\025\060\202\002\375\240\003\002\001\002\002\006\111
+\101\054\344\000\020\060\015\006\011\052\206\110\206\367\015\001
+\001\013\005\000\060\201\247\061\013\060\011\006\003\125\004\006
+\023\002\110\125\061\021\060\017\006\003\125\004\007\014\010\102
+\165\144\141\160\145\163\164\061\025\060\023\006\003\125\004\012
+\014\014\116\145\164\114\157\143\153\040\113\146\164\056\061\067
+\060\065\006\003\125\004\013\014\056\124\141\156\303\272\163\303
+\255\164\166\303\241\156\171\153\151\141\144\303\263\153\040\050
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145
+\162\166\151\143\145\163\051\061\065\060\063\006\003\125\004\003
+\014\054\116\145\164\114\157\143\153\040\101\162\141\156\171\040
+\050\103\154\141\163\163\040\107\157\154\144\051\040\106\305\221
+\164\141\156\303\272\163\303\255\164\166\303\241\156\171\060\036
+\027\015\060\070\061\062\061\061\061\065\060\070\062\061\132\027
+\015\062\070\061\062\060\066\061\065\060\070\062\061\132\060\201
+\247\061\013\060\011\006\003\125\004\006\023\002\110\125\061\021
+\060\017\006\003\125\004\007\014\010\102\165\144\141\160\145\163
+\164\061\025\060\023\006\003\125\004\012\014\014\116\145\164\114
+\157\143\153\040\113\146\164\056\061\067\060\065\006\003\125\004
+\013\014\056\124\141\156\303\272\163\303\255\164\166\303\241\156
+\171\153\151\141\144\303\263\153\040\050\103\145\162\164\151\146
+\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163
+\051\061\065\060\063\006\003\125\004\003\014\054\116\145\164\114
+\157\143\153\040\101\162\141\156\171\040\050\103\154\141\163\163
+\040\107\157\154\144\051\040\106\305\221\164\141\156\303\272\163
+\303\255\164\166\303\241\156\171\060\202\001\042\060\015\006\011
+\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000
+\060\202\001\012\002\202\001\001\000\304\044\136\163\276\113\155
+\024\303\241\364\343\227\220\156\322\060\105\036\074\356\147\331
+\144\340\032\212\177\312\060\312\203\343\040\301\343\364\072\323
+\224\137\032\174\133\155\277\060\117\204\047\366\237\037\111\274
+\306\231\012\220\362\017\365\177\103\204\067\143\121\213\172\245
+\160\374\172\130\315\216\233\355\303\106\154\204\160\135\332\363
+\001\220\043\374\116\060\251\176\341\047\143\347\355\144\074\240
+\270\311\063\143\376\026\220\377\260\270\375\327\250\300\300\224
+\103\013\266\325\131\246\236\126\320\044\037\160\171\257\333\071
+\124\015\145\165\331\025\101\224\001\257\136\354\366\215\361\377
+\255\144\376\040\232\327\134\353\376\246\037\010\144\243\213\166
+\125\255\036\073\050\140\056\207\045\350\252\257\037\306\144\106
+\040\267\160\177\074\336\110\333\226\123\267\071\167\344\032\342
+\307\026\204\166\227\133\057\273\031\025\205\370\151\205\365\231
+\247\251\362\064\247\251\266\246\003\374\157\206\075\124\174\166
+\004\233\153\371\100\135\000\064\307\056\231\165\235\345\210\003
+\252\115\370\003\322\102\166\300\033\002\003\000\250\213\243\105
+\060\103\060\022\006\003\125\035\023\001\001\377\004\010\060\006
+\001\001\377\002\001\004\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004
+\024\314\372\147\223\360\266\270\320\245\300\036\363\123\375\214
+\123\337\203\327\226\060\015\006\011\052\206\110\206\367\015\001
+\001\013\005\000\003\202\001\001\000\253\177\356\034\026\251\234
+\074\121\000\240\300\021\010\005\247\231\346\157\001\210\124\141
+\156\361\271\030\255\112\255\376\201\100\043\224\057\373\165\174
+\057\050\113\142\044\201\202\013\365\141\361\034\156\270\141\070
+\353\201\372\142\241\073\132\142\323\224\145\304\341\346\155\202
+\370\057\045\160\262\041\046\301\162\121\037\214\054\303\204\220
+\303\132\217\272\317\364\247\145\245\353\230\321\373\005\262\106
+\165\025\043\152\157\205\143\060\200\360\325\236\037\051\034\302
+\154\260\120\131\135\220\133\073\250\015\060\317\277\175\177\316
+\361\235\203\275\311\106\156\040\246\371\141\121\272\041\057\173
+\276\245\025\143\241\324\225\207\361\236\271\363\211\363\075\205
+\270\270\333\276\265\271\051\371\332\067\005\000\111\224\003\204
+\104\347\277\103\061\317\165\213\045\321\364\246\144\365\222\366
+\253\005\353\075\351\245\013\066\142\332\314\006\137\066\213\266
+\136\061\270\052\373\136\366\161\337\104\046\236\304\346\015\221
+\264\056\165\225\200\121\152\113\060\246\260\142\241\223\361\233
+\330\316\304\143\165\077\131\107\261
+END
+
+# Trust for Certificate "NetLock Arany (Class Gold) Főtanúsítvány"
+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 "NetLock Arany (Class Gold) Főtanúsítvány"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\006\010\077\131\077\025\241\004\240\151\244\153\251\003\320\006
+\267\227\011\221
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\305\241\267\377\163\335\326\327\064\062\030\337\374\074\255\210
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\247\061\013\060\011\006\003\125\004\006\023\002\110\125
+\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160
+\145\163\164\061\025\060\023\006\003\125\004\012\014\014\116\145
+\164\114\157\143\153\040\113\146\164\056\061\067\060\065\006\003
+\125\004\013\014\056\124\141\156\303\272\163\303\255\164\166\303
+\241\156\171\153\151\141\144\303\263\153\040\050\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143
+\145\163\051\061\065\060\063\006\003\125\004\003\014\054\116\145
+\164\114\157\143\153\040\101\162\141\156\171\040\050\103\154\141
+\163\163\040\107\157\154\144\051\040\106\305\221\164\141\156\303
+\272\163\303\255\164\166\303\241\156\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\111\101\054\344\000\020
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Staat der Nederlanden Root CA - G2"
+#
+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 "Staat der Nederlanden Root CA - G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040
+\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061
+\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040
+\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040
+\122\157\157\164\040\103\101\040\055\040\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040
+\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061
+\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040
+\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040
+\122\157\157\164\040\103\101\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\000\230\226\214
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\312\060\202\003\262\240\003\002\001\002\002\004\000
+\230\226\214\060\015\006\011\052\206\110\206\367\015\001\001\013
+\005\000\060\132\061\013\060\011\006\003\125\004\006\023\002\116
+\114\061\036\060\034\006\003\125\004\012\014\025\123\164\141\141
+\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145
+\156\061\053\060\051\006\003\125\004\003\014\042\123\164\141\141
+\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145
+\156\040\122\157\157\164\040\103\101\040\055\040\107\062\060\036
+\027\015\060\070\060\063\062\066\061\061\061\070\061\067\132\027
+\015\062\060\060\063\062\065\061\061\060\063\061\060\132\060\132
+\061\013\060\011\006\003\125\004\006\023\002\116\114\061\036\060
+\034\006\003\125\004\012\014\025\123\164\141\141\164\040\144\145
+\162\040\116\145\144\145\162\154\141\156\144\145\156\061\053\060
+\051\006\003\125\004\003\014\042\123\164\141\141\164\040\144\145
+\162\040\116\145\144\145\162\154\141\156\144\145\156\040\122\157
+\157\164\040\103\101\040\055\040\107\062\060\202\002\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002
+\017\000\060\202\002\012\002\202\002\001\000\305\131\347\157\165
+\252\076\113\234\265\270\254\236\013\344\371\331\312\253\135\217
+\265\071\020\202\327\257\121\340\073\341\000\110\152\317\332\341
+\006\103\021\231\252\024\045\022\255\042\350\000\155\103\304\251
+\270\345\037\211\113\147\275\141\110\357\375\322\340\140\210\345
+\271\030\140\050\303\167\053\255\260\067\252\067\336\144\131\052
+\106\127\344\113\271\370\067\174\325\066\347\200\301\266\363\324
+\147\233\226\350\316\327\306\012\123\320\153\111\226\363\243\013
+\005\167\110\367\045\345\160\254\060\024\040\045\343\177\165\132
+\345\110\370\116\173\003\007\004\372\202\141\207\156\360\073\304
+\244\307\320\365\164\076\245\135\032\010\362\233\045\322\366\254
+\004\046\076\125\072\142\050\245\173\262\060\257\370\067\302\321
+\272\326\070\375\364\357\111\060\067\231\046\041\110\205\001\251
+\345\026\347\334\220\125\337\017\350\070\315\231\067\041\117\135
+\365\042\157\152\305\022\026\140\027\125\362\145\146\246\247\060
+\221\070\301\070\035\206\004\204\272\032\045\170\136\235\257\314
+\120\140\326\023\207\122\355\143\037\155\145\175\302\025\030\164
+\312\341\176\144\051\214\162\330\026\023\175\013\111\112\361\050
+\033\040\164\153\305\075\335\260\252\110\011\075\056\202\224\315
+\032\145\331\053\210\232\231\274\030\176\237\356\175\146\174\076
+\275\224\270\201\316\315\230\060\170\301\157\147\320\276\137\340
+\150\355\336\342\261\311\054\131\170\222\252\337\053\140\143\362
+\345\136\271\343\312\372\177\120\206\076\242\064\030\014\011\150
+\050\021\034\344\341\271\134\076\107\272\062\077\030\314\133\204
+\365\363\153\164\304\162\164\341\343\213\240\112\275\215\146\057
+\352\255\065\332\040\323\210\202\141\360\022\042\266\274\320\325
+\244\354\257\124\210\045\044\074\247\155\261\162\051\077\076\127
+\246\177\125\257\156\046\306\376\347\314\100\134\121\104\201\012
+\170\336\112\316\125\277\035\325\331\267\126\357\360\166\377\013
+\171\265\257\275\373\251\151\221\106\227\150\200\024\066\035\263
+\177\273\051\230\066\245\040\372\202\140\142\063\244\354\326\272
+\007\247\156\305\317\024\246\347\326\222\064\330\201\365\374\035
+\135\252\134\036\366\243\115\073\270\367\071\002\003\001\000\001
+\243\201\227\060\201\224\060\017\006\003\125\035\023\001\001\377
+\004\005\060\003\001\001\377\060\122\006\003\125\035\040\004\113
+\060\111\060\107\006\004\125\035\040\000\060\077\060\075\006\010
+\053\006\001\005\005\007\002\001\026\061\150\164\164\160\072\057
+\057\167\167\167\056\160\153\151\157\166\145\162\150\145\151\144
+\056\156\154\057\160\157\154\151\143\151\145\163\057\162\157\157
+\164\055\160\157\154\151\143\171\055\107\062\060\016\006\003\125
+\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
+\035\016\004\026\004\024\221\150\062\207\025\035\211\342\265\361
+\254\066\050\064\215\013\174\142\210\353\060\015\006\011\052\206
+\110\206\367\015\001\001\013\005\000\003\202\002\001\000\250\101
+\112\147\052\222\201\202\120\156\341\327\330\263\071\073\363\002
+\025\011\120\121\357\055\275\044\173\210\206\073\371\264\274\222
+\011\226\271\366\300\253\043\140\006\171\214\021\116\121\322\171
+\200\063\373\235\110\276\354\101\103\201\037\176\107\100\034\345
+\172\010\312\252\213\165\255\024\304\302\350\146\074\202\007\247
+\346\047\202\133\030\346\017\156\331\120\076\212\102\030\051\306
+\264\126\374\126\020\240\005\027\275\014\043\177\364\223\355\234
+\032\121\276\335\105\101\277\221\044\264\037\214\351\137\317\173
+\041\231\237\225\237\071\072\106\034\154\371\315\173\234\220\315
+\050\251\307\251\125\273\254\142\064\142\065\023\113\024\072\125
+\203\271\206\215\222\246\306\364\007\045\124\314\026\127\022\112
+\202\170\310\024\331\027\202\046\055\135\040\037\171\256\376\324
+\160\026\026\225\203\330\065\071\377\122\135\165\034\026\305\023
+\125\317\107\314\165\145\122\112\336\360\260\247\344\012\226\013
+\373\255\302\342\045\204\262\335\344\275\176\131\154\233\360\360
+\330\347\312\362\351\227\070\176\211\276\314\373\071\027\141\077
+\162\333\072\221\330\145\001\031\035\255\120\244\127\012\174\113
+\274\234\161\163\052\105\121\031\205\314\216\375\107\247\164\225
+\035\250\321\257\116\027\261\151\046\302\252\170\127\133\305\115
+\247\345\236\005\027\224\312\262\137\240\111\030\215\064\351\046
+\154\110\036\252\150\222\005\341\202\163\132\233\334\007\133\010
+\155\175\235\327\215\041\331\374\024\040\252\302\105\337\077\347
+\000\262\121\344\302\370\005\271\171\032\214\064\363\236\133\344
+\067\133\153\112\337\054\127\212\100\132\066\272\335\165\104\010
+\067\102\160\014\376\334\136\041\240\243\212\300\220\234\150\332
+\120\346\105\020\107\170\266\116\322\145\311\303\067\337\341\102
+\143\260\127\067\105\055\173\212\234\277\005\352\145\125\063\367
+\071\020\305\050\052\041\172\033\212\304\044\371\077\025\310\232
+\025\040\365\125\142\226\355\155\223\120\274\344\252\170\255\331
+\313\012\145\207\246\146\301\304\201\243\167\072\130\036\013\356
+\203\213\235\036\322\122\244\314\035\157\260\230\155\224\061\265
+\370\161\012\334\271\374\175\062\140\346\353\257\212\001
+END
+
+# Trust for Certificate "Staat der Nederlanden Root CA - G2"
+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 "Staat der Nederlanden Root CA - G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\131\257\202\171\221\206\307\264\165\007\313\317\003\127\106\353
+\004\335\267\026
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\174\245\017\370\133\232\175\155\060\256\124\132\343\102\242\212
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\132\061\013\060\011\006\003\125\004\006\023\002\116\114\061
+\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040
+\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061
+\053\060\051\006\003\125\004\003\014\042\123\164\141\141\164\040
+\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040
+\122\157\157\164\040\103\101\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\000\230\226\214
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "CA Disig"
+#
+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 "CA Disig"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061
+\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163
+\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104
+\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125
+\004\003\023\010\103\101\040\104\151\163\151\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061
+\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163
+\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104
+\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125
+\004\003\023\010\103\101\040\104\151\163\151\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\017\060\202\002\367\240\003\002\001\002\002\001\001
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061\023
+\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163\154
+\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104\151
+\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125\004
+\003\023\010\103\101\040\104\151\163\151\147\060\036\027\015\060
+\066\060\063\062\062\060\061\063\071\063\064\132\027\015\061\066
+\060\063\062\062\060\061\063\071\063\064\132\060\112\061\013\060
+\011\006\003\125\004\006\023\002\123\113\061\023\060\021\006\003
+\125\004\007\023\012\102\162\141\164\151\163\154\141\166\141\061
+\023\060\021\006\003\125\004\012\023\012\104\151\163\151\147\040
+\141\056\163\056\061\021\060\017\006\003\125\004\003\023\010\103
+\101\040\104\151\163\151\147\060\202\001\042\060\015\006\011\052
+\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060
+\202\001\012\002\202\001\001\000\222\366\061\301\175\210\375\231
+\001\251\330\173\362\161\165\361\061\306\363\165\146\372\121\050
+\106\204\227\170\064\274\154\374\274\105\131\210\046\030\112\304
+\067\037\241\112\104\275\343\161\004\365\104\027\342\077\374\110
+\130\157\134\236\172\011\272\121\067\042\043\146\103\041\260\074
+\144\242\370\152\025\016\077\353\121\341\124\251\335\006\231\327
+\232\074\124\213\071\003\077\017\305\316\306\353\203\162\002\250
+\037\161\363\055\370\165\010\333\142\114\350\372\316\371\347\152
+\037\266\153\065\202\272\342\217\026\222\175\005\014\154\106\003
+\135\300\355\151\277\072\301\212\240\350\216\331\271\105\050\207
+\010\354\264\312\025\276\202\335\265\104\213\055\255\206\014\150
+\142\155\205\126\362\254\024\143\072\306\321\231\254\064\170\126
+\113\317\266\255\077\214\212\327\004\345\343\170\114\365\206\252
+\365\217\372\075\154\161\243\055\312\147\353\150\173\156\063\251
+\014\202\050\250\114\152\041\100\025\040\014\046\133\203\302\251
+\026\025\300\044\202\135\053\026\255\312\143\366\164\000\260\337
+\103\304\020\140\126\147\143\105\002\003\001\000\001\243\201\377
+\060\201\374\060\017\006\003\125\035\023\001\001\377\004\005\060
+\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\215
+\262\111\150\235\162\010\045\271\300\047\365\120\223\126\110\106
+\161\371\217\060\016\006\003\125\035\017\001\001\377\004\004\003
+\002\001\006\060\066\006\003\125\035\021\004\057\060\055\201\023
+\143\141\157\160\145\162\141\164\157\162\100\144\151\163\151\147
+\056\163\153\206\026\150\164\164\160\072\057\057\167\167\167\056
+\144\151\163\151\147\056\163\153\057\143\141\060\146\006\003\125
+\035\037\004\137\060\135\060\055\240\053\240\051\206\047\150\164
+\164\160\072\057\057\167\167\167\056\144\151\163\151\147\056\163
+\153\057\143\141\057\143\162\154\057\143\141\137\144\151\163\151
+\147\056\143\162\154\060\054\240\052\240\050\206\046\150\164\164
+\160\072\057\057\143\141\056\144\151\163\151\147\056\163\153\057
+\143\141\057\143\162\154\057\143\141\137\144\151\163\151\147\056
+\143\162\154\060\032\006\003\125\035\040\004\023\060\021\060\017
+\006\015\053\201\036\221\223\346\012\000\000\000\001\001\001\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
+\001\001\000\135\064\164\141\114\257\073\330\377\237\155\130\066
+\034\075\013\201\015\022\053\106\020\200\375\347\074\047\320\172
+\310\251\266\176\164\060\063\243\072\212\173\164\300\171\171\102
+\223\155\377\261\051\024\202\253\041\214\057\027\371\077\046\057
+\365\131\306\357\200\006\267\232\111\051\354\316\176\161\074\152
+\020\101\300\366\323\232\262\174\132\221\234\300\254\133\310\115
+\136\367\341\123\377\103\167\374\236\113\147\154\327\363\203\321
+\240\340\177\045\337\270\230\013\232\062\070\154\060\240\363\377
+\010\025\063\367\120\112\173\076\243\076\040\251\334\057\126\200
+\012\355\101\120\260\311\364\354\262\343\046\104\000\016\157\236
+\006\274\042\226\123\160\145\304\120\012\106\153\244\057\047\201
+\022\047\023\137\020\241\166\316\212\173\067\352\303\071\141\003
+\225\230\072\347\154\210\045\010\374\171\150\015\207\175\142\370
+\264\137\373\305\330\114\275\130\274\077\103\133\324\036\001\115
+\074\143\276\043\357\214\315\132\120\270\150\124\371\012\231\063
+\021\000\341\236\302\106\167\202\365\131\006\214\041\114\207\011
+\315\345\250
+END
+
+# Trust for Certificate "CA Disig"
+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 "CA Disig"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\052\310\325\213\127\316\277\057\111\257\362\374\166\217\121\024
+\142\220\172\101
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\077\105\226\071\342\120\207\367\273\376\230\014\074\040\230\346
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\112\061\013\060\011\006\003\125\004\006\023\002\123\113\061
+\023\060\021\006\003\125\004\007\023\012\102\162\141\164\151\163
+\154\141\166\141\061\023\060\021\006\003\125\004\012\023\012\104
+\151\163\151\147\040\141\056\163\056\061\021\060\017\006\003\125
+\004\003\023\010\103\101\040\104\151\163\151\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Juur-SK"
+#
+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 "Juur-SK"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011
+\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011
+\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125
+\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163
+\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060
+\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011
+\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011
+\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125
+\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163
+\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060
+\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\073\216\113\374
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\346\060\202\003\316\240\003\002\001\002\002\004\073
+\216\113\374\060\015\006\011\052\206\110\206\367\015\001\001\005
+\005\000\060\135\061\030\060\026\006\011\052\206\110\206\367\015
+\001\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013
+\060\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006
+\003\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151
+\164\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061
+\020\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123
+\113\060\036\027\015\060\061\060\070\063\060\061\064\062\063\060
+\061\132\027\015\061\066\060\070\062\066\061\064\062\063\060\061
+\132\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001
+\011\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060
+\011\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003
+\125\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164
+\163\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020
+\060\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113
+\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001
+\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001
+\000\201\161\066\076\063\007\326\343\060\215\023\176\167\062\106
+\313\317\031\262\140\061\106\227\206\364\230\106\244\302\145\105
+\317\323\100\174\343\132\042\250\020\170\063\314\210\261\323\201
+\112\366\142\027\173\137\115\012\056\320\317\213\043\356\117\002
+\116\273\353\016\312\275\030\143\350\200\034\215\341\034\215\075
+\340\377\133\137\352\144\345\227\350\077\231\177\014\012\011\063
+\000\032\123\247\041\341\070\113\326\203\033\255\257\144\302\371
+\034\172\214\146\110\115\146\037\030\012\342\076\273\037\007\145
+\223\205\271\032\260\271\304\373\015\021\366\365\326\371\033\307
+\054\053\267\030\121\376\340\173\366\250\110\257\154\073\117\057
+\357\370\321\107\036\046\127\360\121\035\063\226\377\357\131\075
+\332\115\321\025\064\307\352\077\026\110\173\221\034\200\103\017
+\075\270\005\076\321\263\225\315\330\312\017\302\103\147\333\267
+\223\340\042\202\056\276\365\150\050\203\271\301\073\151\173\040
+\332\116\234\155\341\272\315\217\172\154\260\011\042\327\213\013
+\333\034\325\132\046\133\015\300\352\345\140\320\237\376\065\337
+\077\002\003\001\000\001\243\202\001\254\060\202\001\250\060\017
+\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060
+\202\001\026\006\003\125\035\040\004\202\001\015\060\202\001\011
+\060\202\001\005\006\012\053\006\001\004\001\316\037\001\001\001
+\060\201\366\060\201\320\006\010\053\006\001\005\005\007\002\002
+\060\201\303\036\201\300\000\123\000\145\000\145\000\040\000\163
+\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141
+\000\141\000\164\000\040\000\157\000\156\000\040\000\166\000\344
+\000\154\000\152\000\141\000\163\000\164\000\141\000\164\000\165
+\000\144\000\040\000\101\000\123\000\055\000\151\000\163\000\040
+\000\123\000\145\000\162\000\164\000\151\000\146\000\151\000\164
+\000\163\000\145\000\145\000\162\000\151\000\155\000\151\000\163
+\000\153\000\145\000\163\000\153\000\165\000\163\000\040\000\141
+\000\154\000\141\000\155\000\055\000\123\000\113\000\040\000\163
+\000\145\000\162\000\164\000\151\000\146\000\151\000\153\000\141
+\000\141\000\164\000\151\000\144\000\145\000\040\000\153\000\151
+\000\156\000\156\000\151\000\164\000\141\000\155\000\151\000\163
+\000\145\000\153\000\163\060\041\006\010\053\006\001\005\005\007
+\002\001\026\025\150\164\164\160\072\057\057\167\167\167\056\163
+\153\056\145\145\057\143\160\163\057\060\053\006\003\125\035\037
+\004\044\060\042\060\040\240\036\240\034\206\032\150\164\164\160
+\072\057\057\167\167\167\056\163\153\056\145\145\057\152\165\165
+\162\057\143\162\154\057\060\035\006\003\125\035\016\004\026\004
+\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030\077
+\157\357\351\175\276\060\037\006\003\125\035\043\004\030\060\026
+\200\024\004\252\172\107\243\344\211\257\032\317\012\100\247\030
+\077\157\357\351\175\276\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\346\060\015\006\011\052\206\110\206\367\015
+\001\001\005\005\000\003\202\001\001\000\173\301\030\224\123\242
+\011\363\376\046\147\232\120\344\303\005\057\053\065\170\221\114
+\174\250\021\021\171\114\111\131\254\310\367\205\145\134\106\273
+\073\020\240\002\257\315\117\265\314\066\052\354\135\376\357\240
+\221\311\266\223\157\174\200\124\354\307\010\160\015\216\373\202
+\354\052\140\170\151\066\066\321\305\234\213\151\265\100\310\224
+\145\167\362\127\041\146\073\316\205\100\266\063\143\032\277\171
+\036\374\134\035\323\035\223\033\213\014\135\205\275\231\060\062
+\030\011\221\122\351\174\241\272\377\144\222\232\354\376\065\356
+\214\057\256\374\040\206\354\112\336\033\170\062\067\246\201\322
+\235\257\132\022\026\312\231\133\374\157\155\016\305\240\036\206
+\311\221\320\134\230\202\137\143\014\212\132\253\330\225\246\314
+\313\212\326\277\144\113\216\312\212\262\260\351\041\062\236\252
+\250\205\230\064\201\071\041\073\250\072\122\062\075\366\153\067
+\206\006\132\025\230\334\360\021\146\376\064\040\267\003\364\101
+\020\175\071\204\171\226\162\143\266\226\002\345\153\271\255\031
+\115\273\306\104\333\066\313\052\234\216
+END
+
+# Trust for Certificate "Juur-SK"
+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 "Juur-SK"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\100\235\113\331\027\265\134\047\266\233\144\313\230\042\104\015
+\315\011\270\211
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\252\216\135\331\370\333\012\130\267\215\046\207\154\202\065\125
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\135\061\030\060\026\006\011\052\206\110\206\367\015\001\011
+\001\026\011\160\153\151\100\163\153\056\145\145\061\013\060\011
+\006\003\125\004\006\023\002\105\105\061\042\060\040\006\003\125
+\004\012\023\031\101\123\040\123\145\162\164\151\146\151\164\163
+\145\145\162\151\155\151\163\153\145\163\153\165\163\061\020\060
+\016\006\003\125\004\003\023\007\112\165\165\162\055\123\113
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\073\216\113\374
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Hongkong Post Root CA 1"
+#
+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 "Hongkong Post Root CA 1"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061
+\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157
+\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003
+\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040
+\122\157\157\164\040\103\101\040\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061
+\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157
+\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003
+\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040
+\122\157\157\164\040\103\101\040\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\002\003\350
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\060\060\202\002\030\240\003\002\001\002\002\002\003
+\350\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000
+\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061
+\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157
+\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003
+\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040
+\122\157\157\164\040\103\101\040\061\060\036\027\015\060\063\060
+\065\061\065\060\065\061\063\061\064\132\027\015\062\063\060\065
+\061\065\060\064\065\062\062\071\132\060\107\061\013\060\011\006
+\003\125\004\006\023\002\110\113\061\026\060\024\006\003\125\004
+\012\023\015\110\157\156\147\153\157\156\147\040\120\157\163\164
+\061\040\060\036\006\003\125\004\003\023\027\110\157\156\147\153
+\157\156\147\040\120\157\163\164\040\122\157\157\164\040\103\101
+\040\061\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
+\001\001\000\254\377\070\266\351\146\002\111\343\242\264\341\220
+\371\100\217\171\371\342\275\171\376\002\275\356\044\222\035\042
+\366\332\205\162\151\376\327\077\011\324\335\221\265\002\234\320
+\215\132\341\125\303\120\206\271\051\046\302\343\331\240\361\151
+\003\050\040\200\105\042\055\126\247\073\124\225\126\042\131\037
+\050\337\037\040\075\155\242\066\276\043\240\261\156\265\261\047
+\077\071\123\011\352\253\152\350\164\262\302\145\134\216\277\174
+\303\170\204\315\236\026\374\365\056\117\040\052\010\237\167\363
+\305\036\304\232\122\146\036\110\136\343\020\006\217\042\230\341
+\145\216\033\135\043\146\073\270\245\062\121\310\206\252\241\251
+\236\177\166\224\302\246\154\267\101\360\325\310\006\070\346\324
+\014\342\363\073\114\155\120\214\304\203\047\301\023\204\131\075
+\236\165\164\266\330\002\136\072\220\172\300\102\066\162\354\152
+\115\334\357\304\000\337\023\030\127\137\046\170\310\326\012\171
+\167\277\367\257\267\166\271\245\013\204\027\135\020\352\157\341
+\253\225\021\137\155\074\243\134\115\203\133\362\263\031\212\200
+\213\013\207\002\003\001\000\001\243\046\060\044\060\022\006\003
+\125\035\023\001\001\377\004\010\060\006\001\001\377\002\001\003
+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\306
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
+\202\001\001\000\016\106\325\074\256\342\207\331\136\201\213\002
+\230\101\010\214\114\274\332\333\356\047\033\202\347\152\105\354
+\026\213\117\205\240\363\262\160\275\132\226\272\312\156\155\356
+\106\213\156\347\052\056\226\263\031\063\353\264\237\250\262\067
+\356\230\250\227\266\056\266\147\047\324\246\111\375\034\223\145
+\166\236\102\057\334\042\154\232\117\362\132\025\071\261\161\327
+\053\121\350\155\034\230\300\331\052\364\241\202\173\325\311\101
+\242\043\001\164\070\125\213\017\271\056\147\242\040\004\067\332
+\234\013\323\027\041\340\217\227\171\064\157\204\110\002\040\063
+\033\346\064\104\237\221\160\364\200\136\204\103\302\051\322\154
+\022\024\344\141\215\254\020\220\236\204\120\273\360\226\157\105
+\237\212\363\312\154\117\372\021\072\025\025\106\303\315\037\203
+\133\055\101\022\355\120\147\101\023\075\041\253\224\212\252\116
+\174\301\261\373\247\326\265\047\057\227\253\156\340\035\342\321
+\034\054\037\104\342\374\276\221\241\234\373\326\051\123\163\206
+\237\123\330\103\016\135\326\143\202\161\035\200\164\312\366\342
+\002\153\331\132
+END
+
+# Trust for Certificate "Hongkong Post Root CA 1"
+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 "Hongkong Post Root CA 1"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\326\332\250\040\215\011\322\025\115\044\265\057\313\064\156\262
+\130\262\212\130
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\250\015\157\071\170\271\103\155\167\102\155\230\132\314\043\312
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\107\061\013\060\011\006\003\125\004\006\023\002\110\113\061
+\026\060\024\006\003\125\004\012\023\015\110\157\156\147\153\157
+\156\147\040\120\157\163\164\061\040\060\036\006\003\125\004\003
+\023\027\110\157\156\147\153\157\156\147\040\120\157\163\164\040
+\122\157\157\164\040\103\101\040\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\002\003\350
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "SecureSign RootCA11"
+#
+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 "SecureSign RootCA11"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145
+\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032
+\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147
+\156\040\122\157\157\164\103\101\061\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145
+\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032
+\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147
+\156\040\122\157\157\164\103\101\061\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\155\060\202\002\125\240\003\002\001\002\002\001\001
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061\053
+\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145\162
+\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032\006
+\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147\156
+\040\122\157\157\164\103\101\061\061\060\036\027\015\060\071\060
+\064\060\070\060\064\065\066\064\067\132\027\015\062\071\060\064
+\060\070\060\064\065\066\064\067\132\060\130\061\013\060\011\006
+\003\125\004\006\023\002\112\120\061\053\060\051\006\003\125\004
+\012\023\042\112\141\160\141\156\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\123\145\162\166\151\143\145\163\054
+\040\111\156\143\056\061\034\060\032\006\003\125\004\003\023\023
+\123\145\143\165\162\145\123\151\147\156\040\122\157\157\164\103
+\101\061\061\060\202\001\042\060\015\006\011\052\206\110\206\367
+\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
+\202\001\001\000\375\167\252\245\034\220\005\073\313\114\233\063
+\213\132\024\105\244\347\220\026\321\337\127\322\041\020\244\027
+\375\337\254\326\037\247\344\333\174\367\354\337\270\003\332\224
+\130\375\135\162\174\214\077\137\001\147\164\025\226\343\002\074
+\207\333\256\313\001\216\302\363\146\306\205\105\364\002\306\072
+\265\142\262\257\372\234\277\244\346\324\200\060\230\363\015\266
+\223\217\251\324\330\066\362\260\374\212\312\054\241\025\063\225
+\061\332\300\033\362\356\142\231\206\143\077\277\335\223\052\203
+\250\166\271\023\037\267\316\116\102\205\217\042\347\056\032\362
+\225\011\262\005\265\104\116\167\241\040\275\251\362\116\012\175
+\120\255\365\005\015\105\117\106\161\375\050\076\123\373\004\330
+\055\327\145\035\112\033\372\317\073\260\061\232\065\156\310\213
+\006\323\000\221\362\224\010\145\114\261\064\006\000\172\211\342
+\360\307\003\131\317\325\326\350\247\062\263\346\230\100\206\305
+\315\047\022\213\314\173\316\267\021\074\142\140\007\043\076\053
+\100\156\224\200\011\155\266\263\157\167\157\065\010\120\373\002
+\207\305\076\211\002\003\001\000\001\243\102\060\100\060\035\006
+\003\125\035\016\004\026\004\024\133\370\115\117\262\245\206\324
+\072\322\361\143\232\240\276\011\366\127\267\336\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\015\006
+\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001
+\000\240\241\070\026\146\056\247\126\037\041\234\006\372\035\355
+\271\042\305\070\046\330\116\117\354\243\177\171\336\106\041\241
+\207\167\217\007\010\232\262\244\305\257\017\062\230\013\174\146
+\051\266\233\175\045\122\111\103\253\114\056\053\156\172\160\257
+\026\016\343\002\154\373\102\346\030\235\105\330\125\310\350\073
+\335\347\341\364\056\013\034\064\134\154\130\112\373\214\210\120
+\137\225\034\277\355\253\042\265\145\263\205\272\236\017\270\255
+\345\172\033\212\120\072\035\275\015\274\173\124\120\013\271\102
+\257\125\240\030\201\255\145\231\357\276\344\234\277\304\205\253
+\101\262\124\157\334\045\315\355\170\342\216\014\215\011\111\335
+\143\173\132\151\226\002\041\250\275\122\131\351\175\065\313\310
+\122\312\177\201\376\331\153\323\367\021\355\045\337\370\347\371
+\244\372\162\227\204\123\015\245\320\062\030\121\166\131\024\154
+\017\353\354\137\200\214\165\103\203\303\205\230\377\114\236\055
+\015\344\167\203\223\116\265\226\007\213\050\023\233\214\031\215
+\101\047\111\100\356\336\346\043\104\071\334\241\042\326\272\003
+\362
+END
+
+# Trust for Certificate "SecureSign RootCA11"
+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 "SecureSign RootCA11"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\073\304\237\110\370\363\163\240\234\036\275\370\133\261\303\145
+\307\330\021\263
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\267\122\164\342\222\264\200\223\362\165\344\314\327\362\352\046
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\130\061\013\060\011\006\003\125\004\006\023\002\112\120\061
+\053\060\051\006\003\125\004\012\023\042\112\141\160\141\156\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145
+\162\166\151\143\145\163\054\040\111\156\143\056\061\034\060\032
+\006\003\125\004\003\023\023\123\145\143\165\162\145\123\151\147
+\156\040\122\157\157\164\103\101\061\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -72,18 +72,18 @@
  *     ...
  *   - NSS 3.29 branch: 250-255
  *
  * NSS_BUILTINS_LIBRARY_VERSION_MINOR is a CK_BYTE.  It's not clear
  * whether we may use its full range (0-255) or only 0-99 because
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 77
-#define NSS_BUILTINS_LIBRARY_VERSION "1.77"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 78
+#define NSS_BUILTINS_LIBRARY_VERSION "1.78"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
 #define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0
 
 /* These version numbers detail the semantic changes to ckbi itself 
  * (new PKCS #11 objects), etc. */
 #define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -31,17 +31,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nss.h,v 1.76 2010/02/11 19:12:45 christophe.ravel.bugs%sun.com Exp $ */
+/* $Id: nss.h,v 1.78 2010/03/02 02:53:04 christophe.ravel.bugs%sun.com Exp $ */
 
 #ifndef __nss_h_
 #define __nss_h_
 
 /* The private macro _NSS_ECC_STRING is for NSS internal use only. */
 #ifdef NSS_ENABLE_ECC
 #ifdef NSS_ECC_MORE_THAN_SUITE_B
 #define _NSS_ECC_STRING " Extended ECC"
@@ -61,21 +61,21 @@
 
 /*
  * NSS's major version, minor version, patch level, build number, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.12.6.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.12.6.2" _NSS_ECC_STRING _NSS_CUSTOMIZED
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   12
 #define NSS_VPATCH   6
-#define NSS_VBUILD   0
+#define NSS_VBUILD   2
 #define NSS_BETA     PR_FALSE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
 typedef struct NSSInitParametersStr NSSInitParameters;
 
--- a/security/nss/lib/ssl/ssl.h
+++ b/security/nss/lib/ssl/ssl.h
@@ -31,17 +31,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl.h,v 1.36 2010/02/10 18:07:21 wtc%google.com Exp $ */
+/* $Id: ssl.h,v 1.38 2010/02/17 02:29:07 wtc%google.com Exp $ */
 
 #ifndef __ssl_h_
 #define __ssl_h_
 
 #include "prtypes.h"
 #include "prerror.h"
 #include "prio.h"
 #include "seccomon.h"
@@ -118,17 +118,17 @@ SSL_IMPORT PRFileDesc *SSL_ImportFD(PRFi
 					  /* step-down keys if needed.      */
 #define SSL_BYPASS_PKCS11              16 /* use PKCS#11 for pub key only   */
 #define SSL_NO_LOCKS                   17 /* Don't use locks for protection */
 #define SSL_ENABLE_SESSION_TICKETS     18 /* Enable TLS SessionTicket       */
                                           /* extension (off by default)     */
 #define SSL_ENABLE_DEFLATE             19 /* Enable TLS compression with    */
                                           /* DEFLATE (off by default)       */
 #define SSL_ENABLE_RENEGOTIATION       20 /* Values below (default: never)  */
-#define SSL_REQUIRE_SAFE_NEGOTIATION   21 /* Peer must send Signalling      */
+#define SSL_REQUIRE_SAFE_NEGOTIATION   21 /* Peer must send Signaling       */
 					  /* Cipher Suite Value (SCSV) or   */
                                           /* Renegotiation  Info (RI)       */
 					  /* extension in ALL handshakes.   */
                                           /* default: off                   */
 
 #ifdef SSL_DEPRECATED_FUNCTION 
 /* Old deprecated function names */
 SSL_IMPORT SECStatus SSL_Enable(PRFileDesc *fd, int option, PRBool on);
@@ -179,19 +179,21 @@ SSL_IMPORT SECStatus SSL_CipherPolicyGet
 /* Never renegotiate at all.                                               */
 #define SSL_RENEGOTIATE_NEVER        ((PRBool)0)
 /* Renegotiate without restriction, whether or not the peer's client hello */
 /* bears the renegotiation info extension.  Vulnerable, as in the past.    */
 #define SSL_RENEGOTIATE_UNRESTRICTED ((PRBool)1)
 /* Only renegotiate if the peer's hello bears the TLS renegotiation_info   */
 /* extension. This is safe renegotiation.                                  */
 #define SSL_RENEGOTIATE_REQUIRES_XTN ((PRBool)2) 
-/* Disallow all renegotiation in server sockets only, but allow clients    */
+/* Disallow unsafe renegotiation in server sockets only, but allow clients */
 /* to continue to renegotiate with vulnerable servers.                     */
-#define SSL_RENEGOTIATE_CLIENT_ONLY  ((PRBool)3)
+/* This value should only be used during the transition period when few    */
+/* servers have been upgraded.                                             */
+#define SSL_RENEGOTIATE_TRANSITIONAL ((PRBool)3)
 
 /*
 ** Reset the handshake state for fd. This will make the complete SSL
 ** handshake protocol execute from the ground up on the next i/o
 ** operation.
 */
 SSL_IMPORT SECStatus SSL_ResetHandshake(PRFileDesc *fd, PRBool asServer);
 
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -34,17 +34,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl3con.c,v 1.134 2010/02/03 03:44:29 wtc%google.com Exp $ */
+/* $Id: ssl3con.c,v 1.136 2010/02/17 02:29:07 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
 #include "cryptohi.h"	/* for DSAU_ stuff */
 #include "keyhi.h"
 #include "secder.h"
 #include "secitem.h"
 
@@ -3950,17 +3950,17 @@ ssl3_SendClientHello(sslSocket *ss)
 
     rv = ssl3_AppendHandshakeNumber(ss, num_suites*sizeof(ssl3CipherSuite), 2);
     if (rv != SECSuccess) {
 	return rv;	/* err set by ssl3_AppendHandshake* */
     }
 
     if (ss->ssl3.hs.sendingSCSV) {
 	/* Add the actual SCSV */
-	rv = ssl3_AppendHandshakeNumber(ss, TLS_RENEGO_PROTECTION_REQUEST,
+	rv = ssl3_AppendHandshakeNumber(ss, TLS_EMPTY_RENEGOTIATION_INFO_SCSV,
 					sizeof(ssl3CipherSuite));
 	if (rv != SECSuccess) {
 	    return rv;	/* err set by ssl3_AppendHandshake* */
 	}
 	actual_count++;
     }
     for (i = 0; i < ssl_V3_SUITES_IMPLEMENTED; i++) {
 	ssl3CipherSuiteCfg *suite = &ss->cipherSuites[i];
@@ -5968,18 +5968,17 @@ ssl3_HandleClientHello(sslSocket *ss, SS
 
     if ((ss->ssl3.hs.ws != wait_client_hello) &&
 	(ss->ssl3.hs.ws != idle_handshake)) {
 	desc    = unexpected_message;
 	errCode = SSL_ERROR_RX_UNEXPECTED_CLIENT_HELLO;
 	goto alert_loser;
     }
     if (ss->ssl3.hs.ws == idle_handshake  &&
-        (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER ||
-         ss->opt.enableRenegotiation == SSL_RENEGOTIATE_CLIENT_ONLY)) {
+        ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER) {
 	desc    = no_renegotiation;
 	level   = alert_warning;
 	errCode = SSL_ERROR_RENEGOTIATION_NOT_ALLOWED;
 	goto alert_loser;
     }
 
     tmp = ssl3_ConsumeHandshakeNumber(ss, 2, &b, &length);
     if (tmp < 0)
@@ -6045,26 +6044,27 @@ ssl3_HandleClientHello(sslSocket *ss, SS
     }
     if (!ssl3_ExtensionNegotiated(ss, ssl_renegotiation_info_xtn)) {
     	/* If we didn't receive an RI extension, look for the SCSV,
 	 * and if found, treat it just like an empty RI extension
 	 * by processing a local copy of an empty RI extension.
 	 */
 	for (i = 0; i + 1 < suites.len; i += 2) {
 	    PRUint16 suite_i = (suites.data[i] << 8) | suites.data[i + 1];
-	    if (suite_i == TLS_RENEGO_PROTECTION_REQUEST) {
+	    if (suite_i == TLS_EMPTY_RENEGOTIATION_INFO_SCSV) {
 		SSL3Opaque * b2 = (SSL3Opaque *)emptyRIext;
 		PRUint32     L2 = sizeof emptyRIext;
 		(void)ssl3_HandleHelloExtensions(ss, &b2, &L2);
 	    	break;
 	    }
 	}
     }
     if (ss->firstHsDone &&
-        ss->opt.enableRenegotiation == SSL_RENEGOTIATE_REQUIRES_XTN && 
+        (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_REQUIRES_XTN ||
+        ss->opt.enableRenegotiation == SSL_RENEGOTIATE_TRANSITIONAL) && 
 	!ssl3_ExtensionNegotiated(ss, ssl_renegotiation_info_xtn)) {
 	desc    = no_renegotiation;
 	level   = alert_warning;
 	errCode = SSL_ERROR_RENEGOTIATION_NOT_ALLOWED;
 	goto alert_loser;
     }
     if ((ss->opt.requireSafeNegotiation || 
          (ss->firstHsDone && ss->peerRequestedProtection)) &&
@@ -6759,17 +6759,17 @@ ssl3_HandleV2ClientHello(sslSocket *ss, 
 
 suite_found:
 
     /* Look for the SCSV, and if found, treat it just like an empty RI 
      * extension by processing a local copy of an empty RI extension.
      */
     for (i = 0; i+2 < suite_length; i += 3) {
 	PRUint32 suite_i = (suites[i] << 16) | (suites[i+1] << 8) | suites[i+2];
-	if (suite_i == TLS_RENEGO_PROTECTION_REQUEST) {
+	if (suite_i == TLS_EMPTY_RENEGOTIATION_INFO_SCSV) {
 	    SSL3Opaque * b2 = (SSL3Opaque *)emptyRIext;
 	    PRUint32     L2 = sizeof emptyRIext;
 	    (void)ssl3_HandleHelloExtensions(ss, &b2, &L2);
 	    break;
 	}
     }
 
     if (ss->opt.requireSafeNegotiation &&
@@ -9385,19 +9385,17 @@ ssl3_RedoHandshake(sslSocket *ss, PRBool
 
     if (!ss->firstHsDone ||
         ((ss->version >= SSL_LIBRARY_VERSION_3_0) &&
 	 ss->ssl3.initialized && 
 	 (ss->ssl3.hs.ws != idle_handshake))) {
 	PORT_SetError(SSL_ERROR_HANDSHAKE_NOT_COMPLETED);
 	return SECFailure;
     }
-    if (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER ||
-       (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_CLIENT_ONLY &&
-        ss->sec.isServer)) {
+    if (ss->opt.enableRenegotiation == SSL_RENEGOTIATE_NEVER) {
 	PORT_SetError(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED);
 	return SECFailure;
     }
     if (sid && flushCache) {
 	ss->sec.uncache(sid);	/* remove it from whichever cache it's in. */
 	ssl_FreeSID(sid);	/* dec ref count and free if zero. */
 	ss->sec.ci.sid = NULL;
     }
--- a/security/nss/lib/ssl/ssl3ext.c
+++ b/security/nss/lib/ssl/ssl3ext.c
@@ -36,17 +36,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /* TLS extension code moved here from ssl3ecc.c */
-/* $Id: ssl3ext.c,v 1.11 2010/02/03 02:38:20 wtc%google.com Exp $ */
+/* $Id: ssl3ext.c,v 1.13 2010/03/01 20:03:45 alexei.volkov.bugs%sun.com Exp $ */
 
 #include "nssrenam.h"
 #include "nss.h"
 #include "ssl.h"
 #include "sslproto.h"
 #include "sslimpl.h"
 #include "pk11pub.h"
 #include "blapi.h"
@@ -1496,18 +1496,18 @@ ssl3_HandleRenegotiationInfoXtn(sslSocke
     if (ss->firstHsDone) {
 	len = ss->sec.isServer ? ss->ssl3.hs.finishedBytes 
 	                       : ss->ssl3.hs.finishedBytes * 2;
     }
     if (data->len != 1 + len  ||
 	data->data[0] != len  || (len && 
 	NSS_SecureMemcmp(ss->ssl3.hs.finishedMsgs.data,
 	                 data->data + 1, len))) {
-	/* Can we do this here? Or, must we arrange for the caller to do it? */
-	(void)SSL3_SendAlert(ss, alert_fatal, handshake_failure);
+	/* Can we do this here? Or, must we arrange for the caller to do it? */     
+	(void)SSL3_SendAlert(ss, alert_fatal, handshake_failure);                   
 	PORT_SetError(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE);
 	return SECFailure;
     }
     /* remember that we got this extension and it was correct. */
     ss->peerRequestedProtection = 1;
     ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
     if (ss->sec.isServer) {
 	/* prepare to send back the appropriate response */
--- a/security/nss/lib/ssl/sslproto.h
+++ b/security/nss/lib/ssl/sslproto.h
@@ -34,17 +34,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslproto.h,v 1.14 2010/01/28 06:19:12 nelson%bolyard.com Exp $ */
+/* $Id: sslproto.h,v 1.15 2010/02/16 18:56:48 wtc%google.com Exp $ */
 
 #ifndef __sslproto_h_
 #define __sslproto_h_
 
 /* All versions less than 3_0 are treated as SSL version 2 */
 #define SSL_LIBRARY_VERSION_2			0x0002
 #define SSL_LIBRARY_VERSION_3_0			0x0300
 #define SSL_LIBRARY_VERSION_3_1_TLS		0x0301
@@ -176,21 +176,21 @@
 #define TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA   	0x0085
 #define TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA   	0x0086
 #define TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA  	0x0087
 #define TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA  	0x0088
 #define TLS_DH_ANON_WITH_CAMELLIA_256_CBC_SHA  	0x0089
 
 #define TLS_RSA_WITH_SEED_CBC_SHA		0x0096
 
-/* TLS "Signalling Cipher Suite Value" (SCSV). May be requested by client.
+/* TLS "Signaling Cipher Suite Value" (SCSV). May be requested by client.
  * Must NEVER be chosen by server.  SSL 3.0 server acknowledges by sending
  * back an empty Renegotiation Info (RI) server hello extension.
  */
-#define TLS_RENEGO_PROTECTION_REQUEST		0x00FF
+#define TLS_EMPTY_RENEGOTIATION_INFO_SCSV	0x00FF
 
 /* Cipher Suite Values starting with 0xC000 are defined in informational
  * RFCs.
  */
 #define TLS_ECDH_ECDSA_WITH_NULL_SHA            0xC001
 #define TLS_ECDH_ECDSA_WITH_RC4_128_SHA         0xC002
 #define TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA    0xC003
 #define TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA     0xC004
--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@@ -35,17 +35,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsock.c,v 1.64 2010/01/28 06:19:13 nelson%bolyard.com Exp $ */
+/* $Id: sslsock.c,v 1.66 2010/02/26 20:44:54 alexei.volkov.bugs%sun.com Exp $ */
 #include "seccomon.h"
 #include "cert.h"
 #include "keyhi.h"
 #include "ssl.h"
 #include "sslimpl.h"
 #include "sslproto.h"
 #include "nspr.h"
 #include "private/pprio.h"
@@ -2294,20 +2294,20 @@ ssl_NewSocket(PRBool makeLocks)
 	    SSL_TRACE(("SSL: force_locks set to %d", ssl_force_locks));
 	}
 	ev = getenv("NSS_SSL_ENABLE_RENEGOTIATION");
 	if (ev) {
 	    if (ev[0] == '1' || LOWER(ev[0]) == 'u')
 	    	ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_UNRESTRICTED;
 	    else if (ev[0] == '0' || LOWER(ev[0]) == 'n')
 	    	ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_NEVER;
-	    else if (ev[0] == '3' || LOWER(ev[0]) == 'c')
-	    	ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_CLIENT_ONLY;
-	    else
-	    	ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_REQUIRES_XTN;
+	    else if (ev[0] == '2' || LOWER(ev[0]) == 'r')
+		ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_REQUIRES_XTN;
+	    else if (ev[0] == '3' || LOWER(ev[0]) == 't')
+	    	ssl_defaults.enableRenegotiation = SSL_RENEGOTIATE_TRANSITIONAL;
 	    SSL_TRACE(("SSL: enableRenegotiation set to %d", 
 	               ssl_defaults.enableRenegotiation));
 	}
 	ev = getenv("NSS_SSL_REQUIRE_SAFE_NEGOTIATION");
 	if (ev && ev[0] == '1') {
 	    ssl_defaults.requireSafeNegotiation = PR_TRUE;
 	    SSL_TRACE(("SSL: requireSafeNegotiation set to %d", 
 	                PR_TRUE));
--- a/security/nss/lib/sysinit/config.mk
+++ b/security/nss/lib/sysinit/config.mk
@@ -105,17 +105,8 @@ endif
 ifeq ($(OS_ARCH), HP-UX) 
 ifneq ($(OS_TEST), ia64)
 # pa-risc
 ifeq ($(USE_64), 1)
 MKSHLIB += +b '$$ORIGIN'
 endif
 endif
 endif
-
-ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
-ifndef NS_USE_GCC
-# Export 'mktemp' to be backward compatible with NSS 3.2.x and 3.3.x
-# but do not put it in the import library.  See bug 142575.
-DEFINES += -DWIN32_NSS3_DLL_COMPAT
-DLLFLAGS += -EXPORT:mktemp=nss_mktemp,PRIVATE
-endif
-endif
--- a/security/nss/lib/sysinit/manifest.mn
+++ b/security/nss/lib/sysinit/manifest.mn
@@ -37,12 +37,11 @@
 
 CORE_DEPTH	= ../../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = nsssysinit.c
 
-LIBRARY = nsssysinit
 LIBRARY_NAME = nsssysinit
 #LIBRARY_VERSION = 3
 
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -46,16 +46,16 @@
 
 /*
  * NSS utilities's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.12.6.0"
+#define NSSUTIL_VERSION  "3.12.6.2"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   12
 #define NSSUTIL_VPATCH   6
-#define NSSUTIL_VBUILD   0
+#define NSSUTIL_VBUILD   2
 #define NSSUTIL_BETA     PR_FALSE
 
 #endif /* __nssutil_h_ */
--- a/security/nss/tests/chains/chains.sh
+++ b/security/nss/tests/chains/chains.sh
@@ -1054,17 +1054,17 @@ parse_config()
 
 ############################# chains_main ##############################
 # local shell function to process all testing scenarios
 ########################################################################
 chains_main()
 {
     while read LINE 
     do
-        [ `echo ${LINE} | cut -b 1` == "#" ] && continue
+        [ `echo ${LINE} | cut -b 1` != "#" ] || continue
 
         > ${AIA_FILES}
 
         parse_config < "${QADIR}/chains/scenarios/${LINE}"
 
         while read AIA_FILE
         do
             rm ${AIA_FILE} 2> /dev/null
--- a/security/nss/tests/fips/fips.sh
+++ b/security/nss/tests/fips/fips.sh
@@ -255,17 +255,17 @@ fips_140()
   # is needed to copy files one by one. 
   echo "mkdir ${MANGLEDIR}"
   mkdir ${MANGLEDIR}
   for lib in `ls ${LIBDIR}`; do
     echo "cp ${LIBDIR}/${lib} ${MANGLEDIR}"
     cp ${LIBDIR}/${lib} ${MANGLEDIR}
   done
     
-  echo "$SCRIPTNAME: Detect mangled database --------------------------"
+  echo "$SCRIPTNAME: Detect mangled softoken--------------------------"
   SOFTOKEN=${MANGLEDIR}/${DLL_PREFIX}softokn3.${DLL_SUFFIX}
 
   echo "mangling ${SOFTOKEN}"
   echo "mangle -i ${SOFTOKEN} -o -8 -b 5"
   ${BINDIR}/mangle -i ${SOFTOKEN} -o -8 -b 5 2>&1
   if [ $? -eq 0 ]; then
     if [ "${OS_ARCH}" = "WINNT" ]; then
       DBTEST=`which dbtest`
@@ -291,17 +291,17 @@ fips_140()
     else
       echo "LD_LIBRARY_PATH=${MANGLEDIR} dbtest -r -d ${P_R_FIPSDIR}"
       LD_LIBRARY_PATH="${MANGLEDIR}" ${BINDIR}/dbtest -r -d ${P_R_FIPSDIR} > ${TMP}/dbtestoutput.txt 2>&1
       RESULT=$?
     fi  
 
     html_msg ${RESULT} 46 "Init NSS with a corrupted library (dbtest -r)" "."
   else
-    html_msg 0 0 "Skipping corruption test, can't open ${DLL_PREFIX}softokn3.${DLL_SUFFIX}"
+    html_failed "Mangle ${DLL_PREFIX}softokn3.${DLL_SUFFIX}"
   fi
 }
 
 ############################## fips_cleanup ############################
 # local shell function to finish this script (no exit since it might be 
 # sourced)
 ########################################################################
 fips_cleanup()
--- a/security/nss/tests/memleak/ignored
+++ b/security/nss/tests/memleak/ignored
@@ -42,16 +42,17 @@
 **/_PR_InitLinker/**
 **/_PR_InitTPD/**
 **/_PR_InitZones/pr_FindSymbolInProg/**
 **/_PR_UnixInit/PR_NewLock/**
 **/_PR_UnixInit/PR_NewMonitor/**
 
 #367376
 **/_PR_CreateThread/pthread_create@@GLIBC_2.1/**
+**/_PR_CreateThread/PR_Calloc/**
 
 #367384
 **/PR_LoadLibraryWithFlags/**
 **/pr_LoadLibraryByPathname/**
 **/PR_LoadLibrary/**
 
 #397487
 **/__rpc_getconfip/setnetconfig/**
new file mode 100644
--- /dev/null
+++ b/security/patches/README
@@ -0,0 +1,7 @@
+This directory contains patches that were added locally
+on top of the NSS release.
+
+File: bug-519550.patch
+https://bugzilla.mozilla.org/show_bug.cgi?id=519550
+Changes NSS makefiles to link against Mozilla's sqlite library,
+which uses a different filename (prefixed by "moz").
new file mode 100644
--- /dev/null
+++ b/security/patches/bug-519550.patch
@@ -0,0 +1,62 @@
+diff -up security/nss/cmd/platlibs.mk.pre519550 security/nss/cmd/platlibs.mk
+--- security/nss/cmd/platlibs.mk.pre519550	2010-02-06 16:46:29.118236532 +0100
++++ security/nss/cmd/platlibs.mk	2010-02-06 16:38:20.588959438 +0100
+@@ -110,6 +110,7 @@ PKIXLIB = \
+ 
+ # can't do this in manifest.mn because OS_ARCH isn't defined there.
+ ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) 
++SQLITE = $(LIB_PREFIX)sqlite3.$(LIB_SUFFIX)
+ 
+ EXTRA_LIBS += \
+ 	$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
+@@ -130,7 +131,7 @@ EXTRA_LIBS += \
+ 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
+ 	$(PKIXLIB) \
+ 	$(DBMLIB) \
+-	$(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
++	$(DIST)/lib/$(SQLITE) \
+ 	$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
+ 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+ 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+diff -up security/nss/lib/softoken/config.mk.pre519550 security/nss/lib/softoken/config.mk
+--- security/nss/lib/softoken/config.mk.pre519550	2010-02-06 16:46:44.701986018 +0100
++++ security/nss/lib/softoken/config.mk	2010-02-06 16:51:10.634999945 +0100
+@@ -53,11 +53,12 @@ RES = $(OBJDIR)/$(LIBRARY_NAME).res
+ RESNAME = $(LIBRARY_NAME).rc
+ 
+ ifdef NS_USE_GCC
++SQLITE = -lsqlite3
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+-	-lsqlite3 \
++	$(SQLITE) \
+ 	-L$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+@@ -65,8 +66,9 @@ EXTRA_SHARED_LIBS += \
+ 	$(NULL)
+ else # ! NS_USE_GCC
+ 
++SQLITE = sqlite3.lib
+ EXTRA_SHARED_LIBS += \
+-	$(DIST)/lib/sqlite3.lib \
++	$(DIST)/lib/$(SQLITE) \
+ 	$(DIST)/lib/nssutil3.lib \
+ 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
+ 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
+@@ -79,11 +81,12 @@ else
+ 
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
++SQLITE = -lsqlite3
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+-	-lsqlite3 \
++	$(SQLITE) \
+ 	-L$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \