| commit | 000ce05d401c1b93b4d1fb8274b57ece1c452a59 | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Tue Jun 20 15:26:19 2017 +0100 |
| committer | Tobias Thierer <tobiast@google.com> | Tue Jun 20 15:27:20 2017 +0100 |
| tree | e0dcf08fffd3b90666e337b0cbce9e528a4aa570 | |
| parent | d7b47681aee17cb023ebd352ac51a96c1bd0c8f1 [diff] |
Revert "Merge upstream master". DO NOT MERGE ANYWHERE. The update of conscrypt changed APIs that affected tests covered by CTS. This reverts commit e550f1a85730f12adee263689af2f47f2e913b63, reversing changes made to d4695f2bf909c88216bbe23087eb167d1c68eede. This is a clean revert. The upload hook to fix lint errors was not run (this CL was uploaded with --no-verify). Bug: 62424503 Test: make checkbuild Test: cts-tradefed run singleCommand cts -a arm64-v8a -m CtsLibcoreTestCases Change-Id: I54f055a2b50bcf45e78b490f7cd9258037ff408b
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 cryptograhpic primitives and Transport Layer Security (TLS) for Java applications on Android and OpenJDK.
The core SSL engine has borrowed liberally from the Netty project and their work on netty-tcnative, giving Conscrypt similar performance.
NOTE: This section is under construction! Artifacts have not yet been published to the public Maven repositories.
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 | Description |
|---|---|
| windows-x86_64 | Windows distribution |
| osx-x86_64 | Mac distribution |
| linux-x86_64 | Used for Linux |
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>1.1.0-SNAPSHOT</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-jdk:1.1.0-SNAPSHOT:' + 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>1.1.0-SNAPSHOT</version> </dependency>
dependencies { compile 'org.conscrypt:conscrypt-jdk-uber:1.1.0-SNAPSHOT' }
If you are making changes to Conscrypt, see the building instructions.
Here‘s a quick readers’ guide to the code to help folks get started. The high-level modules are Common, Android, OpenJDK, and Platform.
This contains the bulk of the code for both Java and C. This isn't an actual module and builds no artifacts. Rather, the other modules just point to this directory as source.
This module provides the Platform class for Android and also adds compatibility classes for supporting various versions of Android. This generates an aar library artifact.
This modules provides the Platform class for non-Android (OpenJDK-based) systems. It also provides a native library loader supports bundling the shared library with the JAR.
This is not an actual module and is not part of the default build. This is used for building Conscrypt as an embedded component of the Android platform.