| 1cf50c809345b8bdd833f5260da03d71313f7ace |
|
29-Mar-2017 |
Kenny Root <kroot@google.com> |
Only test platform-specific things on Android
Android CTS is more convenient for integration tests than unit tests.
Stop testing all the things that are more like unit tests in the openjdk
directory.
Change-Id: I1609b4929c347179ad583abb5a30ec07620a3191
/external/conscrypt/Android.mk
|
| 6c291c5b40bc4ae7b23bc332a512133217746fd2 |
|
28-Mar-2017 |
Nathan Mittler <nathanmittler@google.com> |
Adding platform to the build (#158)
/external/conscrypt/Android.mk
|
| 906cfad7e08fd339be06441ff42960743f95053c |
|
07-Mar-2017 |
Kenny Root <kroot@google.com> |
Merge upstream master
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I2c0020c76b48f549b898e09be0612710616ea602
|
| 93e9a3c91b24520a7d3aff006d4a67b56da81793 |
|
03-Mar-2017 |
Kenny Root <kroot@google.com> |
Fix includes in Android.mk
The testing directory was moved to a different place. Account for that
and apply the same filtering that was already there.
/external/conscrypt/Android.mk
|
| 8a09814040f9782c6f144162bd651be4342c82c5 |
|
14-Feb-2017 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Implement X509Certificate.verify(PublicKey, Provider).
Removed NoSuchProvider from verifyOpenSSL(OpenSSLKey pkey),
native code underneath doesn't throw it.
Changed unblundled version to current to
fix the breakage due to missing verify method
in earlier API.
(cherry picked from commit f881571464b8b989d000fcd33846ae2a653fb2cf)
Test: CtsLibcoreTestCases
Bug: 31294527
Change-Id: Ide755ccc0ad1163ac8dafc9bce762f680671a488
/external/conscrypt/Android.mk
|
| 61c9f6c3d437a4ab1018299824e03b3545d1570f |
|
01-Mar-2017 |
Nicolas Geoffray <ngeoffray@google.com> |
Add a -testdex variant for ART run-tests.
bug:24535627
Change-Id: Ib8b7cb990c75672b3b0676d3720e63f3092e025e
/external/conscrypt/Android.mk
|
| f881571464b8b989d000fcd33846ae2a653fb2cf |
|
14-Feb-2017 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Implement X509Certificate.verify(PublicKey, Provider).
Removed NoSuchProvider from verifyOpenSSL(OpenSSLKey pkey),
native code underneath doesn't throw it.
Changed unblundled version to current to
fix the breakage due to missing verify method
in earlier API.
Test: CtsLibcoreTestCases
Bug: 31294527
Change-Id: Ide755ccc0ad1163ac8dafc9bce762f680671a488
/external/conscrypt/Android.mk
|
| 746b5171ad3f2505100323cff808585c9559384b |
|
27-Jan-2017 |
Kenny Root <kenny@the-b.org> |
Eliminate some unneeded complexity in platform build (#69)
All the files compile whether unbundled or not, so we can eliminate the
switch statements in the build logic and just have it included
everywhere.
Change-Id: I7b6df16ad90a355f8e04bef27274a02806230ca9
/external/conscrypt/Android.mk
|
| c279a12c26722ebd3d4ef1ce5bdf296094421abf |
|
26-Jan-2017 |
Kenny Root <kenny@the-b.org> |
Fix Android platform build files (#67)
Renaming one of the C++ files broke the Android platform build. This
fixes the build files needed to track that change.
Change-Id: Idcd1d55ea7539dee279f0a16407f39c2429a2fbc
/external/conscrypt/Android.mk
|
| ed3205428d520f9de68c962fe62de0c21161d935 |
|
12-Jan-2017 |
Kenny Root <kenny@the-b.org> |
Fix Android build files (#39)
Change-Id: I875c5c17ddb99d2b2fad4486ef04113d71c8711d
/external/conscrypt/Android.mk
|
| 66516884139574a34a9855ca822d56ace0fdfe8b |
|
12-Jan-2017 |
Nathan Mittler <nathanmittler@google.com> |
Split out JNI helper methods and errors (#32)
JNIHelp is no longer needed. Also with the introduction of JniUtil, moving over utility methods from JniConstants.
/external/conscrypt/Android.mk
|
| 9f80aec4d0a3986bb4506bbb1b51842a9a36f940 |
|
11-Jan-2017 |
Nathan Mittler <nathanmittler@google.com> |
Split out OpenSslError, ScopedSslBio, and trace macros (#29)
Also moved logging macros to macros.h since they are now needed by multiple files.
/external/conscrypt/Android.mk
|
| 3f3e55f30b21ba75830f657b094dce11055b29a3 |
|
10-Jan-2017 |
Nathan Mittler <nathanmittler@google.com> |
Split out CompatibilityCloseMonitor (#27)
/external/conscrypt/Android.mk
|
| 4f475909f9659c5163717354dc81704650493e66 |
|
10-Jan-2017 |
Nathan Mittler <nathanmittler@google.com> |
Set default symbol visibility to hidden except for JNI methods. (#26)
/external/conscrypt/Android.mk
|
| 72ddbd969001397d5747afd063eccad246af32a8 |
|
20-Dec-2016 |
nmittler <nmittler@gmail.com> |
Add constants module and remove common
Change-Id: I3d1c7cd07aa03944b02ff203f09ec4768980588d
/external/conscrypt/Android.mk
|
| d422625067428b1938608a495a8083f8801adc8c |
|
20-Dec-2016 |
Kenny Root <kroot@google.com> |
Rearrange test discovery
Moving the tests to a new directory caused them to be lost from the view
of CTS, because they were all filtered out by a typo. No tests failed,
but no tests we being run either.
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I54de022d64a57493503d6400668aec7188033cfc
/external/conscrypt/Android.mk
|
| eedccbc08c1b562f1c09270631c9b1897e17da4a |
|
20-Dec-2016 |
Kenny Root <kroot@google.com> |
Android compat: add TargetApi annotations
Android Lint was complaining about these calls to fetch the SNI
hostname, so extract them into separate functions with TargetApi
annotations to appease the linter.
Test: ./gradlew build
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I4cd74914049a276698d40bf28838a0402a574a94
/external/conscrypt/Android.mk
|
| 33a56e75699b051d5e6f13f143ee6d680bc459bd |
|
17-Dec-2016 |
nmittler <nathanmittler@google.com> |
Merging common tests.
Change-Id: If8e20a9895b2189f514a9fc860d5e69785094585
/external/conscrypt/Android.mk
|
| ec934e25d501fa3810c52d28136c2a6dd1ff2edc |
|
01-Dec-2016 |
Paul Duffin <paulduffin@google.com> |
Replace core-junit/junit4-target with junit
Bug: 30188076
Test: make checkbuild
Change-Id: I056bd801eb90996b0c78a656204487b7cfe5bc3d
/external/conscrypt/Android.mk
|
| f12ee162fb0980e99153a2ae3ebc0ed1263d232e |
|
01-Dec-2016 |
Paul Duffin <paulduffin@google.com> |
Use junit-hostdex instead of core-junit-hostdex/junit4-target-hostdex
Bug: 30188076
Test: make checkbuild
Change-Id: Ib94ebb1389a602eae906f540a208e0cd99a90747
/external/conscrypt/Android.mk
|
| 7d8d6c317bf4660dbb4cd4e1bfab176117c3ff82 |
|
22-Nov-2016 |
nmittler <nathanmittler@google.com> |
Restructuring conscrypt into submodules
Ameding commit 7782d132fab6ac9f30b97d76ed3a51126ed3e6d1 which was the
wrong patchset.
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a 64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a 64-v8a
Change-Id: Ife20284c2aca3551ca860ec1126ce26e9f59f112
/external/conscrypt/Android.mk
|
| 7782d132fab6ac9f30b97d76ed3a51126ed3e6d1 |
|
22-Nov-2016 |
nmittler <nathanmittler@google.com> |
Restructuring conscrypt into submodules
Change-Id: I2a4dea5d2a5f35b29fdbb96bcdae1888a4fe2b7e
/external/conscrypt/Android.mk
|
| 0fd78a10404354cbf3ab1eafb2fe8ff3c5e2e4f7 |
|
25-Nov-2016 |
Paul Duffin <paulduffin@google.com> |
Use junit-hostdex instead of core-junit-hostdex/junit4-target-hostdex
A recent change in external/junit changes junit-hostdex so it
includes all JUnit classes not just the ones not in
core-junit-hostdex and not in junit4-target-hostdex. This change
updates this project to use junit-hostdex instead of either of
or even both of the other two.
Bug: 30188076
Test: make checkbuild and art/tools/run-libcore-tests.sh '--mode=host' '--variant=X32'
Change-Id: Ifa4a5e68be2aa937cf1712255dbddcc9b6e11d72
/external/conscrypt/Android.mk
|
| f8c4be0c6102ffdc6abebd757768560ed5386066 |
|
06-Oct-2016 |
Kenny Root <kroot@google.com> |
Add jarjar rules to conscrypt-tests-hostdex
This allows the tests to be run with vogar again after the native
library loading change from oh-so-long ago. Since the test names are
jarjar'd as well, it must be specified as a class name and not a source
file.
Test: vogar --mode host --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-support-hostdex_intermediates/classes.jack --classpath out/host/common/obj/JAVA_LIBRARIES/conscrypt-tests-hostdex_intermediates/classes.jack com.android.org.conscrypt.NativeCryptoTest
Change-Id: I67b4fad3b04a68fb96beb99eb14bcd1e9076085c
/external/conscrypt/Android.mk
|
| 393198f17079888db8dd719cd05ab32c27153032 |
|
05-Oct-2016 |
Kenny Root <kroot@google.com> |
Convert NativeCryptoTest to JUnit4
This is basically a regex substitution change with minimnal renames just
to convert to JUnit4. Further JUnit4-isms will come in subsequent
changes.
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: Icb6aedc3acee31d62750132bbe8eeaf9150bd3c0
/external/conscrypt/Android.mk
|
| 923342a9c33d939ae880b0051a15df8903085068 |
|
23-Sep-2016 |
Kenny Root <kroot@google.com> |
Convert some of the native libraries to Soong
The unbundled builds of these libraries can be compiled with Soong, but
the platform versions have a dependency on libcore for "libjavacore"
without which it can't be converted yet.
Test: make -j32
Change-Id: Ieb157fa416433d5ed3d7a82c81dd576c1063dbee
/external/conscrypt/Android.mk
|
| adb03d62f27fb627651de1db1de5f8ce54771b0c |
|
23-Sep-2016 |
Kenny Root <kroot@google.com> |
Remove some old Makefile cruft
Test: mmma -j32 external/conscrypt
Change-Id: Ic0095be8c15839746925d16255787851f9388e4b
/external/conscrypt/Android.mk
|
| 6cb9408260ca1d1837311d354b9621acdac600f2 |
|
20-Sep-2016 |
Kenny Root <kroot@google.com> |
Remove reference to OpenSSL/BoringSSL flavor
Nothing depends on this anymore.
Test: check files output before and after change
Test: sha256sum ${ANDROID_PRODUCT_OUT}/system/lib/libjavacrypto.so ${ANDROID_PRODUCT_OUT}/system/lib64/libjavacrypto.so
Bug: 31464605
Change-Id: Ie884660d019a5eb917b6a9349fb7ddf9c69c998e
/external/conscrypt/Android.mk
|
| 9fff47aac849177819a7e4934b992b28b1bb777b |
|
20-Sep-2016 |
Kenny Root <kroot@google.com> |
Move generated file to a more IDE-friendly directory
Eclipse expects files to be in a subdirectory that matches their package
name. In this case the package is "org.conscrypt" so the generated .java
file should move to the directory "org/conscrypt/" to satisfy Eclipse.
Test: make -j32
Change-Id: Ic5ca1a84d302614b6ff2382636488314a0714843
/external/conscrypt/Android.mk
|
| dcb814ec2631a5a8973597cd6d7a903437056b24 |
|
08-Sep-2016 |
Kenny Root <kroot@google.com> |
Switch to libc++
Use libc++'s implementation of std::unique_ptr instead of our own
internal version. Also get rid of the GCC-only extension of typeof and
replace it with the C++11 equivalent decltype.
Target system binaries do not change size or shrink by a couple bytes
with this switch.
Test: mmma -j32 external/conscrypt; find out/ -name '*.apk' -exec rm {} \;; make -j32; make -j32 build-art-host vogar; vogar --mode host --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-support-hostdex_intermediates/classes.jack --classpath out/host/common/obj/JAVA_LIBRARIES/core-tests-hostdex_intermediates/classes.jack libcore/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
Change-Id: I8ffc3c9b3336cc1a8e43b816a07d0832e5344616
/external/conscrypt/Android.mk
|
| f6b7098d4e5b44b014f498dd30128d74143d266b |
|
08-Sep-2016 |
Kenny Root <kroot@google.com> |
No need for whole static library
The linker prunes any unneeded symbols when you use
LOCAL_STATIC_LIBRARIES, but when you use LOCAL_WHOLE_STATIC_LIBRARIES it
tells the linker you don't want any pruning of the .a files to happen.
Since we only need what org_conscrypt_NativeCrypto.cpp calls, we can
use LOCAL_STATIC_LIBRARIES to allow the pruning to happen.
The order of the libraries in LOCAL_STATIC_LIBRARIES matters because if
a library earlier in the list has unresolved symbols, then the libraries
later in the list are checked to see if they have any of the unresolved
symbols.
Test: find out/ -name '*.apk' -exec rm {} \;; make -j32
Change-Id: I2fb27c5915d945a51bdf6c42f69174052f5bbe3c
/external/conscrypt/Android.mk
|
| 70c2b89ec9c1c4e22dd7f4f026b30903a779c50c |
|
02-Sep-2016 |
Kenny Root <kroot@google.com> |
Revert "Revert "Revert "Remove libc++_static from OpenJDK host module"""
This reverts commit f9804ba8dee173239689180b85851e185e6dad86.
MacOS SDK build breaks because it needs symbols _ZdaPv, _ZdlPv, _Znam, _Znwm,
__cxa_guard_acquire, and __cxa_guard_release which are symbols that are
included "for free" on Linux and Android.
Change-Id: I5aae4bd825f36142e1505416462c5fb7b0cd3647
/external/conscrypt/Android.mk
|
| f9804ba8dee173239689180b85851e185e6dad86 |
|
02-Sep-2016 |
Kenny Root <kroot@google.com> |
Revert "Revert "Remove libc++_static from OpenJDK host module""
This reverts commit d898bed6bcf893b592458f3f2c0906a10758ea80.
The underlying issue breaking the MacOS SDK build was resolved
by Change-Id I54929c7e5c05ec271925f5f3d1896df1661e9b59.
Change-Id: I332376794d1b80f0c4a78cb8304bece767397223
/external/conscrypt/Android.mk
|
| d898bed6bcf893b592458f3f2c0906a10758ea80 |
|
01-Sep-2016 |
Kenny Root <kroot@google.com> |
Revert "Remove libc++_static from OpenJDK host module"
This reverts commit 05d75f8cc302a42eb44e1986b96eea2b8bb5218e.
This breaks the MacOS SDK build because it wants <cstdlib> for NULL in UniquePtr.h
Change-Id: I3d35633b12e8f6329e87b26a16de0262028e2d29
/external/conscrypt/Android.mk
|
| 05d75f8cc302a42eb44e1986b96eea2b8bb5218e |
|
01-Sep-2016 |
Kenny Root <kroot@google.com> |
Remove libc++_static from OpenJDK host module
This doesn't appear to be needed and it builds and runs just fine
without it.
Test: mmma -j32 external/conscrypt; find out/ -name '*.apk' -exec rm {} \;; make -j32
Change-Id: I4a50d5e8f5866f93a439105b7706d7f8add776f5
/external/conscrypt/Android.mk
|
| f46f6cf2fb11c1c3bd11bc6128f5d7910aa5af8d |
|
10-Aug-2016 |
Kenny Root <kroot@google.com> |
Return an empty list when no OCSP reponses received
Change OpenSSLSessionImpl#getStatusResponses() to return an empty list
instead of null. This matches the assumption of the serializing code in
AbstractSessionContext.
Add a test to make sure that serializing a trivial OpenSSLSessionImpl
instance completes without throwing an exception.
Test: cts-tradefed run cts -d -p android.core.tests.libcore.package.conscrypt
Bug: 30751283
Change-Id: If4c3e6a99c080fb3a0fd527c86a5ee8972475718
/external/conscrypt/Android.mk
|
| 597fd4e460c114003257d1b007d1b75c53af9fd7 |
|
29-Jul-2016 |
Kenny Root <kroot@google.com> |
Remove all obsolete OpenSSL code
A significant amount of code was dedicated to maintaining backward
compatibility with OpenSSL. However, compatibility will no longer be
maintained for several reasons:
* BoringSSL does not have ENGINE functionality and testing it is
difficult because another version must be compiled against OpenSSL.
Moreover, AndroidKeyStore Provider has taken over keystore
functionality since M release resulting in dead code.
* Secure defaults such as deterministic EC signatures are part of
BoringSSL so extra JNI calls do not need to be made for them.
* A not insignificant number of lines of code were dedicated to
maintaining compatibility with OpenSSL resulting in empty JNI
functions. Removing these functions results in a speed-up because
there will be fewer JNI transitions to call these useless functions
when using BoringSSL.
Since AndroidKeyStore functionality has been moved, this change also
removes all references to keystore functionality even for BoringSSL
(i.e., EVP_PKEY_from_keystore).
Test:
vogar --mode host
libcore/luni/src/test/java/libcore/java/security/*Test.java
libcore/luni/src/test/java/libcore/javax/crypto/*Test.java
libcore/luni/src/test/java/libcore/javax/net/ssl/*Test.javIa
Change-Id: I304e0f2c882c313753b0e9327c6293385fd6794b
/external/conscrypt/Android.mk
|
| ab5f93cf146114fee2300ff4fb37fe7e446d3609 |
|
21-Jul-2016 |
Dan Willemsen <dwillemsen@google.com> |
Rename lib{crypto,ssl}-host to lib{crypto,ssl}
There's no need to use a different name for target and host moudles. In
Soong, it's better to use the same for both, as target and host modules
can be defined at the same time.
Change-Id: I899084e7361953d1fe122f56feab2a032d1b27d1
/external/conscrypt/Android.mk
|
| e9b2cd57f0e40cc3021f0f6371cc103cab88f0cf |
|
13-Jun-2016 |
Alex Klyubin <klyubin@google.com> |
Faster evpUpdate for small region of large byte[].
This improves the speed of computing a digest, a MAC, or a signature
over a small region of a large byte[] on OpenJDK based VMs.
Conscrypt's code prior to this CL obtained the reference to the native
bytes by indexing into the result of JNI GetByteArrayElements. On
ART/Davlik this avoids creating copies (for 12 kB and larger arrays)
whereas on OpenJDK based VMs this always creates a copy of all the
elements of the array, which is not efficient and leads to noticeable
slowdowns when processing small fractions of the byte array as input.
This commit makes Conscrypt's evpUpdate choose a strategy (
GetByteArrayElements vs GetByteArrayRegion) based on whether the VM's
GetByteArrayElements is expected to create a copy of the array. This
guess is hard-coded for each target: platform, compat, and OpenJDK.
Bug: 27461702
Change-Id: I4ac1013b29e3d166a3f13fffebf662b02351684f
/external/conscrypt/Android.mk
|
| a9a1648e5205040ef8be10c2103bea8c9c477e1b |
|
08-Apr-2016 |
Shinichiro Hamaji <hamaji@google.com> |
Do not dlopen libjavacore from libconscrypt_openjdk_jni
Conscrypt JNI library for host OpenJDK should never attempt
to dlopen libjavacore.so.
Bug: 27954979
Change-Id: Ib8a5795ca22edde4b22576f1bd8eab182df1349d
/external/conscrypt/Android.mk
|
| 3880212fb1ed77481b6bea31a2ac1f0d33d0f833 |
|
04-Mar-2016 |
Kenny Root <kroot@google.com> |
Suppress some warnings in host build
Use -XDignore.symbol.file to suppress some internal API warnings that
print from the use of AlgorithmId.
Bug: 27457427
Change-Id: Ic49e2ed4f3f473d1d7d2dd8c813147040f207481
/external/conscrypt/Android.mk
|
| 53d42116bf76685cca8de22360f4d46d61fbccb8 |
|
16-Feb-2016 |
Neil Fuller <nfuller@google.com> |
Force conscrypt to continue to use v51 (1.7) .class files
The default is changing to v52 (1.8).
The build for this package uses jarjar to repackage .class files.
The version of jarjar in the Android tree does not currently
support v52 .class files.
Bug: 26753820
(cherry picked from commit e48fd1d993e095c47371b6a3c17864ba4b62d5db)
Change-Id: Ie36f551e0ce41a1c5e27000e265529a2dbd5e96d
/external/conscrypt/Android.mk
|
| d31ede7ba14b019d6a017f3585866a65891d1710 |
|
20-Jan-2016 |
Kenny Root <kroot@google.com> |
Get rid of AlgNameMapper
This was only a hack to support old Harmony code, so we don't need it
anymore. Remove the direct references to AlgNameMapper and use
reflection for compatibility in unbundled code.
Change-Id: I7ec14f19e5098ffe12592b79b2b163b41031b6e6
/external/conscrypt/Android.mk
|
| 2f05b73853963cd6418179be35b517eba2209224 |
|
08-Dec-2015 |
Kenny Root <kroot@google.com> |
AlgNameMapper was placed in the wrong dir
Unbreak the build by filtering it out temporarily until it can be placed
in the correct dircectory.
(cherry picked from commit a2a0e05cc992db66d2267be8967b55624482a64c)
Change-Id: I8fb43bd92d62ef640f94152612cefceeba475e98
/external/conscrypt/Android.mk
|
| 38a241317390ccf85d014c8684386d7068401061 |
|
17-Feb-2015 |
Piotr Jastrzebski <haaawk@google.com> |
Add core-oj to the list of core library jars.
(cherry picked from commit 69766952185fce734f69f3c1d81b995b305686ae)
Change-Id: I584aa770a496f433f1d5fbba579ca477bfa2ef19
/external/conscrypt/Android.mk
|
| 45c6c990bce5e0f6c5865f1d19ca044b029c1beb |
|
11-Dec-2015 |
Kenny Root <kroot@google.com> |
Do not sanitize the host JNI library
Sanitization currently makes this library reference symbols which
cannot be resolved at runtime without additional magic when starting
the JVM.
Disable this until we can find a fix. This currently fails with:
libconscrypt_openjdk_jni.so: undefined symbol: __asan_option_detect_stack_use_after_return
at java.lang.ClassLoader$NativeLibrary.load(Native Method)
at java.lang.ClassLoader.loadLibrary1(ClassLoader.java:1965)
at java.lang.ClassLoader.loadLibrary0(ClassLoader.java:1890)
at java.lang.ClassLoader.loadLibrary(ClassLoader.java:1880)
at java.lang.Runtime.loadLibrary0(Runtime.java:849)
at java.lang.System.loadLibrary(System.java:1088)
at org.conscrypt.NativeCryptoJni.init(NativeCryptoJni.java:25)
at org.conscrypt.NativeCrypto.<clinit>(NativeCrypto.java:54)
at org.conscrypt.OpenSSLBIOInputStream.<init>(OpenSSLBIOInputStream.java:34)
at org.conscrypt.OpenSSLX509Certificate.fromX509PemInputStream(OpenSSLX509Certificate.java:119)
at org.conscrypt.OpenSSLX509CertificateFactory$1.fromX509PemInputStream(OpenSSLX509CertificateFactory.java:220)
at org.conscrypt.OpenSSLX509CertificateFactory$1.fromX509PemInputStream(OpenSSLX509CertificateFactory.java:216)
at org.conscrypt.OpenSSLX509CertificateFactory$Parser.generateItem(OpenSSLX509CertificateFactory.java:94)
at org.conscrypt.OpenSSLX509CertificateFactory.engineGenerateCertificate(OpenSSLX509CertificateFactory.java:272)
at java.security.cert.CertificateFactory.generateCertificate(CertificateFactory.java:339)
at com.android.signapk.SignApk.readPublicKey(SignApk.java:161)
at com.android.signapk.SignApk.main(SignApk.java:933)
Bug: 26160319
Change-Id: Icd5ffb49eb5610552af0dd049db99a0b9f181cba
/external/conscrypt/Android.mk
|
| 0ce8205bd912486a8c4d668a5396dfc33f6cd90b |
|
10-Dec-2015 |
Alex Klyubin <klyubin@google.com> |
Self-contained host native shared library for OpenJDK.
This statically links in BoringSSL and libc++ into Conscrypt's JNI
OpenJDK shared library for host. The goal is to make the library as
self-contained as feasible to avoid issues with shared library search
path when the library is used outside of the Android source tree.
Bug: 26097626
Change-Id: I3d1b521ad11a0f88ec46d8a7382c14ffdfd44e2e
/external/conscrypt/Android.mk
|
| b862e14119e491e529faaafb5558ee147bb7a508 |
|
07-Dec-2015 |
Kenny Root <kroot@google.com> |
Add makefile rules for conscrypt-host
This builds conscrypt enough that signapk can start using it during the
build process to speed up its signing process and use RSA PSS.
Change-Id: Ic54baa286a9559bf19e14697042f28d180f58e04
/external/conscrypt/Android.mk
|
| 0a01703e59a38ea59738776b89e7c8e70c0f342f |
|
03-Dec-2015 |
Colin Cross <ccross@android.com> |
Opt-out of STL
conscrypt does not use STL, but gets libc++.so linked in by default.
Unbundled branches might not have libc++.so, so opt-out of STL.
Change-Id: I8c1e58a821b1d5c4c9aacfe34d605b27a105973b
/external/conscrypt/Android.mk
|
| 93a8dbe84d4f9e910ee20186b7d44467732232d5 |
|
05-Nov-2015 |
Dan Albert <danalbert@google.com> |
Don't fail on deprecated declarations.
Bug: http://b/22403888
Change-Id: Iac28f3da6a185e63a9190e6ca9223836cf3103ed
/external/conscrypt/Android.mk
|
| 4be69d1b12343ab62fc4101127a84ec35d70141e |
|
30-Sep-2015 |
Kenny Root <kroot@google.com> |
am 7b3add1c: Prepare the GmsCore target for BoringSSL
* commit '7b3add1cdd69f0b4f85507f7eb66df02a30201df':
Prepare the GmsCore target for BoringSSL
|
| 7b3add1cdd69f0b4f85507f7eb66df02a30201df |
|
30-Sep-2015 |
Kenny Root <kroot@google.com> |
Prepare the GmsCore target for BoringSSL
Change-Id: I2908fc4f7146a6c70309b41a5290434f3efdc9ba
/external/conscrypt/Android.mk
|
| e0fb5c395e4f08439429b498648f5408996827de |
|
16-Sep-2015 |
Kenny Root <kroot@google.com> |
resolved conflicts for 64c85650 to stage-aosp-master
Change-Id: Ib1a5f7bbe81fc88cf2b9837979650ed35665f1eb
|
| 64c85650fce6132ef66be9f7750cf28674cd65d7 |
|
21-Jul-2015 |
Paul Lietar <lietar@google.com> |
Add method to delete extension from a certificate
The OpenSSLX509Certificate is still immutable. Instead a modified copy is returned.
The use case for this is recreating the TBS component of a Precertificate as
described by RFC6962 section 3.2.
Change-Id: I2a9305ae7464642910decaf5ab46121a6f15d722
/external/conscrypt/Android.mk
|
| ee9c0fea09cbbed45769961efdc5d8a0f455d2ab |
|
24-Apr-2015 |
Adam Langley <agl@google.com> |
am 4fb44615: am a157e0cf: am f79c90d5: external/conscrypt: add NativeConstants.
* commit '4fb44615a2e7c37299c79e154dab9e16d5d3d4f5':
external/conscrypt: add NativeConstants.
|
| f79c90d56464e254ce8645f886ec0ca47573ced1 |
|
24-Apr-2015 |
Adam Langley <agl@google.com> |
external/conscrypt: add NativeConstants.
NativeConstants.java is generated by a C program and thus the values
will automatically be kept in sync with the contents of the OpenSSL
headers.
Bug: 20521989
Change-Id: Ib5a97bf6ace05988e3eef4a9c8e02d0f707d46ad
/external/conscrypt/Android.mk
|
| ef4e83436d1326ca3e72344b11e30ee9186c468e |
|
23-Apr-2015 |
Kenny Root <kroot@google.com> |
am 5f7c2d79: am 8b7fee2c: am 7cb0a4a1: Fix conscrypt-stubs target
* commit '5f7c2d7961fc0344be8df00136ce539d14e17ac2':
Fix conscrypt-stubs target
|
| 7cb0a4a10aa941347812d2063018bbb4ed7cb320 |
|
23-Apr-2015 |
Kenny Root <kroot@google.com> |
Fix conscrypt-stubs target
It should build against the SDK so it doesn't depend on a bunch of stuff
unavailable in an unbundled build scenario.
Change-Id: Ib1c2bd90585ea5823c3e5cf2a3e1efed815f2f23
/external/conscrypt/Android.mk
|
| f389f54edf7c7dbeaae10e871d897b8f455d31ee |
|
22-Apr-2015 |
Kenny Root <kroot@google.com> |
am 75e164f4: am 52497d8e: am 50dbf20c: Merge "Add Platform adapter around unbundled conscrypt"
* commit '75e164f4ea85cba7307046f6c7fc97069a004673':
Add Platform adapter around unbundled conscrypt
|
| 62190cd439f163c7a53604b01836a576ef88013a |
|
03-Apr-2015 |
Chad Brubaker <cbrubaker@google.com> |
Add Platform adapter around unbundled conscrypt
This wraps the conscrypt OpenSSLSocketImpl with an adapter that is a
subclass of the platform's OpenSSLSocketImpl in order to support old
code that does casts to the platform OpenSSLSocketImpl in order to set
things like SNI.
Until KK the platform OpenSSLSocketImpl was
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl, in KK it became
com.android.org.conscrypt.OpenSSLSocketImpl. As of L MR1 the platform
HTTP stack no longer casts to the platform OpenSSLSocketImpl and this
work around is not needed on those devices.
Change-Id: I196ad957eabfc70246d9c01aa12855a8eab036f0
/external/conscrypt/Android.mk
|
| eaa287623c035843dd99b8602958182c3e252f80 |
|
10-Apr-2015 |
Yohann Roussel <yroussel@google.com> |
Don't use Jack embedded library
This is a temporary workround to avoid intermittent failure on
build server for ub-conscrypt
Bug: 20132430
Change-Id: I781fb968ed7d0f40f908cf1ab7882957a911611b
/external/conscrypt/Android.mk
|
| b77aef4c612398285a438b300de7bda25024e65a |
|
31-Mar-2015 |
Colin Cross <ccross@android.com> |
Remove -encoding UTF-8, it is now the default
Change-Id: Ia19450f2b9e9d396b88ccb96384224518def6ef3
/external/conscrypt/Android.mk
|
| aff9780b18f86f60e396d6521456b91e7d0e3fb3 |
|
11-Mar-2015 |
Kenny Root <kroot@google.com> |
OpenSSL: remove bad dependency
OpenSSL flavor of Conscrypt still uses the dynamic engine, so don't
directly depend on the library since it will be in the SSL ENGINE
directory in /system/lib{64,}/ssl/engines
Bug: 19698929
Change-Id: Id7e3f6ffaca2073a016db546e1014d50ef4ad0db
/external/conscrypt/Android.mk
|
| 0ccc17a0c3d05be22a357849ddc5f93bf431d4ec |
|
25-Feb-2015 |
Adam Langley <agl@google.com> |
external/conscrypt: a couple more BoringSSL build fixes.
I had these in my local client and didn't notice until now.
Change-Id: I9c61447691d358acbaadb9b9a2f068b4106d266c
/external/conscrypt/Android.mk
|
| 24144a809e2d45aa5f54e6686914ffe36e9a8f66 |
|
26-Jan-2015 |
Adam Langley <agl@google.com> |
Support external/boringssl for reading flavor.mk.
Change-Id: I96a0ee6b51736aa842055dc17750c1d565f19174
/external/conscrypt/Android.mk
|
| d9b323c1fee0a6659282334be0e94811cb1b7d12 |
|
17-Dec-2014 |
Elliott Hughes <enh@google.com> |
Don't try to build the libjavacrypto native code on the Mac.
Change-Id: I979ecd044d85c757c2b8a88fbd97201e75c19cdc
/external/conscrypt/Android.mk
|
| 18ed3be560a6d1c22dff225c66deaa4f10f849a2 |
|
24-Nov-2014 |
Kenny Root <kroot@google.com> |
Clean up unused variables
Change-Id: I9234e649a910408cff9f9d33008642e0c8334276
/external/conscrypt/Android.mk
|
| de5225d1ebe7b3a5f3565539685fcd95348ae815 |
|
07-Oct-2014 |
Adam Langley <agl@google.com> |
Allow conscrypt to work with BoringSSL.
This is quite a substantial change because of the changes to ENGINEs in
BoringSSL.
For the most part, #ifs are used to allow the code to work with either
OpenSSL or BoringSSL. However, in several places, support for things
that BoringSSL is dropping have been removed, even when OpenSSL is used.
This includes DSA keys and tests for the ENGINE bits that are going away
because it's unclear how to skip compiling those tests.
Change-Id: I941a5ed232391f84b45e070c19d2ffb7ad162b7b
/external/conscrypt/Android.mk
|
| 759b19843b061ca4707c3b5edcd1161522109ecd |
|
28-Oct-2014 |
Elliott Hughes <enh@google.com> |
Fix vogar --mode host.
Bug: 18158015
Change-Id: I163ce8c755d217741439d40f334d86f545f89aee
/external/conscrypt/Android.mk
|
| ecd29abc835394f39e451f8aac65b08be8688a97 |
|
19-Jun-2014 |
Brian Carlstrom <bdc@google.com> |
Switch from core to core-libart
Bug: 14298175
Change-Id: I5035075f2453b692f86fff8fe852c954698e40ed
/external/conscrypt/Android.mk
|
| e66dbe5ad60417a4a9bf5ddf0bc3eb02652e43c8 |
|
10-Jun-2014 |
Justin Morey <jmorey@google.com> |
Add support for a Google Play Services version of the JNI lib
Change-Id: Ie0d9f83e366c0b99994eb861ae567d454cbbea5b
/external/conscrypt/Android.mk
|
| f24ba0620d88b7d71ddb089b97d29fb1b073718d |
|
09-Jun-2014 |
Kenny Root <kroot@google.com> |
Add ability to wrap platform keys
This is mostly useful for unbundled Conscrypt currently when working
with KeyChain-based keys, but could be good for use with PKCS11-like
keys in other JSSE providers.
Bug: 15469749
Change-Id: I56bf2eaf3228bdf42d671437f4fffdafb8b47b12
/external/conscrypt/Android.mk
|
| 3a03c73b41d094461d7a426b5a787ec988e40d61 |
|
23-May-2014 |
Ian Rogers <irogers@google.com> |
Remove deprecated WITH_HOST_DALVIK.
Switch host build to clang as conscrypt uses C++11 and not all GCC
host compilers support it.
Bug: 13751317
Change-Id: I74ffdda695e47967b61a133c8b6fc52f6547a3a0
/external/conscrypt/Android.mk
|
| 39deada91bd9b4ebb0a189b07382e0827e5bad68 |
|
30-May-2014 |
Kenny Root <kroot@google.com> |
Move platform-only files out to separate directory
To aid in building Conscrypt with gradle, move the platform-only files
out to a separate directory.
Change-Id: I8f07959055261f6b9f2a0ac26dea2f6431d9edbe
/external/conscrypt/Android.mk
|
| 4ccb72fd16c6c8d4b43a556595abee25d58f5cf1 |
|
30-May-2014 |
Kenny Root <kroot@google.com> |
Unbundle conscrypt
Don't build the host JNI library in an unbundled build since it's only
needed for testing currently.
Change-Id: I6b6003e86d9f6ff2d87431f156f4984f56592791
/external/conscrypt/Android.mk
|
| 031510fb212274c2761f51f8b432c0442dd67667 |
|
29-May-2014 |
Kenny Root <kroot@google.com> |
Add script to create prebuilts
This allows us to create a gradle library that people can include.
Change-Id: I7f845ae0738b8d414781a34fef6bc28bebebb994
/external/conscrypt/Android.mk
|
| 1cfba2bc6023e2d86243d48289e2c822d0bab209 |
|
27-May-2014 |
Kenny Root <kroot@android.com> |
Revert "Speed up conscrypt compile a bit"
This reverts commit ec9c6dc171f9f9df6548fea8a4da55598d5ee3a9.
Change-Id: Icfdeec757357a7449640198548963d2095d8cf92
/external/conscrypt/Android.mk
|
| ec9c6dc171f9f9df6548fea8a4da55598d5ee3a9 |
|
27-May-2014 |
Kenny Root <kroot@google.com> |
Speed up conscrypt compile a bit
Re-arrange Java library compilation to allow reuse of previous
compilations which speeds up the overall compilation by a bit.
Change-Id: I7ec172dd8ca2450d26ecec2a5dae13de5c00299b
/external/conscrypt/Android.mk
|
| 3e46e4ee56c8e37158f46941dedd5b436d724baa |
|
23-May-2014 |
Kenny Root <kroot@google.com> |
Unbundle: hacks to let Conscrypt compile standalone
This is the first pass at getting Conscrypt to compile standalone. It
works fine in apps currently. There are a few TODOs to fix.
Change-Id: I9b43ba12c55e04c8897ccacf38979ca671a55a26
/external/conscrypt/Android.mk
|
| b32d679b1e2d011115fc8ead3d62c0401187c7ac |
|
28-Oct-2013 |
Narayan Kamath <narayan@google.com> |
Remove uses of LOCAL_BUILD_HOST_DEX
Use the new BUILD_HOST_DALVIK_JAVA_LIBRARY rule instead.
(cherry picked from commit 44419837f838eab28d0f347561715cbd00150168)
Change-Id: Ib126703f927c0f6e7f8c3746ff7348864aa49a39
/external/conscrypt/Android.mk
|
| 92b12a8a5d5b74d31b3dbbd3aaaa6f3984a51f24 |
|
03-Oct-2013 |
Kenny Root <kroot@google.com> |
Revert "Rename modules to avoid build breakage temporarily"
This reverts commit 47af0857fc2b0beaa296d5e8ef8cc345e96124cf.
/external/conscrypt/Android.mk
|
| 47af0857fc2b0beaa296d5e8ef8cc345e96124cf |
|
02-Oct-2013 |
Kenny Root <kroot@google.com> |
Rename modules to avoid build breakage temporarily
Change-Id: I1096e1bebc11aae36df359cf39ceec4a2367afbd
/external/conscrypt/Android.mk
|
| 7150e32a59e2c8614437014818a27a6d205f35dd |
|
02-Oct-2013 |
Kenny Root <kroot@google.com> |
Conscrypt: add missing libraries to JNI lib
Change-Id: Ic6d1d787a3e22deca8b2cd4a52e443d06391243e
/external/conscrypt/Android.mk
|
| 0a84a212424bd713acf9151a61c2e5717f60dd1c |
|
02-Oct-2013 |
Kenny Root <kroot@google.com> |
Conscrypt: fixing Android.mk dependencies
Remove some dependencies on makefile orders from other libcore files.
Change-Id: Iff62a2aebf3b58227fbe3157371c85c33f2db097
/external/conscrypt/Android.mk
|
| 0e27f2afe3d5087301ea978d27f8655f8cfe406c |
|
16-Sep-2013 |
Kenny Root <kroot@google.com> |
Split Conscrypt makefile out from libcore
Change-Id: I6c12a0e038a86b186b5d88b9f0ff28b8480b4aed
/external/conscrypt/Android.mk
|