This is an automated email from the ASF dual-hosted git repository.
lgoldstein 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 56087bb [SSHD-1004] Mark retired security settings as deprecated
56087bb is described below
commit 56087bb68b42c0e9b809cfcbc14bdf60b183f4eb
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Tue Aug 4 09:59:28 2020 +0300
[SSHD-1004] Mark retired security settings as deprecated
---
.../apache/sshd/common/cipher/BuiltinCiphers.java | 20 ++++++++++++++++++++
.../java/org/apache/sshd/common/mac/BuiltinMacs.java | 15 +++++++++++++++
.../sshd/common/signature/BuiltinSignatures.java | 15 +++++++++++++++
.../apache/sshd/common/kex/BuiltinDHFactories.java | 15 +++++++++++++++
4 files changed, 65 insertions(+)
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/cipher/BuiltinCiphers.java
b/sshd-common/src/main/java/org/apache/sshd/common/cipher/BuiltinCiphers.java
index c66bc64..732901b 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/cipher/BuiltinCiphers.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/cipher/BuiltinCiphers.java
@@ -74,19 +74,39 @@ public enum BuiltinCiphers implements CipherFactory {
aes192ctr(Constants.AES192_CTR, 16, 0, 24, "AES", 192,
"AES/CTR/NoPadding", 16),
aes256cbc(Constants.AES256_CBC, 16, 0, 32, "AES", 256,
"AES/CBC/NoPadding", 16),
aes256ctr(Constants.AES256_CTR, 16, 0, 32, "AES", 256,
"AES/CTR/NoPadding", 16),
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
arcfour128(Constants.ARCFOUR128, 8, 0, 16, "ARCFOUR", 128, "RC4", 16) {
@Override
public Cipher create() {
return new BaseRC4Cipher(getIVSize(), getKdfSize(), getKeySize(),
getCipherBlockSize());
}
},
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
arcfour256(Constants.ARCFOUR256, 8, 0, 32, "ARCFOUR", 256, "RC4", 32) {
@Override
public Cipher create() {
return new BaseRC4Cipher(getIVSize(), getKdfSize(), getKeySize(),
getCipherBlockSize());
}
},
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
blowfishcbc(Constants.BLOWFISH_CBC, 8, 0, 16, "Blowfish", 128,
"Blowfish/CBC/NoPadding", 8),
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
tripledescbc(Constants.TRIPLE_DES_CBC, 8, 0, 24, "DESede", 192,
"DESede/CBC/NoPadding", 8);
public static final Set<BuiltinCiphers> VALUES =
Collections.unmodifiableSet(EnumSet.allOf(BuiltinCiphers.class));
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/mac/BuiltinMacs.java
b/sshd-common/src/main/java/org/apache/sshd/common/mac/BuiltinMacs.java
index 3702fb5..796d9bc 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/mac/BuiltinMacs.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/mac/BuiltinMacs.java
@@ -43,7 +43,17 @@ import org.apache.sshd.common.util.ValidateUtils;
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public enum BuiltinMacs implements MacFactory {
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
hmacmd5(Constants.HMAC_MD5, "HmacMD5", 16, 16),
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
hmacmd596(Constants.HMAC_MD5_96, "HmacMD5", 12, 16),
hmacsha1(Constants.HMAC_SHA1, "HmacSHA1", 20, 20),
hmacsha1etm(Constants.ETM_HMAC_SHA1, "HmacSHA1", 20, 20) {
@@ -52,6 +62,11 @@ public enum BuiltinMacs implements MacFactory {
return true;
}
},
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
hmacsha196(Constants.HMAC_SHA1_96, "HmacSHA1", 12, 20),
/** See <A HREF="https://tools.ietf.org/html/rfc6668";>RFC 6668</A> */
hmacsha256(Constants.HMAC_SHA2_256, "HmacSHA256", 32, 32),
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/signature/BuiltinSignatures.java
b/sshd-common/src/main/java/org/apache/sshd/common/signature/BuiltinSignatures.java
index a6d995c..dacb79f 100644
---
a/sshd-common/src/main/java/org/apache/sshd/common/signature/BuiltinSignatures.java
+++
b/sshd-common/src/main/java/org/apache/sshd/common/signature/BuiltinSignatures.java
@@ -51,12 +51,22 @@ import org.apache.sshd.common.util.security.SecurityUtils;
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public enum BuiltinSignatures implements SignatureFactory {
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
dsa(KeyPairProvider.SSH_DSS) {
@Override
public Signature create() {
return new SignatureDSA();
}
},
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
dsa_cert(KeyPairProvider.SSH_DSS_CERT) {
@Override
public Signature create() {
@@ -69,6 +79,11 @@ public enum BuiltinSignatures implements SignatureFactory {
return new SignatureRSASHA1();
}
},
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
rsa_cert(KeyPairProvider.SSH_RSA_CERT) {
@Override
public Signature create() {
diff --git
a/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java
b/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java
index 9b6dc5d..f920139 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/BuiltinDHFactories.java
@@ -44,6 +44,11 @@ import org.apache.sshd.common.util.security.SecurityUtils;
* @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
*/
public enum BuiltinDHFactories implements DHFactory {
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
dhg1(Constants.DIFFIE_HELLMAN_GROUP1_SHA1) {
@Override
public DHG create(Object... params) throws Exception {
@@ -58,6 +63,11 @@ public enum BuiltinDHFactories implements DHFactory {
return SecurityUtils.isDHOakelyGroupSupported(1024) &&
BuiltinDigests.sha1.isSupported();
}
},
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
dhg14(Constants.DIFFIE_HELLMAN_GROUP14_SHA1) {
@Override
public DHG create(Object... params) throws Exception {
@@ -142,6 +152,11 @@ public enum BuiltinDHFactories implements DHFactory {
return SecurityUtils.isDHOakelyGroupSupported(8192) &&
BuiltinDigests.sha512.isSupported();
}
},
+ /**
+ * @deprecated
+ * @see <A
HREF="https://issues.apache.org/jira/browse/SSHD-1004";>SSHD-1004</A>
+ */
+ @Deprecated
dhgex(Constants.DIFFIE_HELLMAN_GROUP_EXCHANGE_SHA1) {
@Override
public DHG create(Object... params) throws Exception {
