GitLab

This change switches off the build of libjavacrypto in the Pure-cap
ABI.

Change-Id: I2a7a87e2575adc0dffd8e1e66163a4efd775371f

Merge "Snap for 5652499 from e6fe6b65 to qt-release" into qt-release

Merge "Snap for 5652499 from e6fe6b65 to qt-release" into qt-release

Change-Id: I899582c6940a188bb33bfb61bf439bbc439cf7ca

Change-Id: Ie7abbd2f0fbf242e45fe34e0ca8853b62f5e02fa

Change-Id: Idd3f94a164383e2b8a343af66faba43bf069fbe8

Bug: 129546105
Change-Id: I2a2cb5e0ce89739ac0c810d818865a3bc74c3427

Change-Id: I99dbc164f776dfb988af54a4a6718312388a7bcd

Q is now officially 29. To target the timezone APEX exactly to Q
devices, the sdk version numbers are all set to 29.

Bug: 131128233
Test: m and check the sdk version numbers
Change-Id: Ic3e2891a26ead3bacf3e8946bdabe3d1a253408f

Change-Id: Id5f44dea48d2869983a00e5eaf302dd199228e41

Change-Id: I0aca07ada44fd89128e8bd464ba7c093e6f62465

Workaround to prevent libjavacrypto being pulled into /system/lib rather
than APEX on target builds due to b/124476339.  There is already
a workaround in apex/Android.bp to ensure libjavacrypto is installed
in the APEX, which is the only required copy.

Bug: 123925742
Test: m && flashall; Manually verify no libjavacrypto in /system
Test: art/tools/run-libcore-tests.sh --mode=host --variant=X64
Change-Id: If8ca646755e7f9ca38dc60b67bcdb7540a394523
Merged-In: If8ca646755e7f9ca38dc60b67bcdb7540a394523

Update version number to 220000000. The Beta 3 builds (which are in dogfood and public beta) will receive modules via the Play Store with version numbers 210000000. Hence, we must bump the version in qt-dev and hence beta 4.

BUG: 131240537
Change-Id: I829b091f2400fd77c815f6dc452fe87fd16b14c4

Change-Id: I8d380f199bf601dd2fb3c7341b2d3346004fc20c

Change-Id: I3c668fd97fa7471cf4937b28e5ad4be5b7868323

Test: m
Bug: 122937705

(cherry picked from commit f68e509fda83857489e01ec3a0ca7b5d172fd55c)

Change-Id: I0260d7ed8691f14772d876a75afdc4c8c7b33999
Merged-In: I3919da437f8efb3b26a8182baa5f3e0070d383ff

The Beta 2 builds (which are in dogfood an public beta) will receive modules via the Play Store with version numbers 0200000000. Hence, we must bump the version in qt-dev and hence beta 3. This is so that prebuilts in the beta 3 OTA will be higher than any Play Store pushes on beta 2. We are bumping it by 10000000 so that we have name space to do intermediate cherrypick builds if needed.

Bug: 129977903
Change-Id: I023454097f9d2948e68e91ec70dc2ed844075fde

Change-Id: Ie53dbe3b1279f6ba16269b072bc968e6cce1f71a

am: 99cda942

Change-Id: I656a3fc8db326f70e5fa650f252dfe87c5ab2922

Change-Id: I236f2f18fb6025576857e3e57bb634c370393437

am: af20f996

Change-Id: I735bdea91958b59f0cb1ea8a3853787d20f373a0

am: 30acccc8

Change-Id: I6a0c81c40553ae21dee1a91aca99962e858b3eda

am: 87f65753

Change-Id: Ibdbd53f049563602590b99f6eae5af6802fd2fd0

Change-Id: I6d05a12e5a5dd1dfca71556d64a36d93b45ec929
BUG: 129345239

Relevant changes:
* Add missing license declarations
* Omit TLS_FALLBACK_SCSV for TLS 1.2+
* Add alias for ChaCha20-Poly1305

Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Change-Id: I321386ca92a58351bc92f8306a575c85a9821400

Some other providers appear to have used ChaCha20-Poly1305 as the
identifier for this cipher, so support it for compatibility.

TLS_FALLBACK_SCSV protects against downgrade attacks when clients
implement a version fallback independent of TLS version
negotiation, but if it's set on a non-fallback connection
attempt, it will prevent an otherwise-safe connection if the
server supports a version higher than the client does.  Because
the default OpenJDK TLS implementation doesn't support
TLS_FALLBACK_SCSV, some developers mistakenly enable it on every
connection due to thinking it's a normal cipher suite, which is
starting to cause issues when servers upgrade to TLS 1.3.

We can obviously omit it on connections with a max version of 1.3,
since that's Conscrypt's max version, so it can't be a version
fallback.

As far as connections with a max version of 1.2 are concerned, this
type of fallback is generally not needed any longer, since TLS
1.3-supporting servers should all perform version negotiation
properly.  (Chrome and Firefox have both disabled version fallback
entirely.)  Thus TLS_FALLBACK_SCSV's presence in connections with a
max version of 1.2 is significantly more likely to be a
misconfiguration than a true fallback indication.

We continue to include the cipher suite for connections with a max
version of 1.1 or lower.  First, flaws in pre-1.2 versions are more
likely to exist than flaws in 1.2, so the benefit of flagging
downgrades to those versions are higher.  As well, fallback is most
likely to be useful when dealing with buggy TLS 1.2 servers.

Fixes #574

Change-Id: Ib27956173dec983add5f2d072ac86b5426926e38

Bug: 129093117
Change-Id: Ie9178318af7d13c835b61bf63ce4221e0c2a9234

Upstream changes to CompatibilityCloseMonitor from AOSP.

We can probably go one step further and link the Platform version
against libandroidio.so stubs, but this brings the Github repository
back in sync first.

Test: gradlew check

Change-Id: Idf60d37464e79793e98a97f6ae795947c0e7034c

am: 4181bf86

Change-Id: Ibee7b8b76ee22d3c5ba04513317e9d99733d4309

am: beb4b34a

Change-Id: I281f3c2da283e3c24930a3eb148c4c5201240917

am: f10ab2a2

Change-Id: I9b1d59f88e5697ab9d993e15acc5deba319ea367

Main changes:

* Support updateAAD(ByteBuffer) in AEAD Ciphers
* Add tests to improve test coverage

Bug: 129008943
Bug: 129200515
Bug: 129200671
Test: cts -m CtsLibcoreTestCases
Change-Id: Ia914ec5bacadbf6fff789e0dc9a006cc2acec3ce