From 8faea04ff13b847fa2065ed127273d706be89064 Mon Sep 17 00:00:00 2001 From: M Tien <56892372+mtien-apache@users.noreply.github.com> Date: Mon, 10 Feb 2020 20:22:49 -0500 Subject: [PATCH] NIFI-7082 Updated tls-toolkit default server and client certificates validity days to 825 days. (#4046) Signed-off-by: Andy LoPresto --- .../src/main/resources/conf/config-client.json | 2 +- .../src/main/resources/conf/config-server.json | 2 +- .../org/apache/nifi/toolkit/tls/configuration/TlsConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-client.json b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-client.json index e572bc1407..ea0d33327f 100644 --- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-client.json +++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-client.json @@ -7,7 +7,7 @@ "caHostname" : "localhost", "trustStore" : "clientTrustStore", "trustStoreType" : "jks", - "days" : 1095, + "days" : 825, "keySize" : 2048, "keyPairAlgorithm" : "RSA", "signingAlgorithm" : "SHA256WITHRSA" diff --git a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-server.json b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-server.json index fae89ed5ca..8044a6d050 100644 --- a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-server.json +++ b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/conf/config-server.json @@ -4,7 +4,7 @@ "token" : "myTestTokenUseSomethingStronger", "caHostname" : "localhost", "port" : 8443, - "days" : 1095, + "days" : 825, "keySize" : 2048, "keyPairAlgorithm" : "RSA", "signingAlgorithm" : "SHA256WITHRSA" diff --git a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/configuration/TlsConfig.java b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/configuration/TlsConfig.java index 5e440a798d..2b7f8a1a03 100644 --- a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/configuration/TlsConfig.java +++ b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/configuration/TlsConfig.java @@ -28,7 +28,7 @@ public class TlsConfig { public static final String DEFAULT_HOSTNAME = "localhost"; public static final String DEFAULT_KEY_STORE_TYPE = "jks"; public static final int DEFAULT_PORT = 8443; - public static final int DEFAULT_DAYS = 3 * 365; + public static final int DEFAULT_DAYS = 825; public static final int DEFAULT_KEY_SIZE = 2048; public static final String DEFAULT_KEY_PAIR_ALGORITHM = "RSA"; public static final String DEFAULT_SIGNING_ALGORITHM = "SHA256WITHRSA";