From 357d67aa5c04abfddef1a1a6b7e2642590696bd7 Mon Sep 17 00:00:00 2001
From: Martin Vogel <martin.vogel@sinc.de>
Date: Wed, 28 Jun 2023 14:56:00 +0200
Subject: [PATCH] refactor(#664): make key size constant
---
.../java/dev/fitko/fitconnect/cli/CommandExecutor.java | 8 ++++----
.../fitconnect/cli/commands/CreateTestKeysCommand.java | 3 ---
.../dev/fitko/fitconnect/cli/keygen/JWKGenerator.java | 2 ++
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java b/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java
index 8b2a292c1..cd52dad9d 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/CommandExecutor.java
@@ -39,6 +39,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static dev.fitko.fitconnect.cli.keygen.JWKGenerator.DEFAULT_KEY_SIZE;
+
class CommandExecutor {
private static final Logger LOGGER = LoggerFactory.getLogger(CommandExecutor.class);
@@ -126,10 +128,8 @@ class CommandExecutor {
LOGGER.info("Generating JWKs ...");
- final int keySize = createTestKeysCommand.keySize == 0 ? 4096 : createTestKeysCommand.keySize;
-
- final JWKPair encryptionKeyPair = jwkGenerator.generateEncryptionKeyPair(keySize);
- final JWKPair signatureKeyPair = jwkGenerator.generateSignatureKeyPair(keySize);
+ final JWKPair encryptionKeyPair = jwkGenerator.generateEncryptionKeyPair(DEFAULT_KEY_SIZE);
+ final JWKPair signatureKeyPair = jwkGenerator.generateSignatureKeyPair(DEFAULT_KEY_SIZE);
final KeyWriterSettings keyWriterSettings = KeyWriterSettings.builder()
.outputDir(createTestKeysCommand.outputDir)
diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java b/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java
index a03f75bbf..4901e7e49 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/commands/CreateTestKeysCommand.java
@@ -12,9 +12,6 @@ public class CreateTestKeysCommand {
public static final String CREATE_TEST_KEYS_COMMAND_NAME = "keygen";
- @Parameter(names = {"--keySize"}, description = "Unique destination identifier in UUID format", arity = 1)
- public int keySize = 4096;
-
@Parameter(names = {"--outDir"}, description = "Output directory folder where the generated test keys are written to", arity = 1)
public String outputDir;
diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
index 3c9a7ae2b..705fb8b6e 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
@@ -38,6 +38,8 @@ import java.util.UUID;
*/
public class JWKGenerator {
+ public static final int DEFAULT_KEY_SIZE = 4096;
+
/**
* Generate a set of public encryption key and private decryption key.
*
--
GitLab