fixup! crypto: support loading private keys through STORE loaders

Author: panva

.github/workflows/nix-changes.yml

@@ -69,7 +69,7 @@ jobs:
                 ++ builtins.attrValues (
                   { inherit (import <nixpkgs> {}) nixfmt-tree sccache; }
                   // import ./tools/nix/openssl-matrix.nix {}
-                  // builtins.removeAttrs (import ./tools/nix/pkcs11.nix {}) [ \"pin\" ]
+                  // import ./tools/nix/pkcs11.nix {}
                 )")" \
           | xargs nix-store --realise \
           | xargs nix-store --query --requisites \
@@ -78,6 +78,7 @@ jobs:
 
       - name: Compute requisites before change
         shell: bash  # See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference, we want the pipefail option.
+        # TODO(panva): add `// import ./tools/nix/pkcs11.nix {}` once landed
         run: |
           git reset HEAD^ --hard
           nix-store --query --references "$(
@@ -87,7 +88,6 @@ jobs:
                 ++ builtins.attrValues (
                   { inherit (import <nixpkgs> {}) nixfmt-tree sccache; }
                   // import ./tools/nix/openssl-matrix.nix {}
-                  // builtins.removeAttrs (import ./tools/nix/pkcs11.nix {}) [ \"pin\" ]
                 )")" \
           | xargs nix-store --realise \
           | xargs nix-store --query --requisites \

shell.nix

@@ -154,7 +154,7 @@ pkgs.mkShell (
   }
   // pkgs.lib.optionalAttrs usePkcs11 {
     NODE_TEST_PKCS11_OPENSSL_CONF = "${pkcs11Fixture.opensslConf}";
-    NODE_TEST_PKCS11_PIN = pkcs11Fixture.pin;
+    NODE_TEST_PKCS11_PIN = pkcs11Fixture.softhsmDir.pin;
     NODE_TEST_PKCS11_SOFTHSM_DIR = "${pkcs11Fixture.softhsmDir}";
   }
 )

tools/nix/pkcs11.nix

@@ -52,7 +52,6 @@ let
 in
 {
   inherit
-    pin
     pkcs11-provider
     softhsm
     ;
@@ -90,6 +89,10 @@ in
           softhsm
           pkgs.opensc
         ];
+
+        passthru = {
+          inherit pin;
+        };
       }
       ''
         export SOFTHSM2_CONF=${softhsmConf}