GitLab

* commit 'ea961ada':
  Apply conscrypt changes from merge commit

Merge commit 8b188b864302f5ea9df17636b378938a15b4605a was incomplete
because some conscrypt files have been moved into a separate repo.

There have been various changes in conscrypt which renders changes to:

crypto/src/main/java/org/conscrypt/OpenSSLServerSocketImpl.java
crypto/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
crypto/src/test/java/org/conscrypt/CipherSuiteTest.java

unnecessary.

This is effectively the same change as conscrypt
commit 8d7e23e1.

Change-Id: I0f8199f3bf39a035ad5453be6fea92f511dcf548

Bug: 17750026
Change-Id: I1c2ecbeb914db645f440d58e7f7daa86d880ad6f

* commit '6dcb23fe':
  Fix the ENGINE_finish/ENGINE_free mixup

* commit 'f427ec90':
  Fix the ENGINE_finish/ENGINE_free mixup

The tests were calling finish when it meant free. This caused tests to
segmentation fault next time the ENGINE was looked up in the dynamic
engine list.

(cherry picked from commit 984b7ec6)

Bug: 14994037
Change-Id: If7379fee26f7e79fa0b43104ac9d13b4ffb62ba8

The tests were calling finish when it meant free. This caused tests to
segmentation fault next time the ENGINE was looked up in the dynamic
engine list.

Bug: 14994037
Change-Id: If7379fee26f7e79fa0b43104ac9d13b4ffb62ba8

Bug: 16957575
Change-Id: I351316a62f9b583b37b54f3e7fbfaa0450439ca4

When the ByteBuffer didn't line up exactly with the backing array, it
would allocate a new buffer to write into. Instead, add the ability for
OpenSSL to read at an offset in the given array so a copy isn't needed.

(cherry picked from commit 7ed0fae1)

Change-Id: I149d3f94e4b5cbdc010df80439ae3300cbdc87a5

Checking the state of the connection is unreliable if SSL_read and
SSL_write are happening in another thread. Move the state checks inside
our application mutex so we don't run into another thread mutating the
state at the same time.

Bug: 15606096

(cherry picked from commit 0931d51c)

Change-Id: I151ecbc57278374007a56827a65295b4c9476732

(cherry picked from 26163c26)

Bug: 16352665
Bug: https://code.google.com/p/android/issues/detail?id=73745
Change-Id: I5bcaf3ee8910ff75e785baed4c4604fee6c5e700

Bug: 16029580

Change-Id: I09850d08b82f1929bae04d846b1f9807d10391ab

The decrypted bytes should written sequentially into each buffer of
the destination array until it's full before moving to the next
buffer.

(cherry picked from commit 41eb5b65)

Bug: 16352665
Change-Id: I2454249c167deafde6c12134d3c8cd658cd7c21b