fix: allow autofirma to load aarch64 NSS

nix-community · Jan 31, 2025 · 1f999ac · 1f999ac
1 parent 785822b
commit 1f999ac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/nix/autofirma/default.nix b/nix/autofirma/default.nix
@@ -34,6 +34,7 @@
         ./patches/clienteafirma/pr-367.patch
         ./patches/clienteafirma/certutilpath.patch
         ./patches/clienteafirma/etc_config.patch
+        ./patches/clienteafirma/aarch64_elf.patch
       ]
       ++ (lib.optional disableJavaVersionCheck [
         ./patches/clienteafirma/dont_check_java_version.patch

diff --git a/nix/autofirma/patches/clienteafirma/aarch64_elf.patch b/nix/autofirma/patches/clienteafirma/aarch64_elf.patch
@@ -0,0 +1,16 @@
+diff --git a/afirma-keystores-mozilla/src/main/java/es/gob/afirma/keystores/mozilla/bintutil/ElfParser.java b/afirma-keystores-mozilla/src/main/java/es/gob/afirma/keystores/mozilla/bintutil/ElfParser.java
+index ae1f04d97..897b662d9 100644
+--- a/afirma-keystores-mozilla/src/main/java/es/gob/afirma/keystores/mozilla/bintutil/ElfParser.java
++++ b/afirma-keystores-mozilla/src/main/java/es/gob/afirma/keystores/mozilla/bintutil/ElfParser.java
+@@ -139,8 +139,10 @@ public final class ElfParser {
+ 			return false;
+ 		}
+ 		return "64".equals(Platform.getJavaArch()) && //$NON-NLS-1$
+-					Platform.MACHINE.AMD64.equals(Platform.getMachineType()) &&
++					(Platform.MACHINE.AMD64.equals(Platform.getMachineType()) &&
+ 						ElfMachineType.AMD64.equals(a) ||
++					Platform.MACHINE.ARM64.equals(Platform.getMachineType()) &&
++						ElfMachineType.ARM64.equals(a)) ||
+ 			   "32".equals(Platform.getJavaArch()) && //$NON-NLS-1$
+ 			   		(Platform.MACHINE.X86.equals(Platform.getMachineType()) || Platform.MACHINE.AMD64.equals(Platform.getMachineType())) && // 32 puede estar en maquina de 32 o de 64 bits
+ 		   				ElfMachineType.X86.equals(a);