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

Allow Conscrypt to be used on Android (#10182)

Browse Source 
**Motivation:**

Following up on https://github.com/netty/netty/issues/10181

I was able to successfully setup a Netty server with TLS on Android, using Conscrypt, with the change proposed here. Conscrypt publishes an [Android specific version](https://github.com/google/conscrypt#android). But the current availability check prevents Netty from using it (the call `PlatformDependent.javaVersion()` returns `6` on Android).

**Modification:**

Check whether the java version is above 8, or if it's running on an Android device, to flag Conscrypt as available (besides the remaining checks).

**Result:**

Netty with TLS runs fine on Android 👍
This commit is contained in:
Sérgio Santos 2020-04-14 09:42:51 +01:00 committed by GitHub
parent 2b14775446
commit 79ef0c4706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
handler/src/main/java/io/netty/handler/ssl/Conscrypt.java
View File

@ -56,7 +56,8 @@ final class Conscrypt {
* Indicates whether or not conscrypt is available on the current system.
*/
static boolean isAvailable() {
return CAN_INSTANCE_PROVIDER && IS_CONSCRYPT_SSLENGINE != null && PlatformDependent.javaVersion() >= 8;
return CAN_INSTANCE_PROVIDER && IS_CONSCRYPT_SSLENGINE != null &&
(PlatformDependent.javaVersion() >= 8 || PlatformDependent.isAndroid());
}
static boolean isEngineSupported(SSLEngine engine) {