| 54282e7423d30f062924656e20478a7a58ea87af |
|
03-Nov-2017 |
Adam Vartanian <flooey@google.com> |
Fix NullPointerException when calling setAlpnProtocols().
setAlpnProtocols() (a Conscrypt-specific function) can be called with
null and treats it the same as an empty array, whereas the RI's definition
of setApplicationProtocols(), which is used for the same purpose, disallows
null. Replace null with empty array when mapping from one to the other.
Test: vogar libcore.javax.net.ssl
Bug: 68829489
Change-Id: I8d9e7f11721217d00a0bf31db052ddb935751bb0
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 19a17ed61788de204b9d37fa5436dc2dd52df30f |
|
03-Nov-2017 |
Adam Vartanian <flooey@google.com> |
Remove zero-width spaces.
This appears to do nothing in many diff tools, but it's removing a trailing
zero-width space character from the names of a bunch of method identifiers.
Zero-width spaces are valid identifier characters, so this actually changes
the identifier to what one would expect it should be, and to boot some
compilers can't handle zero-width spaces in identifiers.
Test: make
Bug: 68811146
Change-Id: I3cad25f29a4c011fb62e3462513cf5ce7126081e
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| b23e9353ed4e3256379d660cb09491a69b21affb |
|
23-Sep-2017 |
Nathan Mittler <nathanmittler@google.com> |
Add missing Java 9 methods for ALPN (#339)
Fixes #316
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 26e28ebd2f7dfe27dd4936e78e07f7108382c22f |
|
15-Sep-2017 |
Nathan Mittler <nathanmittler@google.com> |
Adding support for Java 9 server-side ALPN protocol selection. (#319)
Java 9 adds a setHandshakeApplicationProtocolSelector method to both
SSLEngine and SSLSocket that allows the application to provide a
BiFunction to choose the protocol. This PR attempts to provide
support for this method while still maintaining backward compatibility
with ealier versions of Java.
Fixes #316
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 7140d87e131c800f8832a0ad6b35e825f5e9383a |
|
06-Jun-2017 |
Nathan Mittler <nathanmittler@google.com> |
Conformance fixes for the engine-based socket. (#202)
This allows the SSLSocketTest to pass with the engine-based socket
enabled.
Also restructuring the inheritance hierarchy so that the FD and engine
sockets both behave the same way (both either wrappers or not). The
restructure involves the following:
- AbstractConscryptSocket: New base class for both sockets. It handles
the wrap/no-wrap logic.
- OpenSSLSocketImplWrapper: deleted and replaced by
AbstractConscryptSocket.
- OpenSSLSocketImpl: reduced to a public shim class between
AbstractConscryptSocket and the implementations. For backward-compat
only.
- ConscryptFileDescriptorSocket: Renamed from OpenSSLSocketImpl. The
old FD socket.
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| d153b6000977e5e36448e4faf1a5c602c461057f |
|
05-Jun-2017 |
Nathan Mittler <nathanmittler@google.com> |
Various fixes to the Conscrypt engine. (#201)
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| e5e2a219677b03fa2d0b95ad565d05102eb0397c |
|
12-May-2017 |
Nathan Mittler <nathanmittler@google.com> |
Refactor OpenSSLSocketImplTest to cover both socket types (#182)
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 5ca87050dafe566d8d4e2b11e395f7d06a2d837b |
|
10-May-2017 |
Nathan Mittler <nathanmittler@google.com> |
Importing Android integration tests (#178)
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 29916ef38dc9cb4e4c6e3fdb87d4e921546d3ef4 |
|
28-Mar-2017 |
Nathan Mittler <nathanmittler@google.com> |
Locking down public APIs (#157)
Tried to be as aggressive as I could, so this probably deserves a fairly thorough review. I left most of OpenSSLSocketImpl public, because I think it's needed by a few external projects.
I also did some cleanup work to get rid of a bunch of compiler warnings that we seem to have accumulated.
Fixes #142
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| dbe082cb70a1ffbe1a693bd583a06ecad585f46d |
|
21-Mar-2017 |
Nathan Mittler <nathanmittler@google.com> |
Introducing top-level Conscrypt class (#152)
This is a one-stop-shop for creating and configuring Conscrypt types. It allows a standard way for configuring extended settings that are not currently supported by the standard Java APIs.
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 5070bdfc6277af136b7eb5fe5d0d72ad2ff6a2eb |
|
16-Mar-2017 |
Kenny Root <kroot@google.com> |
Create @hide Doclet for public API docs
This allows us to use @hide to prevent a class from showing up in the
public API documentation.
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| de343bb1ee01e6a866ffd484ecd897d0cac19014 |
|
02-Mar-2017 |
David Benjamin <davidben@google.com> |
Configure OCSP and SCTs on the SSL, not SSL_CTX.
As Conscrypt is currently set up, one SSL_CTX (owned, ultimately, by the
SSLContext) may correspond to multiple SSLParameters which, in the Java
API, are configured on the SSLSocket or SSLEngine directly. Thus we
should use the SSL versions of the APIs which now exist. This avoids
mutating an SSL_CTX which may be shared by multiple SSLs with different
configurations.
Change-Id: I19485c316087004c6050d85520b0169f2ca0d493
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| eefe4decab17c7bf98059fc2962849020cc82d96 |
|
07-Mar-2017 |
Nathan Mittler <nathanmittler@google.com> |
Adding conversion utility ALPN protocols (#140)
Exposing additional set methods in OpenSSLEngineImpl and OpenSSLSocketImpl to allow the caller to set the ALPN protocols without having to manually encode.
Also simplifying the exposure of the maxSealOverhead value.
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| ae6e905323df3356e110c15808c7d4102da554c8 |
|
01-Mar-2017 |
Nathan Mittler <nathanmittler@google.com> |
Fixing various javadoc issues. (#124)
Also locking down access to a couple utility classes.
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| b62c3916f250f11a09487f61a536b66525b4f28d |
|
10-Feb-2017 |
Kenny Root <kroot@google.com> |
Suppress or fix ErrorProne warnings
Having synchronized on close() in our implementation causes a
deadlock.
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| d5d2c11d5491e4e9192f9d0e7bae086d31a7d472 |
|
09-Feb-2017 |
Kenny Root <kroot@google.com> |
Reduce Java lint warnings
This reduces the number of Java lint warnings down to just the
[serialization] class of warnings as well as the Sun proprietary
warnings for the OpenJDK implementation.
These changes do not result in any change of behavior, but the
serialization changes might. Those will be fixed in a separate CL.
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 0d92f89dcb5b34ff4c182520ec10c4220cc465ec |
|
14-Dec-2016 |
Steven Valdez <svaldez@google.com> |
Fixing order of SSL_CTX/SSL initialization.
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I4a926afb5bf1b7ed29a2066b1d088b41a8ca845b
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 485f59ef78a981b17c53659fa7a5509a0d357478 |
|
01-Dec-2016 |
Kenny Root <kroot@google.com> |
Create abstract base for OpenSSL-backed SSLSession
This will aid in creating an SSL*-backed implementation of the Java
language SSLSession class for use when we have not established a session
already during handshake or when in False Start.
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I58cfbee2940412beaed4a8d4d38211ecfbce7ec9
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| c92860619ed129c9f2ca753ce4659a4d8f83ba49 |
|
03-Dec-2016 |
Kenny Root <kroot@google.com> |
Do not pass SSL_SESSION on verification callbacks
In order to prepare for better SSLSession handling, eliminate the places
in which SSL_SESSION objects are passed in and centralize it on
SSL_get1_session in order to reduce the callsites of this to zero in the
future.
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: Id185b283f3d3e30d3d1b1d2b0f7a31a1f0831660
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 6822ee0ad197f08ec325e35bb7176d1e84dd23ea |
|
03-Dec-2016 |
Kenny Root <kroot@google.com> |
Move cert reference chain building function
This is going to be used in a couple more places in the future, so move
it to OpenSSLX509Certificate.
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: Ic8dd2483475528ae5c5eb8ee9ad98120459dc1bc
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 10a7a5612942317aac847c673eacad91edc65e0a |
|
01-Dec-2016 |
Kenny Root <kroot@google.com> |
OpenSSLSocketImpl: set client mode before handshake
Setting the client/server mode used to be done intrinsically during the
SSL_do_handshake JNI call. Pull it out so client_mode doesn't need to be
passed to the SSL_do_handshake call.
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Change-Id: I46ab82ba5ef2d851bf4f81fb3d1e905a78c2cc76
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|
| 7782d132fab6ac9f30b97d76ed3a51126ed3e6d1 |
|
22-Nov-2016 |
nmittler <nathanmittler@google.com> |
Restructuring conscrypt into submodules
Change-Id: I2a4dea5d2a5f35b29fdbb96bcdae1888a4fe2b7e
/external/conscrypt/common/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
|