Merge commit 'd1102d5b6f'

trivionomicon/modules/athena-bccr/sys.nix

@@ -6,17 +6,20 @@
   ...
 }: let
   athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release};
+  inherit (athena) vendor;
 in {
   environment = {
-    etc = {
+    etc =
-      "Athena".source = "${athena.ase-pkcs11}/etc/Athena";
+      {
-
+        "pkcs11/modules/${vendor}".text = ''
-      "pkcs11/modules/asep11".text = ''
+          module: ${athena.pkcs11-module}
-        module: ${athena.libasep11}
         '';
+      }
+      // lib.optionalAttrs (vendor == "athena") {
+        "Athena".source = "${athena.card-driver}/etc/Athena";
       };
 
-    systemPackages = [athena.ase-pkcs11];
+    systemPackages = [athena.card-driver];
   };
 
   security = {

trivionomicon/pkgs/athena-bccr/default.nix

@@ -2,7 +2,7 @@
   callPackage,
   lib,
 }: let
-  latest = "deb64-rev26";
+  latest = "deb64-rev26.2";
 
   releases = lib.mapAttrs (name: release: release // {name = name;}) (import ./releases.nix);
 
@@ -16,15 +16,16 @@
     };
 
   pkgsForRelease = release: let
-    ase-pkcs11 = unwrapped.ase-idprotect.lib;
+    inherit (unwrapped) card-driver bccr-cacerts;
-    libasep11 = "${ase-pkcs11}/lib/x64-athena/libASEP11.so";
+
     unwrapped = overrideUnwrapped {inherit release;} {};
+    pkcs11-module = "${card-driver.lib}/${card-driver.pkcs11-path}";
   in {
-    inherit ase-pkcs11 libasep11;
+    inherit card-driver bccr-cacerts pkcs11-module;
-    inherit (unwrapped) ase-idprotect bccr-cacerts;
+    inherit (release) vendor;
 
     gaudi = callPackage ./gaudi-env.nix {inherit unwrapped;};
-    firmador = callPackage ./firmador.nix {inherit libasep11;};
+    firmador = callPackage ./firmador.nix {inherit pkcs11-module;};
   };
 in
   lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};})

trivionomicon/pkgs/athena-bccr/firmador.nix

@@ -5,7 +5,7 @@
   maven,
   openjdk,
   wrapGAppsHook3,
-  libasep11 ? null,
+  pkcs11-module ? null,
 }: let
   jdk = openjdk.override {
     enableJavaFX = true;
@@ -34,8 +34,8 @@ in
       wrapGAppsHook3
     ];
 
-    postPatch = lib.optionalString (libasep11 != null) ''
+    postPatch = lib.optionalString (pkcs11-module != null) ''
-      sed -i 's@/usr/lib/x64-athena/libASEP11.so@${libasep11}@g' src/main/java/cr/libre/firmador/signers/CRSigner.java
+      sed -i 's@/usr/lib/x64-athena/libASEP11.so@${pkcs11-module}@g' src/main/java/cr/libre/firmador/signers/CRSigner.java
     '';
 
     installPhase = ''

trivionomicon/pkgs/athena-bccr/gaudi-env.nix

