Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Respect jdk.tls.namedGroups when using native SSL implementation (#11660
) Motivation: When using the JDK implementation for SSL its possible to adjust the used named groups. We should allow to do this as well and also select some default groups that will reduce the number of roundtrips. Modifications: - Upgrade netty-tcnative so we can set the curves - Respect jdk.tls.namedGroups - Use default groups of "P-256", "P-384", "X25519" so its compatible with what the JDK versions < 13 support as well. Result: Be able to set the used groups Co-authored-by: Nitesh Kant <nitesh_kant@apple.com>
- Loading branch information
1 parent
f2de2bb
commit deb0489
Showing
4 changed files
with
106 additions
and
1 deletion.
There are no files selected for viewing
50 changes: 50 additions & 0 deletions
50
handler/src/main/java/io/netty/handler/ssl/GroupsConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* Copyright 2021 The Netty Project | ||
* | ||
* The Netty Project licenses this file to you under the Apache License, | ||
* version 2.0 (the "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at: | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package io.netty.handler.ssl; | ||
|
||
import java.util.Collections; | ||
import java.util.HashMap; | ||
import java.util.Map; | ||
|
||
/** | ||
* Convert java naming to OpenSSL naming if possible and if not return the original name. | ||
*/ | ||
final class GroupsConverter { | ||
|
||
private static final Map<String, String> mappings; | ||
|
||
static { | ||
// See https://tools.ietf.org/search/rfc4492#appendix-A and https://www.java.com/en/configure_crypto.html | ||
Map<String, String> map = new HashMap<String, String>(); | ||
map.put("secp224r1", "P-224"); | ||
map.put("prime256v1", "P-256"); | ||
map.put("secp256r1", "P-256"); | ||
map.put("secp384r1", "P-384"); | ||
map.put("secp521r1", "P-521"); | ||
map.put("x25519", "X25519"); | ||
mappings = Collections.unmodifiableMap(map); | ||
} | ||
|
||
static String toOpenSsl(String key) { | ||
String mapping = mappings.get(key); | ||
if (mapping == null) { | ||
return key; | ||
} | ||
return mapping; | ||
} | ||
|
||
private GroupsConverter() { } | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters