commit | 5ad04c656aeb7cece332922bd67e4b9bc08acc81 | [log] [tgz] |
---|---|---|
author | Adam Vartanian <flooey@google.com> | Wed Jul 05 17:20:49 2017 +0100 |
committer | Adam Vartanian <flooey@google.com> | Thu Jul 06 09:48:52 2017 +0000 |
tree | ad19a1b6724dfa8d10736ef0f9797b4f7eb9072b | |
parent | bd086d9c0704b340879f925741567e5a6610b333 [diff] | |
parent | 64f0eda4e9bb5af5ad785ec56de0f061ea5d140d [diff] |
Merge upstream master Includes a lot of refactorings of the core SSL classes (especially session code), some bug fixes, and AlgorithmParameters.GCM. There shouldn't be any large changes in behavior. A number of classes have been renamed, but shims are left in place to handle cases where users are using reflection to access unexposed APIs (see, eg, OpenSSLSocketImpl.java). Bug: 62852271 Bug: 62369410 Test: cts -m CtsLibcoreTestCases Test: cts -m CtsLibcoreOkHttpTestCases Test: cts -m CtsLibcoreWycheproofConscryptTestCases Change-Id: Ib6eb0819f2b38d1b8e49b49a0eba769eb8afc4cf
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 cryptographical 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.
These modules provide 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.