Bug 1009158 - Fix and re-enable PSM xpcshell tests that would previously time out on Android due to LD_LIBRARY_PATH issues. r=keeler

security/manager/boot/src/StaticHPKPins.h

@@ -81,7 +81,7 @@ static const char kDigiCert_High_Assurance_EV_Root_CAFingerprint[] =
 
 /* End Entity Test Cert */
 static const char kEnd_Entity_Test_CertFingerprint[] =
-  "pVVgLk2kFI2WWRPwDMIX6YmzFhEW4DXQV/U5gP+feGA=";
+  "lzCakFt+nADIfIkgk+UE/EQ9SaT2nay2yu2iykVbvV8=";
 
 /* Entrust Root Certification Authority */
 static const char kEntrust_Root_Certification_AuthorityFingerprint[] =
@@ -1140,4 +1140,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1425726550768000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1426079773398000);

security/manager/ssl/tests/unit/head_psm.js

@@ -363,7 +363,9 @@ function _setupTLSServerTest(serverBinName)
                  .getService(Ci.nsIEnvironment);
   let greBinDir = directoryService.get("GreBinD", Ci.nsIFile);
   envSvc.set("DYLD_LIBRARY_PATH", greBinDir.path);
-  envSvc.set("LD_LIBRARY_PATH", greBinDir.path);
+  // Android libraries are in /data/local/xpcb, but "GreBinD" does not return
+  // this path on Android, so hard code it here.
+  envSvc.set("LD_LIBRARY_PATH", greBinDir.path + ":/data/local/xpcb");
   envSvc.set("MOZ_TLS_SERVER_DEBUG_LEVEL", "3");
   envSvc.set("MOZ_TLS_SERVER_CALLBACK_PORT", CALLBACK_PORT);
 

security/manager/ssl/tests/unit/test_cert_overrides.js

@@ -74,7 +74,7 @@ function run_test() {
   fakeOCSPResponder.registerPrefixHandler("/", function (request, response) {
     response.setStatusLine(request.httpVersion, 500, "Internal Server Error");
   });
-  fakeOCSPResponder.start(8080);
+  fakeOCSPResponder.start(8888);
 
   add_simple_tests();
   add_combo_tests();

security/manager/ssl/tests/unit/test_ocsp_caching.js

@@ -38,7 +38,7 @@ function run_test() {
     response.setHeader("Content-Type", "application/ocsp-response");
     response.write(gGoodOCSPResponse);
   });
-  ocspResponder.start(8080);
+  ocspResponder.start(8888);
 
   add_tests();
 

security/manager/ssl/tests/unit/test_ocsp_no_hsts_upgrade.js

@@ -26,7 +26,7 @@ function run_test() {
     response.setHeader("Content-Type", "application/ocsp-response");
     response.write(goodOCSPResponse);
   });
-  ocspResponder.start(8080);
+  ocspResponder.start(8888);
 
   // ocsp-stapling-none.example.com does not staple an OCSP response in the
   // handshake, so the revocation checking code will attempt to fetch one.

security/manager/ssl/tests/unit/test_ocsp_required.js

@@ -30,7 +30,7 @@ function run_test() {
     response.write(ocspResponseBadSignature);
     gOCSPRequestCount++;
   });
-  ocspResponder.start(8080);
+  ocspResponder.start(8888);
 
   add_tests();
 

security/manager/ssl/tests/unit/test_ocsp_stapling.js

@@ -175,7 +175,7 @@ function run_test() {
     response.setStatusLine(request.httpVersion, 500, "Internal Server Error");
     do_check_true(gExpectOCSPRequest);
   });
-  fakeOCSPResponder.start(8080);
+  fakeOCSPResponder.start(8888);
 
   add_tls_server_setup("OCSPStaplingServer");
 

security/manager/ssl/tests/unit/test_ocsp_stapling_expired.js

@@ -58,7 +58,7 @@ function run_test() {
     }
     gOCSPRequestCount++;
   });
-  ocspResponder.start(8080);
+  ocspResponder.start(8888);
   add_tls_server_setup("OCSPStaplingServer");
 
   // In these tests, the OCSP stapling server gives us a stapled

