Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge in fixes for bug 689375, bug 698753, and bug 687367 to release …

…branch, a=alexk

--HG--
branch : MOBILE80_2011103117_RELBRANCH
  • Loading branch information...
commit 5b297a20ab8aa9a437aa4472d4074248b146bd88 2 parents 9131c3d + 793d185
Brian Smith authored November 02, 2011
2  netwerk/dns/nsHostResolver.cpp
@@ -85,8 +85,6 @@ using namespace mozilla;
85 85
 // ShortIdleTimeoutSeconds of idle time. Smaller pools use LongIdleTimeoutSeconds for a 
86 86
 // timeout period.
87 87
 
88  
-#define MAX_NON_PRIORITY_REQUESTS 150
89  
-
90 88
 #define HighThreadThreshold     MAX_RESOLVER_THREADS_FOR_ANY_PRIORITY
91 89
 #define LongIdleTimeoutSeconds  300           // for threads 1 -> HighThreadThreshold
92 90
 #define ShortIdleTimeoutSeconds 60            // for threads HighThreadThreshold+1 -> MAX_RESOLVER_THREADS
12  netwerk/dns/nsHostResolver.h
@@ -71,8 +71,20 @@ class nsResolveHostCallback;
71 71
         return n;                                                            \
72 72
     }
73 73
 
  74
+#ifdef ANDROID
  75
+// See bug 687367 - pre gingerbread android has race conditions involving stdio.
  76
+// stdio is used as part of the getaddrinfo() implementation. In order to reduce
  77
+// that race window limit ourselves to 1 lookup at a time on android.
  78
+
  79
+#define MAX_RESOLVER_THREADS_FOR_ANY_PRIORITY  0
  80
+#define MAX_RESOLVER_THREADS_FOR_HIGH_PRIORITY 1
  81
+#define MAX_NON_PRIORITY_REQUESTS 0
  82
+#else
74 83
 #define MAX_RESOLVER_THREADS_FOR_ANY_PRIORITY  3
75 84
 #define MAX_RESOLVER_THREADS_FOR_HIGH_PRIORITY 5
  85
+#define MAX_NON_PRIORITY_REQUESTS 150
  86
+#endif
  87
+
76 88
 #define MAX_RESOLVER_THREADS (MAX_RESOLVER_THREADS_FOR_ANY_PRIORITY + \
77 89
                               MAX_RESOLVER_THREADS_FOR_HIGH_PRIORITY)
78 90
 
