commit | 506e6f61f6e6266e090ba23d56b8f4190ec06766 | [log] [tgz] |
---|---|---|
author | Pete Bentley <prb@google.com> | Mon Dec 07 13:45:14 2020 +0000 |
committer | Pete Bentley <prb@google.com> | Mon Dec 07 14:15:09 2020 +0000 |
tree | 02acc9fac89c15bc760c9601c6a179c7038f02a7 | |
parent | e54bd0068d5dd1bbad004afce8b7dac55902b984 [diff] |
Merge Conscrypt upstream master. Contains the following relevant upstream commits: 0080d512 Reimplement ConscryptStatsLog.java with reflection fc9750b7 Add a stub for android.util.StatsEvent. 2d1a647a Replace set-env commands with redirect to 4f56a05e Use precalculated ByteArray.hashCode before comparing byte arrays 075f5a9f Add AES-GCM-SIV to capabilities 46ed27fd Remove instanceOf assertions 27bf3ae2 Flip isAssignableFrom checks in OpenSSLECKeyFactory and OpenSSLRSAKeyFactory d798048a Fix the return type of NativeCrypto_X509_check_issued. 6b061c2d Fix pathlen handling given other invalid extensions. 70ce1de5 Fix current version in README.md. 973dd694 Skip testing AES/GCM-SIV/NoPadding on BC. Bug: 160345816 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: Id30dc706725773db271666055234b2cd3e99232a
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.1</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.1:' + 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.1</version> </dependency>
dependencies { compile 'org.conscrypt:conscrypt-openjdk-uber:2.5.1' }
The Android AAR file contains native libraries for x86, x86_64, armeabi-v7a, and arm64-v8a.
dependencies { implementation 'org.conscrypt:conscrypt-android:2.5.1' }
If you are making changes to Conscrypt, see the building instructions.