This is an automated email from the ASF dual-hosted git repository.
twolf pushed a change to branch dev_3.0
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
from bee4c73b1 [maven-release-plugin] prepare for next development iteration
new 01ad91edf Limit maximum padding for small channel data messages
new 2299ba8fd Remove generics from key decoders
new 1b2021fe8 Simplify ed25519 handling
new 834a078ad More ed25519 simplifications
new fdac96c91 Update CHANGES.md
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.md | 33 +--
CHANGES.md => docs/changes/3.0.0-M1.md | 14 +-
.../org/apache/sshd/cli/client/SshKeyScanMain.java | 2 +-
.../sshd/cli/server/SshServerCliSupport.java | 2 +-
.../sshd/common/config/keys/BuiltinIdentities.java | 100 +------
.../apache/sshd/common/config/keys/Identity.java | 6 -
.../common/config/keys/IdentityResourceLoader.java | 45 ---
.../sshd/common/config/keys/IdentityUtils.java | 5 +-
.../sshd/common/config/keys/KeyEntryResolver.java | 18 +-
.../apache/sshd/common/config/keys/KeyUtils.java | 40 +--
.../common/config/keys/PrivateKeyEntryDecoder.java | 15 +-
.../sshd/common/config/keys/PublicKeyEntry.java | 4 +-
.../common/config/keys/PublicKeyEntryDecoder.java | 12 +-
.../config/keys/PublicKeyRawDataDecoder.java | 10 +-
.../keys/impl/AbstractIdentityResourceLoader.java | 25 +-
.../config/keys/impl/AbstractKeyEntryResolver.java | 20 +-
.../keys/impl/AbstractPrivateKeyEntryDecoder.java | 14 +-
.../keys/impl/AbstractPublicKeyEntryDecoder.java | 8 +-
.../config/keys/impl/DSSPublicKeyEntryDecoder.java | 14 +-
.../keys/impl/ECDSAPublicKeyEntryDecoder.java | 18 +-
.../keys/impl/OpenSSHCertificateDecoder.java | 28 +-
.../config/keys/impl/RSAPublicKeyDecoder.java | 23 +-
.../keys/impl/SkECDSAPublicKeyEntryDecoder.java | 15 +-
.../keys/impl/SkED25519PublicKeyEntryDecoder.java | 25 +-
.../openssh/OpenSSHDSSPrivateKeyEntryDecoder.java | 21 +-
.../OpenSSHECDSAPrivateKeyEntryDecoder.java | 18 +-
.../openssh/OpenSSHKeyPairResourceParser.java | 18 +-
.../openssh/OpenSSHRSAPrivateKeyDecoder.java | 18 +-
.../loader/pem/PKCS8PEMResourceKeyPairParser.java | 7 +-
.../loader/ssh2/Ssh2PublicKeyEntryDecoder.java | 4 +-
.../openssh/OpenSSHKeyPairResourceWriter.java | 10 +-
.../sshd/common/signature/BuiltinSignatures.java | 5 +-
.../sshd/common/signature/SignatureFactory.java | 3 +-
.../sshd/common/signature/SignatureSkED25519.java | 4 +-
.../org/apache/sshd/common/util/buffer/Buffer.java | 22 +-
.../buffer/keys/ED25519BufferPublicKeyParser.java | 4 +-
.../security/PublicKeyFactory.java} | 16 +-
.../util/security/SecurityEntityFactory.java | 10 +-
.../util/security/SecurityProviderChoice.java | 7 +
.../util/security/SecurityProviderRegistrar.java | 14 +-
.../sshd/common/util/security/SecurityUtils.java | 183 +++---------
...tory.java => BouncyCastlePublicKeyFactory.java} | 37 ++-
.../BouncyCastleSecurityProviderRegistrar.java | 23 +-
.../eddsa/Ed25519PEMResourceKeyParser.java | 63 -----
.../security/eddsa/Ed25519PublicKeyDecoder.java | 43 ---
.../eddsa/EdDSASecurityProviderRegistrar.java | 82 +++++-
.../security/eddsa/EdDSASecurityProviderUtils.java | 54 +---
.../security/eddsa/NetI2pCryptoEdDSASupport.java | 135 ---------
.../OpenSSHEd25519PrivateKeyEntryDecoder.java | 40 ---
.../util/security/eddsa/SignatureEd25519.java | 33 ---
.../bouncycastle/BouncyCastleEdDSASupport.java | 169 -----------
...arser.java => Ed25519PEMResourceKeyParser.java} | 36 ++-
...eyDecoder.java => Ed25519PublicKeyDecoder.java} | 29 +-
.../util/security/eddsa/generic/EdDSASupport.java | 198 -------------
.../util/security/eddsa/generic/EdDSAUtils.java | 308 ++++++++++++++++++++-
...a => OpenSSHEd25519PrivateKeyEntryDecoder.java} | 55 ++--
...SignatureEd25519.java => SignatureEd25519.java} | 15 +-
.../common/config/keys/BuiltinIdentitiesTest.java | 5 +
.../keys/EcdsaPublicKeyEntryDecoderTest.java | 4 +-
.../sshd/common/config/keys/KeyRandomArtTest.java | 9 +-
.../OpenSSHKeyPairResourceParserDecodingTest.java | 6 -
.../pem/PKCS8PEMResourceKeyPairParserTest.java | 4 +-
.../BouncyCastleGeneratorHostKeyProviderTest.java | 4 +-
.../util/security/eddsa/EDDSAProviderTest.java | 13 +-
.../util/security/eddsa/Ed25519VectorsTest.java | 304 +++++++++-----------
.../eddsa/EdDSASecurityProviderRegistrarTest.java | 4 +-
.../SimpleGeneratorHostKeyProviderTest.java | 2 +-
.../pem/{pkcs8-eddsa.enc => pkcs8-ed25519.enc} | 0
.../pem/{pkcs8-eddsa.enc2 => pkcs8-ed25519.enc2} | 0
.../pem/{pkcs8-eddsa.pem => pkcs8-ed25519.pem} | 0
.../sshd/common/session/filters/CryptFilter.java | 16 +-
.../common/signature/SignatureFactoriesTest.java | 13 +-
.../apache/sshd/putty/AbstractPuttyKeyDecoder.java | 10 +-
.../org/apache/sshd/putty/DSSPuttyKeyDecoder.java | 6 +-
.../apache/sshd/putty/ECDSAPuttyKeyDecoder.java | 6 +-
.../apache/sshd/putty/EdDSAPuttyKeyDecoder.java | 11 +-
.../sshd/putty/PuttyKeyPairResourceParser.java | 7 +-
.../java/org/apache/sshd/putty/PuttyKeyUtils.java | 10 +-
.../org/apache/sshd/putty/RSAPuttyKeyDecoder.java | 6 +-
.../sshd/putty/AbstractPuttyTestSupport.java | 4 +-
.../org/apache/sshd/putty/PuttyKeyUtilsTest.java | 4 +-
81 files changed, 1002 insertions(+), 1626 deletions(-)
copy CHANGES.md => docs/changes/3.0.0-M1.md (86%)
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/config/keys/IdentityResourceLoader.java
copy
sshd-common/src/main/java/org/apache/sshd/common/{config/keys/SshPublicKey.java
=> util/security/PublicKeyFactory.java} (65%)
copy
sshd-common/src/main/java/org/apache/sshd/common/util/security/bouncycastle/{BouncyCastleRandomFactory.java
=> BouncyCastlePublicKeyFactory.java} (54%)
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/Ed25519PEMResourceKeyParser.java
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/Ed25519PublicKeyDecoder.java
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/NetI2pCryptoEdDSASupport.java
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/OpenSSHEd25519PrivateKeyEntryDecoder.java
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/SignatureEd25519.java
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/bouncycastle/BouncyCastleEdDSASupport.java
rename
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/{GenericEd25519PEMResourceKeyParser.java
=> Ed25519PEMResourceKeyParser.java} (79%)
rename
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/{GenericEd25519PublicKeyDecoder.java
=> Ed25519PublicKeyDecoder.java} (71%)
delete mode 100644
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/EdDSASupport.java
rename
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/{GenericOpenSSHEd25519PrivateKeyEntryDecoder.java
=> OpenSSHEd25519PrivateKeyEntryDecoder.java} (78%)
rename
sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/{GenericSignatureEd25519.java
=> SignatureEd25519.java} (75%)
rename
sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/{pkcs8-eddsa.enc
=> pkcs8-ed25519.enc} (100%)
rename
sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/{pkcs8-eddsa.enc2
=> pkcs8-ed25519.enc2} (100%)
rename
sshd-common/src/test/resources/org/apache/sshd/common/config/keys/loader/pem/{pkcs8-eddsa.pem
=> pkcs8-ed25519.pem} (100%)