282  security/nss/lib/ckfw/builtins/certdata.c
@@ -1075,6 +1075,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_338 [] = {
1075 1075
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_339 [] = {
1076 1076
  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
1077 1077
 };
  1078
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_340 [] = {
  1079
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
  1080
+};
  1081
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_341 [] = {
  1082
+ 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
  1083
+};
  1084
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_342 [] = {
  1085
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
  1086
+};
  1087
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_343 [] = {
  1088
+ 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
  1089
+};
1078 1090
 #ifdef DEBUG
1079 1091
 static const NSSItem nss_builtins_items_0 [] = {
1080 1092
   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -22600,6 +22612,266 @@ static const NSSItem nss_builtins_items_339 [] = {
22600 22612
   { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
22601 22613
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
22602 22614
 };
  22615
+static const NSSItem nss_builtins_items_340 [] = {
  22616
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
  22617
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
  22618
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22619
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22620
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
  22621
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
  22622
+  { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
  22623
+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
  22624
+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
  22625
+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
  22626
+"\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151"
  22627
+"\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156"
  22628
+"\162\151\143\150\051"
  22629
+, (PRUint32)101 },
  22630
+  { (void *)"0", (PRUint32)2 },
  22631
+  { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
  22632
+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
  22633
+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
  22634
+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
  22635
+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
  22636
+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105"
  22637
+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
  22638
+"\141\154\040\122\157\157\164"
  22639
+, (PRUint32)119 },
  22640
+  { (void *)"\002\006\007\377\377\377\377\377"
  22641
+, (PRUint32)8 },
  22642
+  { (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007"
  22643
+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
  22644
+"\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023"
  22645
+"\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124"
  22646
+"\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060"
  22647
+"\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145"
  22648
+"\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163"
  22649
+"\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023"
  22650
+"\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040"
  22651
+"\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060"
  22652
+"\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062"
  22653
+"\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060"
  22654
+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
  22655
+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
  22656
+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
  22657
+"\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003"
  22658
+"\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145"
  22659
+"\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051"
  22660
+"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001"
  22661
+"\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144"
  22662
+"\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376"
  22663
+"\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312"
  22664
+"\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225"
  22665
+"\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152"
  22666
+"\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173"
  22667
+"\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335"
  22668
+"\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177"
  22669
+"\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001"
  22670
+"\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035"
  22671
+"\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134"
  22672
+"\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001"
  22673
+"\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005"
  22674
+"\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142"
  22675
+"\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164"
  22676
+"\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056"
  22677
+"\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003"
  22678
+"\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006"
  22679
+"\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061"
  22680
+"\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026"
  22681
+"\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157"
  22682
+"\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023"
  22683
+"\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040"
  22684
+"\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061"
  22685
+"\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171"
  22686
+"\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040"
  22687
+"\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004"
  22688
+"\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072"
  22689
+"\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165"
  22690
+"\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103"
  22691
+"\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060"
  22692
+"\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027"
  22693
+"\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015"
  22694
+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201"
  22695
+"\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005"
  22696
+"\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325"
  22697
+"\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377"
  22698
+"\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222"
  22699
+"\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113"
  22700
+"\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362"
  22701
+"\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305"
  22702
+"\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143"
  22703
+"\131"
  22704
+, (PRUint32)977 }
  22705
+};
  22706
+static const NSSItem nss_builtins_items_341 [] = {
  22707
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
  22708
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
  22709
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22710
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22711
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
  22712
+  { (void *)"\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025"
  22713
+"\214\071\131\117"
  22714
+, (PRUint32)20 },
  22715
+  { (void *)"\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152"
  22716
+, (PRUint32)16 },
  22717
+  { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
  22718
+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
  22719
+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
  22720
+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
  22721
+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
  22722
+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105"
  22723
+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
  22724
+"\141\154\040\122\157\157\164"
  22725
+, (PRUint32)119 },
  22726
+  { (void *)"\002\006\007\377\377\377\377\377"
  22727
+, (PRUint32)8 },
  22728
+  { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
  22729
+  { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
  22730
+  { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
  22731
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  22732
+};
  22733
+static const NSSItem nss_builtins_items_342 [] = {
  22734
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
  22735
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
  22736
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22737
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22738
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
  22739
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
  22740
+  { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
  22741
+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
  22742
+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
  22743
+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
  22744
+"\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151"
  22745
+"\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050"
  22746
+"\105\156\162\151\143\150\051"
  22747
+, (PRUint32)103 },
  22748
+  { (void *)"0", (PRUint32)2 },
  22749
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
  22750
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
  22751
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
  22752
+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
  22753
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
  22754
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
  22755
+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
  22756
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
  22757
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
  22758
+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
  22759
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
  22760
+"\040\050\062\060\064\070\051"
  22761
+, (PRUint32)183 },
  22762
+  { (void *)"\002\006\007\377\377\377\377\377"
  22763
+, (PRUint32)8 },
  22764
+  { (void *)"\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007"
  22765
+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
  22766
+"\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012"
  22767
+"\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060"
  22768
+"\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162"
  22769
+"\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070"
  22770
+"\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056"
  22771
+"\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061"
  22772
+"\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071"
  22773
+"\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114"
  22774
+"\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023"
  22775
+"\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162"
  22776
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
  22777
+"\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061"
  22778
+"\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065"
  22779
+"\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060"
  22780
+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
  22781
+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
  22782
+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
  22783
+"\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003"
  22784
+"\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145"
  22785
+"\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143"
  22786
+"\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
  22787
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
  22788
+"\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065"
  22789
+"\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140"
  22790
+"\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026"
  22791
+"\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313"
  22792
+"\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336"
  22793
+"\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245"
  22794
+"\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044"
  22795
+"\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167"
  22796
+"\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026"
  22797
+"\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166"
  22798
+"\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063"
  22799
+"\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312"
  22800
+"\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364"
  22801
+"\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046"
  22802
+"\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150"
  22803
+"\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205"
  22804
+"\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060"
  22805
+"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
  22806
+"\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001"
  22807
+"\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006"
  22808
+"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005"
  22809
+"\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006"
  22810
+"\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006"
  22811
+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
  22812
+"\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156"
  22813
+"\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006"
  22814
+"\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005"
  22815
+"\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167"
  22816
+"\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171"
  22817
+"\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004"
  22818
+"\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072"
  22819
+"\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145"
  22820
+"\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003"
  22821
+"\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060"
  22822
+"\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321"
  22823
+"\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160"
  22824
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
  22825
+"\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153"
  22826
+"\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003"
  22827
+"\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001"
  22828
+"\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014"
  22829
+"\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063"
  22830
+"\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142"
  22831
+"\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264"
  22832
+"\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251"
  22833
+"\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330"
  22834
+"\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327"
  22835
+"\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013"
  22836
+"\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113"
  22837
+"\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227"
  22838
+"\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100"
  22839
+"\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247"
  22840
+"\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011"
  22841
+"\355\020\342\305"
  22842
+, (PRUint32)1236 }
  22843
+};
  22844
+static const NSSItem nss_builtins_items_343 [] = {
  22845
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
  22846
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
  22847
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22848
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
  22849
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
  22850
+  { (void *)"\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151"
  22851
+"\005\155\061\046"
  22852
+, (PRUint32)20 },
  22853
+  { (void *)"\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362"
  22854
+, (PRUint32)16 },
  22855
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
  22856
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
  22857
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
  22858
+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
  22859
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
  22860
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
  22861
+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
  22862
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
  22863
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
  22864
+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
  22865
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
  22866
+"\040\050\062\060\064\070\051"
  22867
+, (PRUint32)183 },
  22868
+  { (void *)"\002\006\007\377\377\377\377\377"
  22869
+, (PRUint32)8 },
  22870
+  { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
  22871
+  { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
  22872
+  { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
  22873
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
  22874
+};
22603 22875
 
22604 22876
 builtinsInternalObject
22605 22877
 nss_builtins_data[] = {
@@ -22944,11 +23216,15 @@ nss_builtins_data[] = {
22944 23216
   { 11, nss_builtins_types_336, nss_builtins_items_336, {NULL} },
22945 23217
   { 13, nss_builtins_types_337, nss_builtins_items_337, {NULL} },
22946 23218
   { 11, nss_builtins_types_338, nss_builtins_items_338, {NULL} },
22947  
-  { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} }
  23219
+  { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} },
  23220
+  { 11, nss_builtins_types_340, nss_builtins_items_340, {NULL} },
  23221
+  { 13, nss_builtins_types_341, nss_builtins_items_341, {NULL} },
  23222
+  { 11, nss_builtins_types_342, nss_builtins_items_342, {NULL} },
  23223
+  { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} }
22948 23224
 };
22949 23225
 const PRUint32
22950 23226
 #ifdef DEBUG
22951  
-  nss_builtins_nObjects = 339+1;
  23227
+  nss_builtins_nObjects = 343+1;
22952 23228
 #else
22953  
-  nss_builtins_nObjects = 339;
  23229
+  nss_builtins_nObjects = 343;
22954 23230
 #endif /* DEBUG */
281  security/nss/lib/ckfw/builtins/certdata.txt
@@ -23299,3 +23299,284 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED
23299 23299
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED
23300 23300
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED
23301 23301
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
  23302
+
  23303
+#
  23304
+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
  23305
+#
  23306
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
  23307
+CKA_TOKEN CK_BBOOL CK_TRUE
  23308
+CKA_PRIVATE CK_BBOOL CK_FALSE
  23309
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
  23310
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
  23311
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
  23312
+CKA_SUBJECT MULTILINE_OCTAL
  23313
+\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061
  23314
+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
  23315
+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
  23316
+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
  23317
+\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151
  23318
+\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156
  23319
+\162\151\143\150\051
  23320
+END
  23321
+CKA_ID UTF8 "0"
  23322
+CKA_ISSUER MULTILINE_OCTAL
  23323
+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
  23324
+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
  23325
+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
  23326
+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
  23327
+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
  23328
+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
  23329
+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
  23330
+\141\154\040\122\157\157\164
  23331
+END
  23332
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
  23333
+\002\006\007\377\377\377\377\377
  23334
+END
  23335
+CKA_VALUE MULTILINE_OCTAL
  23336
+\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007
  23337
+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
  23338
+\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023
  23339
+\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124
  23340
+\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060
  23341
+\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145
  23342
+\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163
  23343
+\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023
  23344
+\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040
  23345
+\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060
  23346
+\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062
  23347
+\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060
  23348
+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
  23349
+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
  23350
+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
  23351
+\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003
  23352
+\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145
  23353
+\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051
  23354
+\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001
  23355
+\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144
  23356
+\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376
  23357
+\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312
  23358
+\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225
  23359
+\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152
  23360
+\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173
  23361
+\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335
  23362
+\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177
  23363
+\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001
  23364
+\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035
  23365
+\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134
  23366
+\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001
  23367
+\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005
  23368
+\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142
  23369
+\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164
  23370
+\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056
  23371
+\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003
  23372
+\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006
  23373
+\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061
  23374
+\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026
  23375
+\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157
  23376
+\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023
  23377
+\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040
  23378
+\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061
  23379
+\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171
  23380
+\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040
  23381
+\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004
  23382
+\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072
  23383
+\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165
  23384
+\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103
  23385
+\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060
  23386
+\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027
  23387
+\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015
  23388
+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201
  23389
+\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005
  23390
+\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325
  23391
+\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377
  23392
+\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222
  23393
+\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113
  23394
+\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362
  23395
+\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305
  23396
+\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143
  23397
+\131
  23398
+END
  23399
+
  23400
+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
  23401
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
  23402
+CKA_TOKEN CK_BBOOL CK_TRUE
  23403
+CKA_PRIVATE CK_BBOOL CK_FALSE
  23404
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
  23405
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
  23406
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
  23407
+\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025
  23408
+\214\071\131\117
  23409
+END
  23410
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
  23411
+\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152
  23412
+END
  23413
+CKA_ISSUER MULTILINE_OCTAL
  23414
+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
  23415
+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
  23416
+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
  23417
+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
  23418
+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
  23419
+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
  23420
+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
  23421
+\141\154\040\122\157\157\164
  23422
+END
  23423
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
  23424
+\002\006\007\377\377\377\377\377
  23425
+END
  23426
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED
  23427
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED
  23428
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED
  23429
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
  23430
+
  23431
+#
  23432
+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
  23433
+#
  23434
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
  23435
+CKA_TOKEN CK_BBOOL CK_TRUE
  23436
+CKA_PRIVATE CK_BBOOL CK_FALSE
  23437
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
  23438
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
  23439
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
  23440
+CKA_SUBJECT MULTILINE_OCTAL
  23441
+\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061
  23442
+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
  23443
+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
  23444
+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
  23445
+\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151
  23446
+\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050
  23447
+\105\156\162\151\143\150\051
  23448
+END
  23449
+CKA_ID UTF8 "0"
  23450
+CKA_ISSUER MULTILINE_OCTAL
  23451
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
  23452
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
  23453
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
  23454
+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
  23455
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
  23456
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
  23457
+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
  23458
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
  23459
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
  23460
+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
  23461
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
  23462
+\040\050\062\060\064\070\051
  23463
+END
  23464
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
  23465
+\002\006\007\377\377\377\377\377
  23466
+END
  23467
+CKA_VALUE MULTILINE_OCTAL
  23468
+\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007
  23469
+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
  23470
+\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012
  23471
+\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060
  23472
+\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162
  23473
+\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070
  23474
+\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056
  23475
+\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061
  23476
+\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071
  23477
+\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114
  23478
+\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023
  23479
+\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162
  23480
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
  23481
+\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061
  23482
+\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065
  23483
+\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060
  23484
+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
  23485
+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
  23486
+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
  23487
+\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003
  23488
+\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145
  23489
+\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143
  23490
+\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015
  23491
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
  23492
+\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065
  23493
+\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140
  23494
+\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026
  23495
+\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313
  23496
+\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336
  23497
+\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245
  23498
+\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044
  23499
+\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167
  23500
+\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026
  23501
+\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166
  23502
+\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063
  23503
+\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312
  23504
+\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364
  23505
+\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046
  23506
+\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150
  23507
+\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205
  23508
+\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060
  23509
+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
  23510
+\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001
  23511
+\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006
  23512
+\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005
  23513
+\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006
  23514
+\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006
  23515
+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
  23516
+\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156
  23517
+\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006
  23518
+\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005
  23519
+\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167
  23520
+\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171
  23521
+\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004
  23522
+\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072
  23523
+\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145
  23524
+\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003
  23525
+\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060
  23526
+\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321
  23527
+\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160
  23528
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
  23529
+\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153
  23530
+\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003
  23531
+\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001
  23532
+\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014
  23533
+\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063
  23534
+\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142
  23535
+\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264
  23536
+\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251
  23537
+\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330
  23538
+\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327
  23539
+\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013
  23540
+\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113
  23541
+\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227
  23542
+\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100
  23543
+\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247
  23544
+\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011
  23545
+\355\020\342\305
  23546
+END
  23547
+
  23548
+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
  23549
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
  23550
+CKA_TOKEN CK_BBOOL CK_TRUE
  23551
+CKA_PRIVATE CK_BBOOL CK_FALSE
  23552
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
  23553
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
  23554
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
  23555
+\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151
  23556
+\005\155\061\046
  23557
+END
  23558
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
  23559
+\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362
  23560
+END
  23561
+CKA_ISSUER MULTILINE_OCTAL
  23562
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
  23563
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
  23564
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
  23565
+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
  23566
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
  23567
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
  23568
+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
  23569
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
  23570
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
  23571
+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
  23572
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
  23573
+\040\050\062\060\064\070\051
  23574
+END
  23575
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
  23576
+\002\006\007\377\377\377\377\377
  23577
+END
  23578
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED
  23579
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED
  23580
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED
  23581
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
  23582
+
4  security/nss/lib/ckfw/builtins/nssckbi.h
@@ -77,8 +77,8 @@
77 77
  * of the comment in the CK_VERSION type definition.
78 78
  */
79 79
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
80  
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 87
81  
-#define NSS_BUILTINS_LIBRARY_VERSION "1.87"
  80
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 88
  81
+#define NSS_BUILTINS_LIBRARY_VERSION "1.88"
82 82
 
83 83
 /* These version numbers detail the semantic changes to the ckfw engine. */
84 84
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
6  toolkit/mozapps/extensions/AddonRepository.jsm
@@ -1309,6 +1309,10 @@ var AddonDatabase = {
1309 1309
 
1310 1310
     try {
1311 1311
       this.connection = Services.storage.openUnsharedDatabase(dbfile);
  1312
+      if (this.connection.schemaVersion > DB_SCHEMA) {
  1313
+        this.connection.close();
  1314
+        throw "Unknown database schema";
  1315
+      }
1312 1316
     } catch (e) {
1313 1317
       this.initialized = false;
1314 1318
       ERROR("Failed to open database", e);
@@ -1408,7 +1412,7 @@ var AddonDatabase = {
1408 1412
     try {
1409 1413
       return this.statementCache[aKey] = this.connection.createStatement(sql);
1410 1414
     } catch (e) {
1411  
-      ERROR("Error creating statement " + aKey + " (" + aSql + ")");
  1415
+      ERROR("Error creating statement " + aKey + " (" + sql + ")");
1412 1416
       throw e;
1413 1417
     }
1414 1418
   },
43  toolkit/mozapps/extensions/test/xpcshell/test_bug689375.js
... ...
@@ -0,0 +1,43 @@
  1
+/* Any copyright is dedicated to the Public Domain.
  2
+ * http://creativecommons.org/publicdomain/zero/1.0/
  3
+ */
  4
+
  5
+
  6
+function run_test() {
  7
+  do_test_pending();
  8
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
  9
+
  10
+  // Write out a minimal database.
  11
+  let dbfile = gProfD.clone();
  12
+  dbfile.append("addons.sqlite");
  13
+  let db = AM_Cc["@mozilla.org/storage/service;1"].
  14
+           getService(AM_Ci.mozIStorageService).
  15
+           openDatabase(dbfile);
  16
+
  17
+  db.createTable("futuristicSchema",
  18
+                 "id INTEGER, " +
  19
+                 "sharks TEXT, " +
  20
+                 "lasers TEXT");
  21
+
  22
+  db.schemaVersion = 1000;
  23
+  db.close();
  24
+
  25
+  Services.obs.addObserver({
  26
+    observe: function () {
  27
+      Services.obs.removeObserver(this, "addon-repository-shutdown");
  28
+      // Check the DB schema has changed once AddonRepository has freed it.
  29
+      db = AM_Cc["@mozilla.org/storage/service;1"].
  30
+           getService(AM_Ci.mozIStorageService).
  31
+           openDatabase(dbfile);
  32
+      do_check_eq(db.schemaVersion, 1);
  33
+      db.close();
  34
+      do_test_finished();
  35
+    }
  36
+  }, "addon-repository-shutdown", null);
  37
+
  38
+  // Force a connection to the addon database to be opened.
  39
+  Services.prefs.setBoolPref("extensions.getAddons.cache.enabled", true);
  40
+  AddonRepository.getCachedAddonByID("test1@tests.mozilla.org", function (aAddon) {
  41
+    AddonRepository.shutdown();
  42
+  });
  43
+}
1  toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -57,6 +57,7 @@ tail =
57 57
 [test_bug620837.js]
58 58
 [test_bug655254.js]
59 59
 [test_bug659772.js]
  60
+[test_bug689375.js]
60 61
 [test_cacheflush.js]
61 62
 [test_checkcompatibility.js]
62 63
 [test_corrupt.js]

0 notes on commit 5b297a2

Please sign in to comment.
Something went wrong with that request. Please try again.