This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0d40a2c03a Fix Panama reflection call
0d40a2c03a is described below
commit 0d40a2c03a7a7d274444cb202c4c7c3ef2cb0f3d
Author: remm <r...@apache.org>
AuthorDate: Fri Mar 21 10:04:57 2025 +0100
Fix Panama reflection call
A few typos as well.
---
.../ciphers/OpenSSLCipherConfigurationParser.java | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 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 46a79ece33..5e5e043269 100644
---
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
+++
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
@@ -90,7 +90,7 @@ public class OpenSSLCipherConfigurationParser {
*/
private static final String HIGH = "HIGH";
/**
- * 'medium' encryption cipher suites, currently some of those using 128
bit encryption.
+ * 'medium' encryption cipher suites, currently some of those using
128-bit encryption.
*/
private static final String MEDIUM = "MEDIUM";
/**
@@ -173,7 +173,7 @@ public class OpenSSLCipherConfigurationParser {
*/
private static final String EECDH = "EECDH";
/**
- * Cipher suitesusing ECDH key exchange, including anonymous, ephemeral
and fixed ECDH.
+ * Cipher suites using ECDH key exchange, including anonymous, ephemeral
and fixed ECDH.
*/
private static final String ECDH = "ECDH";
/**
@@ -237,15 +237,15 @@ public class OpenSSLCipherConfigurationParser {
*/
private static final String ADH = "ADH";
/**
- * Cipher suites using 128 bit AES.
+ * Cipher suites using 128-bit AES.
*/
private static final String AES128 = "AES128";
/**
- * Cipher suites using 256 bit AES.
+ * Cipher suites using 256-bit AES.
*/
private static final String AES256 = "AES256";
/**
- * Cipher suites using either 128 or 256 bit AES.
+ * Cipher suites using either 128 or 256-bit AES.
*/
private static final String AES = "AES";
/**
@@ -350,7 +350,7 @@ public class OpenSSLCipherConfigurationParser {
*/
private static final String aGOST94 = "aGOST94";
/**
- * Cipher suites using using VKO 34.10 key exchange, specified in the RFC
4357.
+ * Cipher suites using VKO 34.10 key exchange, specified in the RFC 4357.
*/
private static final String kGOST = "kGOST";
/**
@@ -645,7 +645,7 @@ public class OpenSSLCipherConfigurationParser {
moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.RSA)));
moveToEnd(result, filterByKeyExchange(result,
Collections.singleton(KeyExchange.PSK)));
- /* RC4 is sort-of broken -- move the the end */
+ /* RC4 is sort-of broken -- move to the end */
moveToEnd(result, filterByEncryption(result,
Collections.singleton(Encryption.RC4)));
return strengthSort(result);
}
@@ -723,7 +723,7 @@ public class OpenSSLCipherConfigurationParser {
try {
Class<?> openSSLLibraryClass =
Class.forName("org.apache.tomcat.util.net.openssl.panama.OpenSSLLibrary");
@SuppressWarnings("unchecked")
- List<String> cipherList = (List<String>)
openSSLLibraryClass.getMethod("findCiphers").invoke(null, elements[0]);
+ List<String> cipherList = (List<String>)
openSSLLibraryClass.getMethod("findCiphers", String.class).invoke(null,
elements[0]);
// Replace the original list with the profile contents
elements = cipherList.toArray(new String[0]);
} catch (Throwable t) {
@@ -736,7 +736,7 @@ public class OpenSSLCipherConfigurationParser {
log.error(sm.getString("opensslCipherConfigurationParser.unknownProfile",
elements[0]));
}
} else {
- // No way to resolve using OpenSSL, log an info about this
+ // No way to resolve using OpenSSL, log an info about this,
// but it might still work if using tomcat-native
log.info(sm.getString("opensslCipherConfigurationParser.unknownProfile",
elements[0]));
}
@@ -864,9 +864,9 @@ public class OpenSSLCipherConfigurationParser {
}
public static void usage() {
- System.out.println("Usage: java " +
OpenSSLCipherConfigurationParser.class.getName() + " [options] cipherspec");
+ System.out.println("Usage: java " +
OpenSSLCipherConfigurationParser.class.getName() + " [options] cipher spec");
System.out.println();
- System.out.println("Displays the TLS cipher suites matching the
cipherspec.");
+ System.out.println("Displays the TLS cipher suites matching the cipher
spec.");
System.out.println();
System.out.println(" --help,");
System.out.println(" -h Print this help message");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
