Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / external / conscrypt / d53d08067882b9da11228febf4f04c4d1950e22e
commitd53d08067882b9da11228febf4f04c4d1950e22e[log] [tgz]
authorPete Bentley <prb@google.com>Fri Dec 10 14:06:14 2021 +0000
committerPete Bentley <prb@google.com>Mon Dec 13 13:54:40 2021 +0000
treea8748a3b0be654cbcbece385320d45412a1f97f7
parent03484669b8d6331efcff6769e7ae052c02b6f23f [diff]
[DO NOT MERGE] Fix Conscrypt CTS for sc-v2-dev.

Background: Cherry-picks ag/15934029 and ag/15934004 were not
included in the release Mainline module for sc-v2.  They contain
one required bugfix b/191150645 for Android Auto (which does
not use Mainline) and some unrelated bug fixes which were in
the same upstream merge.  The end result is that sc-v2 CTS
would fail with a prebuilt Mainline Conscrypt module installed.
See b/209335673 for further details.

This change reverts all of ag/15934029 and ag/15934004 except
for the parts relating to b/191150645 and modifies the tests so
they will run with our without the Mainline module installed.
This involves skipping some additional tests added for
b/191150645 but still includes the main tests, i.e. that all
Providers' key factories inter-operate correctly.

Bug: 209335673
Bug: 191150645
Test: atest CtsLibcoreTestCases with and without the module installed.
Change-Id: Ic3a137bbc18429927354cc4094124fa5271d97a9
Merged-In: Ic3a137bbc18429927354cc4094124fa5271d97a9
15 files changed
tree: a8748a3b0be654cbcbece385320d45412a1f97f7
  1. android/
  2. android-stub/
  3. apex/
  4. api/
  5. api-doclet/
  6. benchmark-android/
  7. benchmark-base/
  8. benchmark-graphs/
  9. benchmark-jmh/
  10. common/
  11. constants/
  12. gradle/
  13. libcore-stub/
  14. licenses/
  15. openjdk/
  16. openjdk-uber/
  17. platform/
  18. publicapi/
  19. release/
  20. repackaged/
  21. srcgen/
  22. test-support/
  23. testing/
  24. .clang-format
  25. .gitignore
  26. .lgtm.yml
  27. .travis.yml
  28. Android.bp
  29. build.gradle
  30. BUILDING.md
  31. CAPABILITIES.md
  32. CONTRIBUTING.md
  33. CPPLINT.cfg
  34. gradle.properties
  35. gradlew
  36. gradlew.bat
  37. IMPLEMENTATION_NOTES.md
  38. LICENSE
  39. lint-baseline.xml
  40. METADATA
  41. MODULE_LICENSE_APACHE2
  42. NOTICE
  43. OWNERS
  44. PREUPLOAD.cfg
  45. README.android
  46. README.md
  47. settings.gradle
  48. test_logging.properties
README.md

Conscrypt - A Java Security Provider

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.

Download

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.

Download JARs

You can download the JARs directly from the Maven repositories.

OpenJDK (i.e. non-Android)

Native Classifiers

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:

ClassifierOSArchitecture
linux-x86_64Linuxx86_64 (64-bit)
osx-x86_64Macx86_64 (64-bit)
windows-x86Windowsx86 (32-bit)
windows-x86_64Windowsx86_64 (64-bit)

Maven

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>

Gradle

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
}

Uber JAR

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.

Maven
<dependency>
  <groupId>org.conscrypt</groupId>
  <artifactId>conscrypt-openjdk-uber</artifactId>
  <version>2.5.2</version>
</dependency>
Gradle
dependencies {
  compile 'org.conscrypt:conscrypt-openjdk-uber:2.5.2'
}

Android

The Android AAR file contains native libraries for x86, x86_64, armeabi-v7a, and arm64-v8a.

Gradle

dependencies {
  implementation 'org.conscrypt:conscrypt-android:2.5.2'
}

How to Build

If you are making changes to Conscrypt, see the building instructions.