Skip to content

Added a check in case there's no openssl cipher that matches cipher #139

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

Open
beaudet wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added a check in case there's no openssl cipher that matches cipher #139

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions java/src/main/java/org/wildfly/openssl/CipherSuiteConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.net.ssl.SSLException;

/**
* Converts a Java cipher suite string to an OpenSSL cipher suite string and vice versa.
*
Expand Down Expand Up @@ -307,25 +309,31 @@ private static String toOpenSslHmacAlgo(String hmacAlgo) {
return hmacAlgo;
}


/**
* Convert from OpenSSL cipher suite name convention to java cipher suite name convention.
*
* @param openSslCipherSuite An OpenSSL cipher suite name.
* @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}.
* @throws SSLException if no corresponding OpenSSL cipher suite maps to the provided cipher.
*/
public static String toJava(String openSslCipherSuite, String protocol) {
public static String toJava(String openSslCipherSuite, String protocol) throws SSLException {
Map<String, String> p2j = toJava(openSslCipherSuite);
if (p2j == null) {
p2j = cacheFromOpenSsl(openSslCipherSuite);
}

String javaCipherSuite = p2j.get(protocol);
if (javaCipherSuite == null) {
javaCipherSuite = protocol + '_' + p2j.get("");
if (p2j == null) {
throw new SSLException("There is no corresponding OpenSSL cipher that maps to the provided cipher: " + openSslCipherSuite + " and protocol: " + protocol);
}
else {
String javaCipherSuite = p2j.get(protocol);
if (javaCipherSuite == null) {
javaCipherSuite = protocol + '_' + p2j.get("");
}
return javaCipherSuite;
}

return javaCipherSuite;
}

private static Map<String, String> toJava(String openSslCipherSuite) {
Expand Down