This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 8483843233 Add support for the CBC alias
8483843233 is described below
commit 84838432339b7e4eea18a414a640b4a139c68c7b
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Feb 10 16:04:19 2026 +0000
Add support for the CBC alias
---
.../util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java | 7 +++++++
.../net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java | 6 ++++++
webapps/docs/changelog.xml | 6 +++---
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
index 6e4216a894..4fd0e15168 100644
---
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
+++
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
@@ -283,6 +283,10 @@ public class OpenSSLCipherConfigurationParser {
* Cipher suites using either 128 or 256 bit CAMELLIA.
*/
private static final String CAMELLIA = "CAMELLIA";
+ /**
+ * Cipher suites using Cipher Block Chaining.
+ */
+ private static final String CBC = "CBC";
/**
* Cipher suites using CHACHA20.
*/
@@ -531,6 +535,9 @@ public class OpenSSLCipherConfigurationParser {
new HashSet<>(Arrays.asList(Encryption.CAMELLIA128,
Encryption.CAMELLIA256))));
addListAlias(CAMELLIA128, filterByEncryption(allCiphers,
Collections.singleton(Encryption.CAMELLIA128)));
addListAlias(CAMELLIA256, filterByEncryption(allCiphers,
Collections.singleton(Encryption.CAMELLIA256)));
+ addListAlias(CBC, filterByEncryption(allCiphers,
+ new HashSet<>(Arrays.asList(Encryption.AES128,
Encryption.AES256, Encryption.CAMELLIA128,
+ Encryption.CAMELLIA256))));
addListAlias(CHACHA20, filterByEncryption(allCiphers,
Collections.singleton(Encryption.CHACHA20POLY1305)));
addListAlias(TRIPLE_DES, filterByEncryption(allCiphers,
Collections.singleton(Encryption.TRIPLE_DES)));
addListAlias(DES, filterByEncryption(allCiphers,
Collections.singleton(Encryption.DES)));
diff --git
a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
index 337f91ff1b..e1468256bc 100644
---
a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
+++
b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
@@ -530,6 +530,12 @@ public class TestOpenSSLCipherConfigurationParser {
}
+ @Test
+ public void testCBC() throws Exception {
+ testSpecification("CBC");
+ }
+
+
// TODO: Add tests for the individual operators
@Test
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a1f4cdcf45..124926009c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,9 +125,9 @@
</fix>
<fix>
To maintain the documented alignment with the OpenSSL development
- branch, add support for the alias <code>ARIAGCM</code> when setting the
- <code>ciphers</code> attribute of an <code>SSLHostConfig</code>
element.
- (markt)
+ branch, add support for the aliases <code>ARIAGCM</code> and
+ <code>CBC</code>when setting the <code>ciphers</code> attribute of
+ an <code>SSLHostConfig</code> element. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
