Skip to content

Commit 938074c

Browse files
committed
[feat] include mapping for more 1.3 cipher suites
1 parent a0d8ab3 commit 938074c

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

src/main/java/org/jruby/ext/openssl/CipherStrings.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,6 +2244,7 @@ private static Collection<Def> matchingPattern(
22442244
SuiteToOSSL.put("SSL_RSA_WITH_NULL_SHA256", "NULL-SHA256");
22452245

22462246
// TLS v1.3 (Java 8/11) streaming ciphers :
2247+
// TODO the specifics of using these on 1.3 only is not implemented
22472248

22482249
SuiteToOSSL.put("TLS_AES_128_GCM_SHA256", name = "TLS_AES_128_GCM_SHA256");
22492250
CipherNames.put(name, new Def(name,
@@ -2257,6 +2258,24 @@ private static Collection<Def> matchingPattern(
22572258
SSL_NOT_EXP, 256, 384, SSL_ALL_CIPHERS, SSL_ALL_STRENGTHS
22582259
));
22592260

2261+
SuiteToOSSL.put("TLS_CHACHA20_POLY1305_SHA256", name = "TLS_CHACHA20_POLY1305_SHA256");
2262+
CipherNames.put(name, new Def(name,
2263+
SSL_CHACHA20|SSL_SHA|SSL_TLSV1,
2264+
SSL_NOT_EXP, 256, 256, SSL_ALL_CIPHERS, SSL_ALL_STRENGTHS
2265+
));
2266+
2267+
SuiteToOSSL.put("TLS_AES_128_CCM_SHA256", name = "TLS_AES_128_CCM_SHA256");
2268+
CipherNames.put(name, new Def(name,
2269+
SSL_AES|SSL_SHA|SSL_TLSV1,
2270+
SSL_NOT_EXP, 128, 256, SSL_ALL_CIPHERS, SSL_ALL_STRENGTHS
2271+
));
2272+
2273+
SuiteToOSSL.put("TLS_AES_128_CCM_8_SHA256", name = "TLS_AES_128_CCM_8_SHA256");
2274+
CipherNames.put(name, new Def(name,
2275+
SSL_AES|SSL_SHA|SSL_TLSV1,
2276+
SSL_NOT_EXP, 256, 384, SSL_ALL_CIPHERS, SSL_ALL_STRENGTHS
2277+
));
2278+
22602279
for ( Def def : Ciphers ) CipherNames.put(def.name, def);
22612280

22622281
}

0 commit comments

Comments
 (0)