GitLab

This was mapping 2-key 3DES to regular DES thus resulting in all
encryption using 2-key 3DES having the wrong answers.

(cherry picked from commit 55caed99)

Bug: 31081987
Change-Id: I44ba12dcf51d57952cf3ba501381d144d271a2a6
(cherry picked from commit 3209baf3)

am: ce5bdd03

Change-Id: I41d2c084ae5a3f9b1729102ad608a40014123778

CertBlacklist was previously in bouncycastle, but with the enso switch
we no longer use their CertPathValidator and so blacklist checking
wasn't being done.

CertBlacklist is mostly unchanged from bouncycastle except removing the
bouncycastle Digest and Hex dependencies in isPublicKeyBlackListed.

Bug: 29397721
Change-Id: Icccdcc0e108e8b0c60c47522114749518247a598

Use SSL_session_reused to check when a session was reused am: efd7f14d am: 570b68b1 am: 79263dbf am: 37a87dd8  -s ours am: 97adf6ee am: f4119242 am: 7281dbfc am: 3e855cdb
am: 80fd9357

* commit '80fd9357':
  Use SSL_session_reused to check when a session was reused

Change-Id: I42590ca2a936cb5f845083c37bffc84e8a9bbad0

Use SSL_session_reused to check when a session was reused am: 0b905f8e am: a2e751b4 am: 051cfe80 am: 215292da
am: 67abd0c8

* commit '67abd0c8':
  Use SSL_session_reused to check when a session was reused

Change-Id: I61d8e4c4a22df692172d81e4b1df3a7bd58d1256

Use SSL_session_reused to check when a session was reused am: efd7f14d am: 570b68b1 am: 79263dbf am: 37a87dd8  -s ours am: 97adf6ee am: f4119242 am: 7281dbfc
am: 3e855cdb

* commit '3e855cdb':
  Use SSL_session_reused to check when a session was reused

Change-Id: Ib9f4b80dd63a6a34358641ee32e291fd9b9ff558

Use SSL_session_reused to check when a session was reused am: 0b905f8e am: a2e751b4 am: 051cfe80
am: 215292da

* commit '215292da':
  Use SSL_session_reused to check when a session was reused

Change-Id: I61463a8c680120a3d8496978d03680b3e8d292ea

Use SSL_session_reused to check when a session was reused am: efd7f14d am: 570b68b1 am: 79263dbf am: 37a87dd8  -s ours am: 97adf6ee am: f4119242
am: 7281dbfc

* commit '7281dbfc':
  Use SSL_session_reused to check when a session was reused

Change-Id: Ifff55860931526e1fec83ebbe916551637592e51

am: 051cfe80

* commit '051cfe80':
  Use SSL_session_reused to check when a session was reused

Change-Id: I3a972ee0fb33770474a335392dae283c33854f23

Use SSL_session_reused to check when a session was reused am: efd7f14d am: 570b68b1 am: 79263dbf am: 37a87dd8  -s ours am: 97adf6ee
am: f4119242

* commit 'f4119242':
  Use SSL_session_reused to check when a session was reused

Change-Id: I954fd0dd7f704154757dd6d330356aad8b5004af

am: a2e751b4

* commit 'a2e751b4':
  Use SSL_session_reused to check when a session was reused

Change-Id: If3ba7b806a4a67247146b89fb1073e353d80ef3f

Use SSL_session_reused to check when a session was reused am: efd7f14d am: 570b68b1 am: 79263dbf am: 37a87dd8  -s ours
am: 97adf6ee

* commit '97adf6ee':
  Use SSL_session_reused to check when a session was reused

Change-Id: Ia45b3883b12a1e6961aae04c790379f22a34dcbe

am: 0b905f8e

* commit '0b905f8e':
  Use SSL_session_reused to check when a session was reused

Change-Id: I86105390b7f9f0af8e2293bd4032fe4fe9b2a471

Use SSL_session_reused to check when a session was reused am: efd7f14d am: 570b68b1 am: 79263dbf
am: 37a87dd8  -s ours

* commit '37a87dd8':
  Use SSL_session_reused to check when a session was reused

Change-Id: Iddfaf5121a109704cce8df7ca00fe1113f99514b

am: 79263dbf

* commit '79263dbf':
  Use SSL_session_reused to check when a session was reused

Change-Id: I7ef24f8b661f8ebbbaa7e5bc15046de469718a8e

am: 570b68b1

* commit '570b68b1':
  Use SSL_session_reused to check when a session was reused

Change-Id: Iec88b79b6ad31dcdd1c4e9f64b3a7fca1d384285

am: efd7f14d

* commit 'efd7f14d':
  Use SSL_session_reused to check when a session was reused

Change-Id: I5575ba2da8aa4acebd6e11a4089b5f152073bcd8

am: 1115fa0f

* commit '1115fa0f':
  Use SSL_session_reused to check when a session was reused

Change-Id: I37f063d9c60fbb7f7b86464f16d95873cb1e8838

The returned session_id could be exactly the same in the case of TLS
session tickets, so use the SSL_session_reused API to determine exactly
when a session was reused.

(cherry picked from commit 1115fa0f)

Bug: 28751153
Change-Id: Ie82e4d1bb326d7e7deb7981a1e57df393f6c0e1f

The returned session_id could be exactly the same in the case of TLS
session tickets, so use the SSL_session_reused API to determine exactly
when a session was reused.

(cherry picked from commit 1115fa0f)

Bug: 28751153
Change-Id: Ie82e4d1bb326d7e7deb7981a1e57df393f6c0e1f

The returned session_id could be exactly the same in the case of TLS
session tickets, so use the SSL_session_reused API to determine exactly
when a session was reused.

Bug: 28751153
Change-Id: Ie82e4d1bb326d7e7deb7981a1e57df393f6c0e1f

am: dd5e93cc

* commit 'dd5e93cc':
  UniqueMutex for explicit ordering with ScopedSslBio

Change-Id: Ibac52a957bebedf968ebd3ccbb0d3139c310ab5b

The MUTEX_LOCK / MUTEX_UNLOCK semantics work if you also explicitly
clear out resources that were supposed to be cleared before the lock is
released. However, with wrapper classes that do it automatically, you
can't get the correct ordering. Instead of converting these all to
manual acquire and release, convert the mutex handling to use automatic
release via UniqueMutex so that ordering is correct with resources that
should be protected by the mutex.

Thanks to Zhen Song for finding these issues.

(cherry picked from commit cdc9e2f0)

Bug: 28473706
Change-Id: I4b63ce674e0fc343fe156936df7e8f6e3130722f

This adds versions of the new checkServerTrusted methods that return the
built chain.

Bug: 27271561
Change-Id: Id03500dab962c949430ee217407bf64fec28adb7

When this Signature scheme was added to Conscrypt, we went with the
Bouncycastle name of "ECDSA." However, the Standard Names documentation
that "ECDSA" should not be used due to its ambiguity.

(cherry picked from commit b825b833)

Bug: 27753949
Change-Id: I20196550aa3cc70afaff1930d5e90e1c3a59ea82

am: 3b3bf012

* commit '3b3bf012':
  Fix updateAAD when offset is not 0

Change-Id: I4158a70440836495aa0f383b6975a2edaa7bf0a1

am: 3467d643

* commit '3467d643':
  OpenSSLCipher: reset AAD when necessary

am: 5ad20a9d

* commit '5ad20a9d':
  Fix updateAAD when offset is not 0

am: 9345629a

* commit '9345629a':
  OpenSSLCipher: multiple calls to updateAAD were ignored

am: b9d2def2

* commit 'b9d2def2':
  OpenSSLCipher: reset AAD when necessary

ChaCha20-Poly1305 is more efficient in software, but many modern CPUs
have acceleration for AES which makes AES-GCM the more preferable choice
in terms of throughput and battery consumption (i.e., less CPU cycles
per byte).

Use the CPU features as reported by BoringSSL to determine when to
prioritize AES-GCM over ChaCha20-Poly1305. This should be good enough to
say when the trade-off should be made.

(cherry picked from commit 4209803a)

Bug: 26945889
Change-Id: I7ae2f3e422e30e83324c08514509cb3e9a506d97

Due to AAD data not being reset when a Cipher instance was re-used, this
bug was never uncovered by tests that actually exercise this case.

(cherry picked from commit 95cf7b9b)

Bug: 27696681
Bug: 27324690
Change-Id: Iae9b5794f212a8fc4eeff2a651332e7490f5cada

Due to AAD data not being reset when a Cipher instance was re-used, this
bug was never uncovered by tests that actually exercise this case.

Bug: 27696681
Bug: 27324690
Change-Id: Iae9b5794f212a8fc4eeff2a651332e7490f5cada

Update d2i_SSL_SESSION to only throw IOException and change tests to
expect that to happen. Since IOException is declared as a thrown
exception, non-test code should already be expecting this.

(cherry picked from commit c12c046e)

Bug: 27526112
Change-Id: Ic8c1a47debce9cb76221150d050be86d010c6ec3