security/manager/ssl/tests/unit/test_ocsp_stapling_with_intermediate.js

@@ -29,7 +29,7 @@ function run_test() {
     let body = "Refusing to return a response";
     response.bodyOutputStream.write(body, body.length);
   });
-  ocspResponder.start(8080);
+  ocspResponder.start(8888);
 
   add_tls_server_setup("OCSPStaplingServer");
 

security/manager/ssl/tests/unit/test_ocsp_timeout.js

@@ -9,8 +9,8 @@
 // ocsp-stapling-none.example.com doesn't staple an OCSP response, so
 // connecting to it will cause a request to the OCSP responder. As with all of
 // these tests, the OCSP AIA (i.e. the url of the responder) in the certificate
-// is http://localhost:8080. Since this test opens a TCP socket listening on
-// port 8080 that just accepts connections and then ignores them (with
+// is http://localhost:8888. Since this test opens a TCP socket listening on
+// port 8888 that just accepts connections and then ignores them (with
 // connect/read/write timeouts of 30 seconds), the OCSP requests should cancel
 // themselves. When OCSP hard-fail is enabled, connections will be terminated.
 // Otherwise, they will succeed.
@@ -31,7 +31,7 @@ function run_test() {
 
   let socket = Cc["@mozilla.org/network/server-socket;1"]
                  .createInstance(Ci.nsIServerSocket);
-  socket.init(8080, true, -1);
+  socket.init(8888, true, -1);
   socket.asyncListen(gSocketListener);
 
   add_tests_in_mode(true);

security/manager/ssl/tests/unit/tlsserver/generate_certs.sh

@@ -121,7 +121,7 @@ function make_CA {
 SERIALNO=$RANDOM
 
 function make_INT {
-  INT_RESPONSES="y\n0\ny\n2\n7\nhttp://localhost:8080/\n\nn\nn\n"
+  INT_RESPONSES="y\n0\ny\n2\n7\nhttp://localhost:8888/\n\nn\nn\n"
   NICKNAME="${1}"
   SUBJECT="${2}"
   CA="${3}"
@@ -171,7 +171,7 @@ function make_V1 {
 }
 
 function make_EE {
-  CERT_RESPONSES="n\n\ny\n2\n7\nhttp://localhost:8080/\n\nn\nn\n"
+  CERT_RESPONSES="n\n\ny\n2\n7\nhttp://localhost:8888/\n\nn\nn\n"
   NICKNAME="${1}"
   SUBJECT="${2}"
   CA="${3}"

security/manager/ssl/tests/unit/xpcshell.ini

@@ -44,37 +44,24 @@ skip-if = buildapp == "b2g" && processor == "arm"
 [test_certificate_usages.js]
 [test_ocsp_stapling.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_stapling_expired.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_stapling_with_intermediate.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_caching.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_required.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_timeout.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
 # Bug 1005266: intermittent failures on Windows
-skip-if = os == "android" || os == "win"
+skip-if = os == "win"
 [test_cert_signatures.js]
 [test_ev_certs.js]
 run-sequentially = hardcoded ports
 [test_getchain.js]
 [test_cert_overrides.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_intermediate_basic_usage_constraints.js]
 [test_name_constraints.js]
 [test_cert_trust.js]
@@ -83,20 +70,16 @@ skip-if = os == "android"
 [test_signed_apps-marketplace.js]
 [test_cert_eku.js]
 # Bug 989485 : this test this fails on slow devices
-skip-if = os == "android" || (buildapp == "b2g" && processor == "arm")
+skip-if = buildapp == "b2g" && processor == "arm"
 requesttimeoutfactor = 4
 [test_pinning.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_url.js]
 run-sequentially = hardcoded ports
 [test_ocsp_fetch_method.js]
 run-sequentially = hardcoded ports
 [test_ocsp_no_hsts_upgrade.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_add_preexisting_cert.js]
 [test_keysize.js]
 [test_keysize_ev.js]
@@ -105,13 +88,7 @@ run-sequentially = hardcoded ports
 skip-if = buildapp == "b2g"
 [test_cert_chains.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_client_cert.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_nsCertType.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"