Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated "CipherSuitesConverter" to make it public. #11656

Merged
merged 1 commit into from Sep 6, 2021
Merged

Updated "CipherSuitesConverter" to make it public. #11656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions handler/src/main/java/io/netty/handler/ssl/CipherSuiteConverter.java
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
package io.netty.handler.ssl;

import io.netty.util.internal.PlatformDependent;
import io.netty.util.internal.UnstableApi;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;

Expand All @@ -34,7 +35,8 @@
*
* @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);

Expand Down Expand Up @@ -150,7 +152,7 @@ static boolean isO2JCached(String key, String protocol, String value) {
*
* @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);
if (converted != null) {
return converted;
Expand Down Expand Up @@ -279,7 +281,7 @@ private static String toOpenSslHmacAlgo(String hmacAlgo) {
* @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}.
*/
static String toJava(String openSslCipherSuite, String protocol) {
public static String toJava(String openSslCipherSuite, String protocol) {
Map<String, String> p2j = o2j.get(openSslCipherSuite);
if (p2j == null) {
p2j = cacheFromOpenSsl(openSslCipherSuite);
Expand Down