[KARAF-5286] Set default key size to 2048
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0c763474 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0c763474 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0c763474 Branch: refs/heads/OPENSSH Commit: 0c763474752ce056665e8d8e2e4e7da9520f7e7c Parents: 648037a Author: Christian Schneider <[email protected]> Authored: Thu Aug 3 13:02:20 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Thu Aug 3 15:53:23 2017 +0200 ---------------------------------------------------------------------- .../instance/resources/etc/org.apache.karaf.shell.cfg | 10 ++-------- .../main/java/org/apache/karaf/shell/ssh/Activator.java | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0c763474/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg ---------------------------------------------------------------------- diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg index 3ba42e0..1e3cef1 100644 --- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg +++ b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg @@ -44,12 +44,6 @@ sshRealm = karaf hostKey = ${karaf.etc}/host.key # -# The format used for hostKey. -#Â Possible values are simple (Karaf internal), or PEM (OpenSSH format) -# -hostKeyFormat = simple - -# # Role name used for SSH access authorization # If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties # @@ -57,9 +51,9 @@ hostKeyFormat = simple # # Self defined key size in 1024, 2048, 3072, or 4096 -# If not set, this defaults to 4096. +# If not set, this defaults to 2048. # -# keySize = 4096 +# keySize = 2048 # # Specify host key algorithm, defaults to RSA http://git-wip-us.apache.org/repos/asf/karaf/blob/0c763474/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java index f3325df..fd5458a 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java @@ -148,7 +148,7 @@ public class Activator extends BaseActivator implements ManagedService { String sshRealm = getString("sshRealm", "karaf"); String hostKey = getString("hostKey", System.getProperty("karaf.etc") + "/host.key"); String[] authMethods = getStringArray("authMethods", "keyboard-interactive,password,publickey"); - int keySize = getInt("keySize", 4096); + int keySize = getInt("keySize", 2048); String algorithm = getString("algorithm", "RSA"); String[] macs = getStringArray("macs", "hmac-sha2-512,hmac-sha2-256,hmac-sha1"); String[] ciphers = getStringArray("ciphers", "aes128-ctr,arcfour128,aes128-cbc,3des-cbc,blowfish-cbc");
