[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mina-commits
Subject:    [mina-sshd] branch master updated: SimpleGeneratorHostKeyProvider: load any kind of key
From:       twolf () apache ! org
Date:       2022-12-01 15:20:01
Message-ID: 166990800133.3619746.4552263269876263753 () gitbox2-he-fi ! apache ! org
[Download RAW message or body]

This is an automated email from the ASF dual-hosted git repository.

twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git


The following commit(s) were added to refs/heads/master by this push:
     new 3b16da435 SimpleGeneratorHostKeyProvider: load any kind of key
3b16da435 is described below

commit 3b16da43563abcfa1225bae1c4ddcf862acf9912
Author: Thomas Wolf <twolf@apache.org>
AuthorDate: Wed Nov 30 19:27:37 2022 +0100

    SimpleGeneratorHostKeyProvider: load any kind of key
    
    Just use the general SecurityUtils.loadKeyPairIdentities() to load the
    key.
---
 .../sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java \
b/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java
 index 38ba9113b..2a2d1603b 100644
--- a/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java
                
+++ b/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProvider.java
 @@ -35,9 +35,9 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.sshd.common.NamedResource;
-import org.apache.sshd.common.config.keys.loader.openssh.OpenSSHKeyPairResourceParser;
  import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyPairResourceWriter;
  import org.apache.sshd.common.session.SessionContext;
+import org.apache.sshd.common.util.security.SecurityUtils;
 
 /**
  * A simple implementation of an {@link AbstractGeneratorHostKeyProvider} that \
writes and reads host keys using the @@ -68,8 +68,7 @@ public class \
                SimpleGeneratorHostKeyProvider extends AbstractGeneratorHostKeyProv
                             "Cannot de-serialize " + resourceKey + ": missing \
classes: " + e.getMessage(), e);  }
             } else {
-                OpenSSHKeyPairResourceParser reader = new \
                OpenSSHKeyPairResourceParser();
-                return reader.loadKeyPairs(null, resourceKey, null, in);
+                return SecurityUtils.loadKeyPairIdentities(null, resourceKey, in, \
null);  }
         }
     }


[prev in list] [next in list] [prev in thread] [next in thread]