[mina-sshd] branch master updated (035b6fde8 -> a87697b05)

[tw...@apache.org]

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

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


    from 035b6fde8 Adapt OSGi metadata of sshd.osgi to work with slf4j-api 1 and 2
     add a87697b05 Support RFC 5958 encrypted private keys

No new revisions were added by this update.

Summary of changes:
 CHANGES.md                                         |  4 ++
 .../loader/pem/PKCS8PEMResourceKeyPairParser.java  | 84 +++++++++++++++++++---
 .../sshd/common/util/security/Decryptor.java       | 51 +++++++++++++
 .../sshd/common/util/security/SecurityUtils.java   |  6 ++
 ...uncyCastleEncryptedPrivateKeyInfoDecryptor.java | 65 +++++++++++++++++
 .../pem/PKCS8PEMResourceKeyPairParserTest.java     | 56 +++++++++++++++
 .../config/keys/loader/pem/pkcs8-dsa-1024.enc      | 15 ++++
 .../config/keys/loader/pem/pkcs8-dsa-1024.enc2     | 12 ++++
 .../config/keys/loader/pem/pkcs8-dsa-512.enc       | 11 +++
 .../config/keys/loader/pem/pkcs8-dsa-512.enc2      |  9 +++
 .../config/keys/loader/pem/pkcs8-dsa-768.enc       | 13 ++++
 .../config/keys/loader/pem/pkcs8-dsa-768.enc2      | 10 +++
 .../common/config/keys/loader/pem/pkcs8-ec-256.enc |  8 +++
 .../config/keys/loader/pem/pkcs8-ec-256.enc2       |  7 ++
 .../common/config/keys/loader/pem/pkcs8-ec-384.enc |  9 +++
 .../config/keys/loader/pem/pkcs8-ec-384.enc2       |  8 +++
 .../common/config/keys/loader/pem/pkcs8-ec-521.enc | 10 +++
 .../config/keys/loader/pem/pkcs8-ec-521.enc2       | 10 +++
 .../common/config/keys/loader/pem/pkcs8-eddsa.enc  |  7 ++
 .../common/config/keys/loader/pem/pkcs8-eddsa.enc2 |  6 ++
 .../config/keys/loader/pem/pkcs8-rsa-1024.enc      | 18 +++++
 .../config/keys/loader/pem/pkcs8-rsa-1024.enc2     | 18 +++++
 .../config/keys/loader/pem/pkcs8-rsa-2048.enc      | 30 ++++++++
 .../config/keys/loader/pem/pkcs8-rsa-2048.enc2     | 30 ++++++++
 .../config/keys/loader/pem/pkcs8-rsa-3072.enc      | 42 +++++++++++
 .../config/keys/loader/pem/pkcs8-rsa-3072.enc2     | 42 +++++++++++
 .../config/keys/loader/pem/pkcs8-rsa-4096.enc      | 54 ++++++++++++++
 .../config/keys/loader/pem/pkcs8-rsa-4096.enc2     | 54 ++++++++++++++
 28 files changed, 678 insertions(+), 11 deletions(-)
 create mode 100644 sshd-common/src/main/java/org/apache/sshd/common/util/security/Decryptor.java
 create mode 100644 sshd-common/src/main/java/org/apache/sshd/common/util/security/bouncycastle/BouncyCastleEncryptedPrivateKeyInfoDecryptor.java
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-dsa-1024.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-dsa-1024.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-dsa-512.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-dsa-512.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-dsa-768.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-dsa-768.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-ec-256.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-ec-256.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-ec-384.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-ec-384.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-ec-521.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-ec-521.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-eddsa.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-eddsa.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-1024.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-1024.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-2048.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-2048.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-3072.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-3072.enc2
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-4096.enc
 create mode 100644 sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/pkcs8-rsa-4096.enc2