Author: jbonofre
Date: Wed Jun 20 09:48:46 2012
New Revision: 1352022
URL: http://svn.apache.org/viewvc?rev=1352022&view=rev
Log:
[KARAF-1513] Add sshd keySize and algorithm properties in order to support IBM
JDK
Modified:
karaf/branches/karaf-2.3.x/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
karaf/branches/karaf-2.3.x/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg?rev=1352022&r1=1352021&r2=1352022&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg
(original)
+++
karaf/branches/karaf-2.3.x/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg
Wed Jun 20 09:48:46 2012
@@ -43,3 +43,14 @@ hostKey=${karaf.base}/etc/host.key
# If not set, this defaults to the ${karaf.admin.role} configured in
etc/system.properties
#
# sshRole=admin
+
+#
+# Self defined key size in 1024, 2048, 3072, or 4096
+# If not set, this defaults to 1024.
+#
+# keySize=1024
+
+#
+# Specify host key algorithm, defaults to DSA
+#
+# algorithm=DSA
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg?rev=1352022&r1=1352021&r2=1352022&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
Wed Jun 20 09:48:46 2012
@@ -43,3 +43,14 @@ hostKey=${karaf.base}/etc/host.key
# If not set, this defaults to the ${karaf.admin.role} configured in
etc/system.properties
#
# sshRole=admin
+
+#
+# Self defined key size in 1024, 2048, 3072, or 4096
+# If not set, this defaults to 1024.
+#
+# keySize=1024
+
+#
+# Specify host key algorithm, defaults to DSA
+#
+# algorithm=DSA
\ No newline at end of file
Modified:
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?rev=1352022&r1=1352021&r2=1352022&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
(original)
+++
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
Wed Jun 20 09:48:46 2012
@@ -44,6 +44,8 @@
<cm:property name="hostKey" value="$[karaf.base]/etc/host.key"/>
<cm:property name="authorizedKeys"
value="$[karaf.base]/etc/authorized_keys"/>
<cm:property name="authMethods" value="password,publickey"/>
+ <cm:property name="keySize" value="1024"/>
+ <cm:property name="algorithm" value="DSA"/>
</cm:default-properties>
</cm:property-placeholder>
@@ -108,6 +110,8 @@
<bean id="keyPairProvider"
class="org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider">
<property name="path" value="${hostKey}"/>
+ <property name="keySize" value="${keySize}"/>
+ <property name="algorithm" value="${algorithm}"/>
</bean>
<bean id="authenticator"
class="org.apache.karaf.shell.ssh.KarafJaasAuthenticator">
<property name="realm" value="${sshRealm}"/>
Modified:
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1352022&r1=1352021&r2=1352022&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties
Wed Jun 20 09:48:46 2012
@@ -35,3 +35,9 @@ sshRealm.description = name of the JAAS
hostKey.name = Host key
hostKey.description = location of the host key for SSH
+
+keySize.name = Key size
+keySize.description = Secret key size in 1024, 2048, 3072, or 4096
+
+algorithm.name = Key algorithm
+algorithm.description = Host key algorithm in DSA, RSA, etc
\ No newline at end of file
Modified:
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1352022&r1=1352021&r2=1352022&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
(original)
+++
karaf/branches/karaf-2.3.x/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
Wed Jun 20 09:48:46 2012
@@ -23,6 +23,8 @@
<AD id="sshHost" type="String" default="0.0.0.0" name="%sshHost.name"
description="%sshHost.description"/>
<AD id="sshRealm" type="String" default="karaf" name="%sshRealm.name"
description="%sshRealm.description"/>
<AD id="hostKey" type="String" default="${karaf.base}/etc/host.key"
name="%hostKey.name" description="%hostKey.description"/>
+ <AD id="keySize" type="integer" default="1024" name="%keySize.name"
description="%keySize.description"/>
+ <AD id="algorithm" type="String" default="DSA" name="%algorithm.name"
description="%algorithm.description"/>
</OCD>
<Designate pid="org.apache.karaf.shell">
<Object ocdref="org.apache.karaf.shell"/>
