Commit 041f6f70 authored by Andreea Pavel's avatar Andreea Pavel
Browse files

Backed out 2 changesets (bug 1712837) for win build bustages on a CLOSED TREE 

Backed out changeset e754af875d57 (bug 1712837)
Backed out changeset 020eaab241a8 (bug 1712837)
parent 583e0924

Cargo.lock

+0 −13
Original line number Diff line number Diff line
@@ -2437,19 +2437,6 @@ dependencies = [ 
 "libc",

]



[[package]]

name = "ipcclientcerts-static"

version = "0.1.0"

dependencies = [

 "byteorder",

 "env_logger",

 "lazy_static",

 "log",

 "pkcs11",

 "rsclientcerts",

 "sha2",

]



[[package]]

name = "itertools"

version = "0.8.2"

Cargo.toml

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ members = [ 
  "js/src/rust",

  "js/src/wasm/cranelift",

  "netwerk/test/http3server",

  "security/manager/ssl/ipcclientcerts",

  "security/manager/ssl/osclientcerts",

  "testing/geckodriver",

  "toolkit/crashreporter/rust_minidump_writer_linux",

browser/components/extensions/parent/ext-pkcs11.js

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ this.pkcs11 = class extends ExtensionAPI { 
        }

        if (

          manifestLib !== ctypes.libraryName("nssckbi") &&

          manifestLib !== ctypes.libraryName("osclientcerts") &&

          manifestLib !== ctypes.libraryName("ipcclientcerts")

          manifestLib !== ctypes.libraryName("osclientcerts")

        ) {

          return hostInfo.manifest;

        }

browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js

+0 −20
Original line number Diff line number Diff line
@@ -204,26 +204,6 @@ add_task(async function test_pkcs11() { 
        /No such PKCS#11 module osclientcerts/,

        "getModuleSlots should not work on the built-in osclientcerts module"

      );

      await browser.test.assertRejects(

        browser.pkcs11.installModule("ipcclientcerts", 0),

        /No such PKCS#11 module ipcclientcerts/,

        "installModule should not work on the built-in ipcclientcerts module"

      );

      await browser.test.assertRejects(

        browser.pkcs11.uninstallModule("ipcclientcerts"),

        /No such PKCS#11 module ipcclientcerts/,

        "uninstallModule should not work on the built-in ipcclientcerts module"

      );

      await browser.test.assertRejects(

        browser.pkcs11.isModuleInstalled("ipcclientcerts"),

        /No such PKCS#11 module ipcclientcerts/,

        "isModuleLoaded should not work on the built-in ipcclientcerts module"

      );

      await browser.test.assertRejects(

        browser.pkcs11.getModuleSlots("ipcclientcerts"),

        /No such PKCS#11 module ipcclientcerts/,

        "getModuleSlots should not work on the built-in ipcclientcerts module"

      );

      browser.test.notifyPass("pkcs11");

    } catch (e) {

      browser.test.fail(`Error: ${String(e)} :: ${e.stack}`);

browser/installer/package-manifest.in

+0 −2
Original line number Diff line number Diff line
@@ -372,8 +372,6 @@ bin/libfreebl_64int_3.so 
#endif

#endif



@BINPATH@/@DLL_PREFIX@ipcclientcerts@DLL_SUFFIX@



; For process sandboxing

#if defined(MOZ_SANDBOX)

#if defined(XP_LINUX)