diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java index 5e0b615a..19d2c733 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java @@ -39,10 +39,10 @@ public class OpenSSHKeyFile extends PKCS8KeyFile { public static class Factory - implements net.schmizz.sshj.common.Factory.Named { + implements net.schmizz.sshj.common.Factory.Named { @Override - public FileKeyProvider create() { + public KeyProvider create() { return new OpenSSHKeyFile(); } diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java index 34e0bb82..ce7d8833 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java @@ -17,6 +17,7 @@ package net.schmizz.sshj.userauth.keyprovider; import java.io.File; import java.io.IOException; +import java.io.Reader; import java.security.KeyPair; import java.security.PrivateKey; import java.security.PublicKey; @@ -26,6 +27,7 @@ import net.schmizz.sshj.common.KeyType; import net.schmizz.sshj.userauth.password.PasswordFinder; import net.schmizz.sshj.userauth.password.PasswordUtils; import net.schmizz.sshj.userauth.password.PrivateKeyFileResource; +import net.schmizz.sshj.userauth.password.PrivateKeyReaderResource; import net.schmizz.sshj.userauth.password.PrivateKeyStringResource; import net.schmizz.sshj.userauth.password.Resource; @@ -41,13 +43,13 @@ import org.slf4j.LoggerFactory; /** Represents a PKCS8-encoded key file. This is the format used by OpenSSH and OpenSSL. */ public class PKCS8KeyFile - implements FileKeyProvider { + implements FileKeyProvider, ReaderKeyProvider { public static class Factory - implements net.schmizz.sshj.common.Factory.Named { + implements net.schmizz.sshj.common.Factory.Named { @Override - public FileKeyProvider create() { + public KeyProvider create() { return new PKCS8KeyFile(); } @@ -84,6 +86,18 @@ public class PKCS8KeyFile return type != null ? type : (type = KeyType.fromKey(getPublic())); } + @Override + public void init(Reader location) { + assert location != null; + resource = new PrivateKeyReaderResource(location); + } + + @Override + public void init(Reader location, PasswordFinder pwdf) { + init(location); + this.pwdf = pwdf; + } + @Override public void init(File location) { assert location != null; diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/ReaderKeyProvider.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/ReaderKeyProvider.java new file mode 100644 index 00000000..abf4f8f5 --- /dev/null +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/ReaderKeyProvider.java @@ -0,0 +1,15 @@ +package net.schmizz.sshj.userauth.keyprovider; + +import java.io.Reader; + +import net.schmizz.sshj.userauth.password.PasswordFinder; + +/** + * @version $Id:$ + */ +public interface ReaderKeyProvider extends KeyProvider { + + void init(Reader location); + + void init(Reader location, PasswordFinder pwdf); +} diff --git a/src/main/java/net/schmizz/sshj/userauth/password/PrivateKeyReaderResource.java b/src/main/java/net/schmizz/sshj/userauth/password/PrivateKeyReaderResource.java new file mode 100644 index 00000000..90eb3336 --- /dev/null +++ b/src/main/java/net/schmizz/sshj/userauth/password/PrivateKeyReaderResource.java @@ -0,0 +1,33 @@ +/* + * Copyright 2010-2012 sshj contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package net.schmizz.sshj.userauth.password; + +import java.io.IOException; +import java.io.Reader; + +public class PrivateKeyReaderResource + extends Resource { + + public PrivateKeyReaderResource(Reader privateKeyFile) { + super(privateKeyFile); + } + + @Override + public Reader getReader() + throws IOException { + return getDetail(); + } +}