Author: gnodet Date: Wed Jun 10 14:44:34 2009 New Revision: 783375 URL: http://svn.apache.org/viewvc?rev=783375&view=rev Log: Add some constructors to the host key generator for ease of use in embedded mode
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java?rev=783375&r1=783374&r2=783375&view=diff ============================================================================== --- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java (original) +++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java Wed Jun 10 14:44:34 2009 @@ -48,6 +48,24 @@ private int keySize; private KeyPair keyPair; + protected AbstractGeneratorHostKeyProvider() { + } + + protected AbstractGeneratorHostKeyProvider(String path) { + this.path = path; + } + + protected AbstractGeneratorHostKeyProvider(String path, String algorithm) { + this.path = path; + this.algorithm = algorithm; + } + + protected AbstractGeneratorHostKeyProvider(String path, String algorithm, int keySize) { + this.path = path; + this.algorithm = algorithm; + this.keySize = keySize; + } + public String getPath() { return path; } Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java?rev=783375&r1=783374&r2=783375&view=diff ============================================================================== --- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java (original) +++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProvider.java Wed Jun 10 14:44:34 2009 @@ -34,6 +34,21 @@ */ public class PEMGeneratorHostKeyProvider extends AbstractGeneratorHostKeyProvider { + public PEMGeneratorHostKeyProvider() { + } + + public PEMGeneratorHostKeyProvider(String path) { + super(path); + } + + public PEMGeneratorHostKeyProvider(String path, String algorithm) { + super(path, algorithm); + } + + public PEMGeneratorHostKeyProvider(String path, String algorithm, int keySize) { + super(path, algorithm, keySize); + } + protected KeyPair doReadKeyPair(InputStream is) throws Exception { PEMReader r = new PEMReader(new InputStreamReader(is)); return (KeyPair) r.readObject(); Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java?rev=783375&r1=783374&r2=783375&view=diff ============================================================================== --- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java (original) +++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java Wed Jun 10 14:44:34 2009 @@ -31,6 +31,21 @@ */ public class SimpleGeneratorHostKeyProvider extends AbstractGeneratorHostKeyProvider { + public SimpleGeneratorHostKeyProvider() { + } + + public SimpleGeneratorHostKeyProvider(String path) { + super(path); + } + + public SimpleGeneratorHostKeyProvider(String path, String algorithm) { + super(path, algorithm); + } + + public SimpleGeneratorHostKeyProvider(String path, String algorithm, int keySize) { + super(path, algorithm, keySize); + } + protected KeyPair doReadKeyPair(InputStream is) throws Exception { ObjectInputStream r = new ObjectInputStream(is); return (KeyPair) r.readObject();