This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 1c09926d7c Add support for the ARIAGCM alias
1c09926d7c is described below
commit 1c09926d7c9d297a2330cca8d4a6641b9c60ee2e
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 7f89f2141f..6e4216a894 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 1908b237ff..fd08624fb4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,9 +119,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]
