This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 84bd3beb7a6b633634ec4eab1dbfee799374700c Author: Mark Thomas <[email protected]> AuthorDate: Tue Feb 10 15:58:27 2026 +0000 Add support for the ARIAGCM alias --- .../openssl/ciphers/OpenSSLCipherConfigurationParser.java | 1 + .../ciphers/TestOpenSSLCipherConfigurationParser.java | 6 ++++++ webapps/docs/changelog.xml | 12 +++++++++--- 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 6d20af1997..ec1f9da7dd 100644 --- a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java +++ b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java @@ -520,6 +520,7 @@ public class OpenSSLCipherConfigurationParser { addListAlias(ARIA256, filterByEncryption(allCiphers, Collections.singleton(Encryption.ARIA256GCM))); addListAlias(ARIA, filterByEncryption(allCiphers, new HashSet<>(Arrays.asList(Encryption.ARIA128GCM, Encryption.ARIA256GCM)))); + aliases.put("ARIAGCM", aliases.get(ARIA)); addListAlias(AESGCM, filterByEncryption(allCiphers, new HashSet<>(Arrays.asList(Encryption.AES128GCM, Encryption.AES256GCM)))); addListAlias(AESCCM, filterByEncryption(allCiphers, new HashSet<>(Arrays.asList(Encryption.AES128CCM, 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 8f62f9cc40..337f91ff1b 100644 --- a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java +++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java @@ -512,6 +512,12 @@ public class TestOpenSSLCipherConfigurationParser { } + @Test + public void testARIAGCM() throws Exception { + testSpecification("ARIAGCM"); + } + + @Test public void testARIA128() throws Exception { testSpecification("ARIA128"); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b98d31d374..053a5a350f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -239,9 +239,15 @@ </fix> <fix> To maintain the documented alignment with the OpenSSL development - branch, the use of the alias SSLv3 is no longer supported when setting - the <code>ciphers</code> attribute of an <code>SSLHostConfig</code> - element. (markt) + branch, the use of the alias <code>SSLv3</code> is no longer supported + when setting the <code>ciphers</code> attribute of an + <code>SSLHostConfig</code> element. (markt) + </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) </fix> </changelog> </subsection> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
