andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated "CipherSuitesConverter" to make it public. (#11656)

Browse Source 
Motivation:
While using netty there is sometimes need to handle the cipher suites and
signature algorithm in more strict environment. CipherSuiteConverter is
quite helpful in converting Cipher-Suites to and from java to openSSL.
Making it public would be helpful for the project which are using netty.

Modification:
Updated "CipherSuitesConverter" to make it public.
updated "CipherSuitesConverter.toOpenssl" to public.
updated "CipherSuitesConverter.toJava" to public.

Result:
Fixes #11655
This commit is contained in:
kushalagrawal 2021-09-06 18:27:19 +05:30 committed by Norman Maurer
parent ee54ea725a
commit 3a23094b81
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handler/src/main/java/io/netty/handler/ssl/CipherSuiteConverter.java
View File

@ -16,6 +16,7 @@
package io.netty.handler.ssl; package io.netty.handler.ssl;
import io.netty.util.internal.UnstableApi;
import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
@ -34,7 +35,8 @@ import static java.util.Collections.singletonMap;
* *
* @see <a href="https://en.wikipedia.org/wiki/Cipher_suite">Wikipedia page about cipher suite</a> * @see <a href="https://en.wikipedia.org/wiki/Cipher_suite">Wikipedia page about cipher suite</a>
*/ */
final class CipherSuiteConverter { @UnstableApi
public final class CipherSuiteConverter {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(CipherSuiteConverter.class); private static final InternalLogger logger = InternalLoggerFactory.getInstance(CipherSuiteConverter.class);
@ -150,7 +152,7 @@ final class CipherSuiteConverter {
* *
* @return {@code null} if the conversion has failed * @return {@code null} if the conversion has failed
*/ */
static String toOpenSsl(String javaCipherSuite, boolean boringSSL) { public static String toOpenSsl(String javaCipherSuite, boolean boringSSL) {
String converted = j2o.get(javaCipherSuite); String converted = j2o.get(javaCipherSuite);
if (converted != null) { if (converted != null) {
return converted; return converted;
@ -279,7 +281,7 @@ final class CipherSuiteConverter {
* @param protocol The cryptographic protocol (i.e. SSL, TLS, ...). * @param protocol The cryptographic protocol (i.e. SSL, TLS, ...).
* @return The translated cipher suite name according to java conventions. This will not be {@code null}. * @return The translated cipher suite name according to java conventions. This will not be {@code null}.
*/ */
static String toJava(String openSslCipherSuite, String protocol) { public static String toJava(String openSslCipherSuite, String protocol) {
Map<String, String> p2j = o2j.get(openSslCipherSuite); Map<String, String> p2j = o2j.get(openSslCipherSuite);
if (p2j == null) { if (p2j == null) {
p2j = cacheFromOpenSsl(openSslCipherSuite); p2j = cacheFromOpenSsl(openSslCipherSuite);