@@ -12,7 +12,7 @@ in
     name = "gaudi";
 
     targetPkgs = pkgs: [
-      unwrappedWithGaudi.ase-idprotect.lib
+      unwrappedWithGaudi.card-driver.lib
       unwrappedWithGaudi.gaudi
 
       (writeShellScriptBin "launch-gaudi" ''

trivionomicon/pkgs/athena-bccr/releases.nix

@@ -2,11 +2,26 @@
   "deb64-rev26" = {
     # nix hash convert --hash-algo sha256 --from base16 --to sri $(sha256sum sfd_ClientesLinux_DEB64_Rev26.zip | cut -d' ' -f1)
     hash = "sha256-ZPWP9TqJQ5coJAPzUSiaXKVItBWlqFM4smCjOf+gqQM=";
+    filename = "sfd_ClientesLinux_DEB64_Rev26.zip";
     basename = "sfd_ClientesLinux_DEB64_Rev26";
+    vendor = "athena";
 
     srcPaths = {
       gaudi = "Firma Digital/Agente GAUDI/agente-gaudi_20.0_amd64.deb";
       idprotect = "Firma Digital/PinTool/IDProtect PINTool 7.24.02/DEB/idprotectclient_7.24.02-0_amd64.deb";
     };
   };
+
+  "deb64-rev26.2" = {
+    # nix hash convert --hash-algo sha256 --from base16 --to sri $(sha256sum sfd_ClientesLinux_DEB64_Ubuntu24_rev26_02 | cut -d' ' -f1)
+    hash = "sha256-DNzP0YRnuUbfKLhi7JeQCirdGx4kM7ROqHDkTuVs0mA=";
+    filename = "sfd_ClientesLinux_DEB64_Ubuntu24_rev26_02.zip";
+    basename = "sfd_ClientesLinux_DEB64_Ubuntu24_26_02";
+    vendor = "idopte";
+
+    srcPaths = {
+      gaudi = "Firma Digital/Agente GAUDI/agente-gaudi_27.0_amd64.deb";
+      idopte = "Firma Digital/Idopte/Idopte_6.23.44.0_ubun24_amd64.deb";
+    };
+  };
 }

trivionomicon/pkgs/athena-bccr/unwrapped.nix

@@ -5,11 +5,11 @@
   gaudiHash ? null,
   ...
 }: let
-  inherit (release) srcPaths;
+  inherit (release) srcPaths vendor;
 
   src = requireFile {
     url = "https://soportefirmadigital.com";
-    name = "${release.basename}.zip";
+    name = release.filename;
 
     inherit (release) hash;
   };
@@ -42,7 +42,7 @@
         '';
       }
       // lib.removeAttrs args ["stdenv" "dpkg" "unzip" "srcPath" "nativeBuildInputs"]);
-in {
+
   ase-idprotect = {
     autoPatchelfHook,
     dpkg,
@@ -89,8 +89,64 @@ in {
       preFixup = ''
         patchelf --set-rpath $lib/lib/x64-athena $out/bin/*
       '';
+
+      passthru.pkcs11-path = "lib/x64-athena/libASEP11.so";
     };
 
+  scmiddleware = {
+    autoPatchelfHook,
+    dpkg,
+    glib,
+    gtk3,
+    libappindicator-gtk3,
+    libnotify,
+    openssl,
+    pcsclite,
+    stdenv,
+    unzip,
+    webkitgtk_4_1,
+    ...
+  }:
+    moduleFromDeb "idopte-scmiddleware" {
+      inherit dpkg stdenv unzip;
+      srcPath = srcPaths.idopte;
+
+      buildInputs = [
+        glib
+        gtk3
+        libappindicator-gtk3
+        libnotify
+        openssl
+        pcsclite
+        stdenv.cc.cc.lib
+        webkitgtk_4_1
+      ];
+
+      nativeBuildInputs = [
+        autoPatchelfHook
+      ];
+
+      outputs = ["out" "lib"];
+
+      installPhase = ''
+        runHook preInstall
+
+        install -m755 -d $out/bin $lib/{etc,lib/SCMiddleware}
+        install -m755 usr/lib/SCMiddleware/{idocachesrv,SCManager} $out/bin
+        install -m755 usr/lib/SCMiddleware/*.so $lib/lib/SCMiddleware
+        cp -r etc/id* $lib/etc
+
+        runHook postInstall
+      '';
+
+      preFixup = ''
+        patchelf --set-rpath $lib/lib/SCMiddleware $lib/lib/SCMiddleware/* $out/bin/*
+      '';
+
+      passthru.pkcs11-path = "lib/SCMiddleware/libidop11.so";
+    };
+in
+  {
     gaudi = {
       autoPatchelfHook,
       dpkg,
@@ -223,4 +279,10 @@ in {
 
         echo -e "\ngaudiHash: $(nix-hash --to-sri --type sha256 $(sha256sum "$zip_path" | cut -d' ' -f1))"
       '';
-}
+  }
+  // lib.optionalAttrs (vendor == "athena") {
+    card-driver = ase-idprotect;
+  }
+  // lib.optionalAttrs (vendor == "idopte") {
+    card-driver = scmiddleware;
+  }