Backed out 2 changesets (bug 1016555, bug 1189427) for making Android 4.3 API11+ debug X3 perma fail in test_ev_certs.js
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 06 Aug 2015 11:51:27 +0200
changeset 288173 e7ab435c8d1e2346b84c7c942433b72a624f4f52
parent 288172 9617a34de78f7d7b531601fee48b861b3f8d1405
child 288174 e22327ec52514f4c6db4810c1eea316adc1f5ded
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1016555, 1189427
milestone42.0a1
backs outebd4e3880403ff962f8ce0cbd04fef2f6010a0b6
331e489c753420ba3aeb537fe6af196f1a0ffee2
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1016555, bug 1189427) for making Android 4.3 API11+ debug X3 perma fail in test_ev_certs.js Backed out changeset ebd4e3880403 (bug 1189427) Backed out changeset 331e489c7534 (bug 1016555)
browser/app/profile/firefox.js
mobile/android/app/mobile.js
security/manager/ssl/tests/unit/moz.build
security/manager/ssl/tests/unit/test_ocsp_fetch_method.js
security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.der
security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem.certspec
security/manager/ssl/tests/unit/test_ocsp_fetch_method/b.der
security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.der
security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem.certspec
security/manager/ssl/tests/unit/test_ocsp_fetch_method/cert9.db
security/manager/ssl/tests/unit/test_ocsp_fetch_method/generate.py
security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.der
security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.key.keyspec
security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem.certspec
security/manager/ssl/tests/unit/test_ocsp_fetch_method/key4.db
security/manager/ssl/tests/unit/test_ocsp_fetch_method/moz.build
security/manager/ssl/tests/unit/test_ocsp_fetch_method/pkcs11.txt
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -47,18 +47,16 @@ pref("extensions.getAddons.getWithPerfor
 pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
 pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
 pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
 
 // Blocklist preferences
 pref("extensions.blocklist.enabled", true);
-// OneCRL freshness checking depends on this value, so if you change it,
-// please also update security.onecrl.maximum_staleness_in_seconds.
 pref("extensions.blocklist.interval", 86400);
 // Controls what level the blocklist switches from warning about items to forcibly
 // blocking them.
 pref("extensions.blocklist.level", 2);
 pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
 pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blocklist/");
 pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
 
@@ -1757,18 +1755,18 @@ pref("dom.identity.enabled", false);
 
 // Block insecure active content on https pages
 pref("security.mixed_content.block_active_content", true);
 
 // 1 = allow MITM for certificate pinning checks.
 pref("security.cert_pinning.enforcement_level", 1);
 
 // Required blocklist freshness for OneCRL OCSP bypass
-// (default is 1.25% extensions.blocklist.interval, or 30 hours)
-pref("security.onecrl.maximum_staleness_in_seconds", 108000);
+// (default should be at least as large as extensions.blocklist.interval)
+pref("security.onecrl.maximum_staleness_in_seconds", 0);
 
 // Override the Gecko-default value of false for Firefox.
 pref("plain_text.wrap_long_lines", true);
 
 // If this turns true, Moz*Gesture events are not called stopPropagation()
 // before content.
 pref("dom.debug.propagate_gesture_events_through_content", false);
 
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -216,18 +216,16 @@ pref("extensions.getAddons.get.url", "ht
 pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
 
 /* preference for the locale picker */
 pref("extensions.getLocales.get.url", "");
 pref("extensions.compatability.locales.buildid", "0");
 
 /* blocklist preferences */
 pref("extensions.blocklist.enabled", true);
-// OneCRL freshness checking depends on this value, so if you change it,
-// please also update security.onecrl.maximum_staleness_in_seconds.
 pref("extensions.blocklist.interval", 86400);
 pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
 pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
 
 /* Don't let XPIProvider install distribution add-ons; we do our own thing on mobile. */
 pref("extensions.installDistroAddons", false);
 
 /* block popups by default, and notify the user about blocked popups */
@@ -481,20 +479,16 @@ pref("security.alternate_certificate_err
 pref("security.warn_viewing_mixed", false); // Warning is disabled.  See Bug 616712.
 
 // Block insecure active content on https pages
 pref("security.mixed_content.block_active_content", true);
 
 // Enable pinning
 pref("security.cert_pinning.enforcement_level", 1);
 
-// Required blocklist freshness for OneCRL OCSP bypass
-// (default is 1.25% extensions.blocklist.interval, or 30 hours)
-pref("security.onecrl.maximum_staleness_in_seconds", 108000);
-
 // Only fetch OCSP for EV certificates
 pref("security.OCSP.enabled", 2);
 
 // Override some named colors to avoid inverse OS themes
 pref("ui.-moz-dialog", "#efebe7");
 pref("ui.-moz-dialogtext", "#101010");
 pref("ui.-moz-field", "#fff");
 pref("ui.-moz-fieldtext", "#1a1a1a");
--- a/security/manager/ssl/tests/unit/moz.build
+++ b/security/manager/ssl/tests/unit/moz.build
@@ -10,15 +10,14 @@ TEST_DIRS += [
     'test_cert_embedded_null',
     'test_cert_keyUsage',
     'test_cert_trust',
     'test_cert_version',
     'test_ev_certs',
     'test_intermediate_basic_usage_constraints',
     'test_keysize_ev',
     'test_pinning_dynamic',
-    'test_ocsp_fetch_method',
     'test_ocsp_url',
     'test_validity',
 ]
 
 if not CONFIG['MOZ_NO_SMART_CARDS']:
     DIRS += ['pkcs11testmodule']
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js
+++ b/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js
@@ -18,24 +18,24 @@ const SERVER_PORT = 8888;
 function start_ocsp_responder(expectedCertNames, expectedPaths,
                               expectedMethods) {
   return startOCSPResponder(SERVER_PORT, "www.example.com", [],
                             "test_ocsp_fetch_method", expectedCertNames,
                             expectedPaths, expectedMethods);
 }
 
 function check_cert_err(cert_name, expected_error) {
-  let cert = constructCertFromFile("test_ocsp_fetch_method/" + cert_name + ".pem");
+  let cert = constructCertFromFile("test_ocsp_fetch_method/" + cert_name + ".der");
   return checkCertErrorGeneric(certdb, cert, expected_error,
                                certificateUsageSSLServer);
 }
 
 function run_test() {
-  addCertFromFile(certdb, "test_ocsp_fetch_method/ca.pem", 'CTu,CTu,CTu');
-  addCertFromFile(certdb, "test_ocsp_fetch_method/int.pem", ',,');
+  addCertFromFile(certdb, "test_ocsp_fetch_method/ca.der", 'CTu,CTu,CTu');
+  addCertFromFile(certdb, "test_ocsp_fetch_method/int.der", ',,');
 
   // Enabled so that we can force ocsp failure responses.
   Services.prefs.setBoolPref("security.OCSP.require", true);
 
   Services.prefs.setCharPref("network.dns.localDomains",
                              "www.example.com");
   Services.prefs.setIntPref("security.OCSP.enabled", 1);
 
@@ -50,10 +50,21 @@ function run_test() {
   add_test(function() {
     clearOCSPCache();
     Services.prefs.setBoolPref("security.OCSP.GET.enabled", true);
     let ocspResponder = start_ocsp_responder(["a"], [], ["GET"]);
     check_cert_err("a", PRErrorCodeSuccess);
     ocspResponder.stop(run_next_test);
   });
 
+  // GET does fallback on bad entry
+  add_test(function() {
+    clearOCSPCache();
+    Services.prefs.setBoolPref("security.OCSP.GET.enabled", true);
+    // Bug 1016681 mozilla::pkix does not support fallback yet.
+    // let ocspResponder = start_ocsp_responder(["b", "a"], [], ["GET", "POST"]);
+    // check_cert_err("a", PRErrorCodeSuccess);
+    // ocspResponder.stop(run_next_test);
+    run_next_test();
+  });
+
   run_next_test();
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..48b71256a6befd2675b22410362d6bc5d6160464
GIT binary patch
literal 898
zc$_n6Vy-i2VoF=U%*4pV#LOMB!GM>IQ>)FR?K>|cBR4C9L7XAC0Vf-CC<~h~Q)sZE
zuz?_m!y(M&oS2iDmS2>YnP@0xAOaF(7v}ZNFU>1S%*;~=%S<gd6fqD2iE{~a2L$^n
zgrpXiWagzC@)&S|M45$|GxJIe<ivRmO$-f<3=K?;42+GV#CeU7xdt&*x1Y;^17bg8
zqCpd*60(OGSs9p{82K51;#^EkjEoE`qE04UziDZv`ypaC6PIK0a=%-u%T^h)2TK^8
zYw5A<?%mm8a_r~lB>qW@L)@FDX9h<t+wpei>9au#qa^Mf=$^(aZV}7)rCs5C9nXhT
z%dLvuKY6+5ZQ)a~g2LX3`!5Kc_-Ik{WkcHKg{9kKZ=QP*dcoyk$DGufV3o2*^Rif<
z>ppF1T;yoceg1^f(|JtaZRUpl%6C3?zGPo;RL033UBSiY_Qa}Aezxkk!;A1|yN(22
zd44y1^2*AlD6eZ5Rvwl9*8F%;pRh=8f|hsN_uY>KZQe^yotw6M_B6Re97}q3F|h9w
zKA<vF(laocvvW(Ga%))3MepX)7f0ooSQWZ+njWb;Rx>d(GB7T7H*htuVB^qcV`ODz
zXJlm2G0-y5fbk6&+hj6IN(!v>^~=l4^-?Pma|?1(^^)^*tt@~*9~^tK!YoV%3}|VK
z85F{6m+#&q7{wNM#JggzjOv_qxhw`+$}(XuecJD9>;LpgJ`wADso8t7jrv^I36+A}
z$1WLu{A%&r!|LuM?{BK%pZhCIr))j*T6jifRMM9{7d80<KL5*lnHRsQ+2rQQD*o*M
ziv_*8=ZWcw9N(mM)F81aSx>?3zTBMDim<s^8%@ktGF`A^@lLPIub)?ZDPZ^6<ue$b
z$ehUS+PL|6ZoKznp;YhHe#TkFoC2S=C|&p+DXc7_7Z$d1iPJq@k>Yjx_HMpsWFa0e
z-@~>e&zbei<O$0bd{;d4J$HZOb?Xe)@5xz46^A>YbDdcczG2@-f!MF}O9kqeF&<hu
QC&M&krgvY|f^VF^0V?H50RR91
deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.pem.certspec
+++ /dev/null
@@ -1,3 +0,0 @@
-issuer:int
-subject:a
-extension:authorityInformationAccess:http://www.example.com:8888/
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b7a751f540da98e11903956f1413ed14611a5701
GIT binary patch
literal 899
zc$_n6Vy-u6VoG1Y%*4pV#KN%8_@V(X8>d#AN85K^Mn-N{27@?5ZUas>=1>+kVW!Yv
zLtz6!5QjsU%Q-P8GcCU;FEi0l%s>Pr$S%z5n_rq&l9-vN5SE!*ZYW|P1QO>G<_-w<
zRR~EfF3HSGH{>zk0*NvUGiT<N7|4n98k!gy8W|dx8W|XyMv3zpA#)94sBS-(0SCl>
z#w3F#MkQnqGqN%;H!<=v0L8hOniv@wPIA66cJi53DSOXGuksJWopn9W&*a@Sc~fv}
zqnL1+!htnK(;g&DQ#IJVjAtXyHTk^o2GNXrUwbF0J~%Z&K<Lb;($X*AmTs`y%)4AZ
zOhWN;%A=<xMSuUrXnvox(!2TwV~W9>1&O;1-x<`s`XKn5Eo;H{D(*!GSK60H%>Vr^
zGP3LWY^R>76`xj~J-m0%35D}D;-a3?4-02~Qh1PfXzixn>rKrE)lxdQ*d#1Hlh<-C
zw?yZJ$0oU4t(2n)pU#%&g=D`K>szQ}*BN@j&#cDwK!R<N_@$7y9p#SSa?h_5V>tiz
z^5Q^-=G_PFt%`Wp8@Nx9npZtpDdE^H?FaMtguk5$m*`|-W@KPo>~7#{V8O<r&Bn;e
z%Ff8hqGO<CpaJ6>Ft*8Ll#~=$>Fbx5m+PfgB<2?6r0ON-=UQ0+fj&6)WQAFn3>eVT
z7BeV><Cn6z|A@YQFX(<@j$s=s`&EN89W2Wa-w8OtTHJPI$*haIKU^Y&o~}7xGiT{N
zuX5Md!Yd2+w#|r3+5Ivzxwb~{*t%e&xUP8~MYEPa+L|0IDO?{_@pNxA*HN>Y#t9L3
z=1Z}@?P=K3f9$r_qee}Ic|9GE9M*)aRMIjxnV>em@UwcXEW7ijM&9pRCLUuA{FLh}
zX<eN2pH-p5ZL-y(^GB~s{8isNnWgXEj}<;GAG&vBYp(jK+I{o>oT7B`8;dn1)@5IJ
z&=(as`tgMDsT17Np)waP3(Tya&Ycp(_)MPH-iV3QCBETOO6%T3ykcQ9H|9s$mRIhI
SSQetuyYWx1!};&$&H@0nuS-4v
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..20e8db54b0893a46b85356ab5c59bdd83cdd4e9f
GIT binary patch
literal 845
zc$_n6V)is>VlrI7%*4pV#LBRc>vMnsFB_*;n@8JsUPeZ4RtAGuLv903Hs(+kHesgF
zU_)U8K@f*Sn9DgaCo?U-C@(Y7P|QFCB*-qz>ziMiSCW{Srx2EzT5c#}AOsTU66OvF
z_EiW;EiTE-ONW`qEX<UgXdoxfYiMF<Xk=($YGhz+7$weYgv_P2^-YXQ$R1{7WngY%
z<Yxeib1^kBGBP~iZC0F_^=y&ir+rTQKP&C&RWn)r=-Im1pL>pZiEI<Ge=R6nx^a`l
z6UIHyXP!RC@tjX#t&hY<Z`QY*0m+HZY!7Q^@T?6`cqA6-93&sNI#!p{^WB}i|E7HJ
z)4b-Esb{PapFfj@CH#%tt1IP_4=#m$d*Rf~<g_lnV*zj6yUFHp9~Z9vI%~_ORQ&*f
z2*v-*d0pO4e?{x>eXel2vO%ppVs+08#aq{ZmvUE!n8z=3uM9KY(WZN+yC-JeRj#>*
zrgyp}B_{7%|9<(QgpO6pe?uNwxfw3-Ty$)UdE1S1sXbCFCtdi+_4&?Yzgo^&|3lrj
zxb9}$%6iR4?VnBDv_%e=Ed6V@GchwVFfJA_;4|O>2AZre3#$P$BjbOxM8XUTs<n;3
ztfe|;^Ca>fn9TI^-E^%hn|}s|7~C}0*&us4Z3};|(Ua)4{K4DK&9aue7$q2DddbGV
zxW+l-mC*gGw-3)s;hgEz5w&)zSIt)ApA1_JH%^X<{!re%GS~C4(H*rz%KiS6=CJB)
zNGt9&oO77BSYN70=eE&QS9|ZUOHbrZI_IT@*IX@I!g2cfwMnWxMZI@(Yl|-|j+pdV
zuSVCqYU|83_J@7u@I+qklFz7((n*_t+5T(a<A9l4JTH{}n{N9-^O?yFeMa%K8}G)X
zyS#U}mw$|z<!M@B%c@x+B6p+rP70c#c{h8jmP9Tm??j2RC$}cWUbuglBW0e|){nE+
L9^LkTU&1#4B&a;l
deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.pem.certspec
+++ /dev/null
@@ -1,4 +0,0 @@
-issuer:ca
-subject:ca
-extension:basicConstraints:cA,
-extension:keyUsage:cRLSign,keyCertSign
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e54db78087a5091c79ff2756a5bbabbbb2577001
GIT binary patch
literal 17408
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
new file mode 100755
--- /dev/null
+++ b/security/manager/ssl/tests/unit/test_ocsp_fetch_method/generate.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+
+import tempfile, os, sys
+
+libpath = os.path.abspath('../psm_common_py')
+sys.path.append(libpath)
+import CertUtils
+
+srcdir = os.getcwd()
+db = tempfile.mkdtemp()
+
+def generate_ca_cert(db_dir, dest_dir, noise_file, name):
+    return CertUtils.generate_ca_cert(db_dir, dest_dir, noise_file, name,
+                                      3, True)
+
+def generate_child_cert(db_dir, dest_dir, noise_file, name, ca_nick, is_ee,
+                        ocsp_url):
+    return CertUtils.generate_child_cert(db_dir, dest_dir, noise_file, name,
+                                         ca_nick, 3, True, is_ee, ocsp_url)
+
+def generate_certs():
+    [noise_file, pwd_file] = CertUtils.init_nss_db(srcdir)
+    generate_ca_cert(srcdir, srcdir, noise_file, 'ca')
+    generate_child_cert(srcdir, srcdir, noise_file, 'int', 'ca', False, '')
+    ocsp_url = "http://www.example.com:8888/"
+    generate_child_cert(srcdir, srcdir, noise_file, "a", 'int', True, ocsp_url)
+    generate_child_cert(srcdir, srcdir, noise_file, "b", 'int', True, ocsp_url)
+
+generate_certs()
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..661e814efaa9f67bc37bcef536b7f358ee34a666
GIT binary patch
literal 845
zc$_n6V)is>VlrI7%*4pV#KLgu$_oQtHcqWJkGAi;jEvl@3<j}=+y<O%%%Lo7!c3vT
zhQbDdAP$ExmvdrHW?FtxUS^`9n1KjLkX@M9H@`HmBr!8jAuKbs+)%_o2qexW%pDNy
zs}Pb}T#}iW4l|Egm?=5YKu(<3(8SQt$k4#l$iUb*N}SgSnQIV7b?bQyxFFUuXXcd{
zG%+e6`<RiHfw_s1p8+V&#ni;e$Z)4KL#Csm<Dbx-t*@V1F~`|eW=E`FEq2oQ;hhT+
zy8SvAdgVWbGrv~dlovI%=wy~%^p29h0;&%du3Dd0r|)><^QZW=VR@QcH^*e$R`25e
zURL1q@5H5VoZk7Kf!4h9cO}<7-(U0DPw-@L&hP5|%#J&%w^*#2)T~vZ(I6|n@92V)
zn_FCdTv>X=|BcB(<tcm1+%pUP`&4Q!WbJcdR?=g(t!BTvKh-?jJnLp*!P!lv7pC*u
zzN>TJyZ#vK6*2L+hjVoF#5fLco2aE6k_ZW2mwe~MpXsOGEtaqUBq(jj+xk;CzIflW
zETh$%STDZF%Gv5Ov)s;q!qa*$*5fSk3ufzn(=cXYW@KPoEMUNAzyl05Sz#7d17=3X
z|7fX%85C4WY*#wxo|)1t6=AD(;@E3dtw_1}xpGY0bMKtK-h8BStBhh&j`gYhJ<r+_
zlwHp%eJv=v;`mS2BvVgK#O!#j;XLLCyLo$G<%%bUE>Lgr`uhLT4F4Zo_tsxB;hX#T
z)hQ3=vp2Q>M-{M}I&6Fzu;n(-gys|7%36!{(|<6;HJSvM_8C~*o%7W{tnu2cJFYh_
zJ$~S@*(|vE!I1{r28MgOtc{1SRzCSYX<7QLmp@|?&a;cnw`;7QJ?&@m61(@WIiwZ~
zE9mk%EwKLZqg3QW<t(+In=kOKw7q8e@mB7HuXg`!8l4#8?L023EkF9d)h)aISp2lP
V>mNTk%qJS<Ipbk#sGYv>UjTQPJ`?}|
deleted file mode 100644
deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.pem.certspec
+++ /dev/null
@@ -1,4 +0,0 @@
-issuer:ca
-subject:int
-extension:basicConstraints:cA,
-extension:keyUsage:cRLSign,keyCertSign
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ada3335ecf24660ab3a4e0979a133ed8df901389
GIT binary patch
literal 29696
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
deleted file mode 100644
--- a/security/manager/ssl/tests/unit/test_ocsp_fetch_method/moz.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-test_certificates = (
-    'a.pem',
-    'ca.pem',
-    'int.pem',
-)
-
-for test_certificate in test_certificates:
-    input_file = test_certificate + '.certspec'
-    GENERATED_FILES += [test_certificate]
-    props = GENERATED_FILES[test_certificate]
-    props.script = '../pycert.py'
-    props.inputs = [input_file]
-    TEST_HARNESS_FILES.xpcshell.security.manager.ssl.tests.unit.test_ocsp_fetch_method += ['!%s' % test_certificate]
-
-test_keys = (
-    'int.key',
-)
-
-for test_key in test_keys:
-    input_file = test_key + '.keyspec'
-    GENERATED_FILES += [test_key]
-    props = GENERATED_FILES[test_key]
-    props.script = '../pykey.py'
-    props.inputs = [input_file]
-    TEST_HARNESS_FILES.xpcshell.security.manager.ssl.tests.unit.test_ocsp_fetch_method += ['!%s' % test_key]
new file mode 100644
--- /dev/null
+++ b/security/manager/ssl/tests/unit/test_ocsp_fetch_method/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:/home/cviecco/hg/mozilla-central-unified/security/manager/ssl/tests/unit/test_ocsp_fetch_method' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+