-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: upstream changes. Update flake.lock for
develop
(#144)
1. certutilpath.patch patched file changed. Removed bc/ is not used anymore due to the autofirma-setup removal. 2. etc_config.patch patched file changed. A class name and also the line endings mutated to windows CRLF *sigh*. 3. Autofirma.jar has been renamed to autofirma.jar (*double sigh*.) 4. Autofirma now expects the cer file to be named Autofirma_ROOT.cer --- Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action. ``` Flake lock file updates: • Updated input 'autofirma-src': 'github:ctt-gob-es/clienteafirma/b93fe10674224b27204659b30cb99d1c2768e2bd?narHash=sha256-kuh0fnmwCoQ5YuDeJlcqVVLEG21AGcdVRSh4GB3LPZ4%3D' (2025-02-12) → 'github:ctt-gob-es/clienteafirma/c6134c16c0283e39ce5d9af2a2f2f11c75e0ba60?narHash=sha256-Cc9LFSgO280DLSwaoNq3BIQu646%2BbdeuyhZ58ZGoajY%3D' (2025-02-13) • Updated input 'home-manager': 'github:nix-community/home-manager/c9d343cfa0565671cc7e8d5aefebaf61cc840abd?narHash=sha256-Af1CIT%2BXlXEb%2BDk11sgPDzJoOUiada2Xoj5hA8TBvLY%3D' (2025-02-13) → 'github:nix-community/home-manager/5031c6d2978109336637977c165f82aa49fa16a7?narHash=sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4%3D' (2025-02-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a?narHash=sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM%3D' (2025-02-10) → 'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0?narHash=sha256-%2B/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc%3D' (2025-02-13) ``` ### Running GitHub Actions on this PR GitHub Actions will not run workflows on pull requests which are opened by a GitHub Action. To run GitHub Actions workflows on this PR, run: ```sh git branch -D update/flake/develop git fetch origin git checkout update/flake/develop git commit --amend --no-edit git push origin update/flake/develop --force ``` --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Roberto Abdelkader Martínez Pérez <robertomartinezp@gmail.com>
- Loading branch information
1 parent
0e037c7
commit dfec6f0
Showing
7 changed files
with
24 additions
and
43 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
diff --git a/afirma-simple/src/main/java/es/gob/afirma/standalone/protocol/SecureSocketUtils.java b/afirma-simple/src/main/java/es/gob/afirma/standalone/protocol/SecureSocketUtils.java | ||
index 4485c27aa..6e96cb830 100644 | ||
index e925ac3ff..fd5838557 100644 | ||
--- a/afirma-simple/src/main/java/es/gob/afirma/standalone/protocol/SecureSocketUtils.java | ||
+++ b/afirma-simple/src/main/java/es/gob/afirma/standalone/protocol/SecureSocketUtils.java | ||
@@ -65,7 +65,8 @@ class SecureSocketUtils { | ||
* @return Almacén de claves o {@code null} si no se encontró. */ | ||
private static File getKeyStoreFile() { | ||
|
||
- File appDir = AutoFirmaUtil.getApplicationDirectory(); | ||
+ // Check first in /etc for the KeyStoreFile | ||
+ File appDir = new File("/etc/Autofirma"); | ||
|
||
if (appDir != null && new File(appDir, KEYSTORE_NAME).exists() | ||
&& new File(appDir, CA_ROOT_NAME).exists()) { | ||
* @return Almacén de claves o {@code null} si no se encontró. */ | ||
private static File getKeyStoreFile() { | ||
|
||
- File appDir = DesktopUtil.getApplicationDirectory(); | ||
+ // Check first in /etc for the KeyStoreFile | ||
+ File appDir = new File("/etc/Autofirma"); | ||
|
||
if (appDir != null && new File(appDir, KEYSTORE_NAME).exists() | ||
&& new File(appDir, CA_ROOT_NAME).exists()) { |