commit | 22d792ff43342f54cb1e4e356ca794848b0af735 | [log] [tgz] |
---|---|---|
author | Pete Bentley <prb@google.com> | Thu Mar 30 17:41:47 2023 +0100 |
committer | Pete Bentley <prb@google.com> | Wed Apr 05 15:45:41 2023 +0100 |
tree | a4d328553dec756c694de77777e8bad2daf486bd | |
parent | 1de6311425f847007410753f46c3baf1da987561 [diff] |
Merge Conscrypt upstream master. Contains the following upstream changes: Tidy ConscryptEngineSocket state machine. (#1120) Add missing close() calls. (#1122) Bug: 276304877 Test: MtsConscryptTestCases Change-Id: Iadb7295b1fa0925dd8b966b48bca3040f858196f Merged-In: Iadb7295b1fa0925dd8b966b48bca3040f858196f (cherry picked from commit af289bed7ed17dc6138da62db42370b1c3472172)
Conscrypt is a Java Security Provider (JSP) that implements parts of the Java Cryptography Extension (JCE) and Java Secure Socket Extension (JSSE). It uses BoringSSL to provide cryptographic primitives and Transport Layer Security (TLS) for Java applications on Android and OpenJDK. See the capabilities documentation for detailed information on what is provided.
The core SSL engine has borrowed liberally from the Netty project and their work on netty-tcnative, giving Conscrypt
similar performance.
Conscrypt supports Java 7 or later on OpenJDK and Gingerbread (API Level 9) or later on Android. The build artifacts are available on Maven Central.
You can download the JARs directly from the Maven repositories.
The OpenJDK artifacts are platform-dependent since each embeds a native library for a particular platform. We publish artifacts to Maven Central for the following platforms:
Classifier | OS | Architecture |
---|---|---|
linux-x86_64 | Linux | x86_64 (64-bit) |
osx-x86_64 | Mac | x86_64 (64-bit) |
windows-x86 | Windows | x86 (32-bit) |
windows-x86_64 | Windows | x86_64 (64-bit) |
Use the os-maven-plugin to add the dependency:
<build> <extensions> <extension> <groupId>kr.motd.maven</groupId> <artifactId>os-maven-plugin</artifactId> <version>1.4.1.Final</version> </extension> </extensions> </build> <dependency> <groupId>org.conscrypt</groupId> <artifactId>conscrypt-openjdk</artifactId> <version>2.5.2</version> <classifier>${os.detected.classifier}</classifier> </dependency>
Use the osdetector-gradle-plugin (which is a wrapper around the os-maven-plugin) to add the dependency:
buildscript { repositories { mavenCentral() } dependencies { classpath 'com.google.gradle:osdetector-gradle-plugin:1.4.0' } } // Use the osdetector-gradle-plugin apply plugin: "com.google.osdetector" dependencies { compile 'org.conscrypt:conscrypt-openjdk:2.5.2:' + osdetector.classifier }
For convenience, we also publish an Uber JAR to Maven Central that contains the shared libraries for all of the published platforms. While the overall size of the JAR is larger than depending on a platform-specific artifact, it greatly simplifies the task of dependency management for most platforms.
To depend on the uber jar, simply use the conscrypt-openjdk-uber
artifacts.
<dependency> <groupId>org.conscrypt</groupId> <artifactId>conscrypt-openjdk-uber</artifactId> <version>2.5.2</version> </dependency>
dependencies { compile 'org.conscrypt:conscrypt-openjdk-uber:2.5.2' }
The Android AAR file contains native libraries for x86, x86_64, armeabi-v7a, and arm64-v8a.
dependencies { implementation 'org.conscrypt:conscrypt-android:2.5.2' }
If you are making changes to Conscrypt, see the building instructions.