GitLab

Add tests for security vulnerability CVE-2016-0718 am: ec40d6fe am: 1ab7224f am: 549143a3 am: a38bf83c am: 52ac1089 am: 47e32c35 am: e6dfd2f1 am: 5b8e6731
am: 07f5f0c8

* commit '07f5f0c8':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I6f1c1f81070c446c0e1a6dfc3ebd1736e064b16c

Add tests for security vulnerability CVE-2016-0718 am: ec40d6fe am: 1ab7224f am: 549143a3 am: a38bf83c am: 52ac1089 am: 47e32c35 am: e6dfd2f1
am: 5b8e6731

* commit '5b8e6731':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I7343001e102ed057194499c487f05dedea22c632

Add tests for security vulnerability CVE-2016-0718 am: ec40d6fe am: 1ab7224f am: 549143a3 am: a38bf83c am: 52ac1089 am: 47e32c35
am: e6dfd2f1

* commit 'e6dfd2f1':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I9ca86393c6ecf9fa1677298c0906f6f933919fca

Add tests for security vulnerability CVE-2016-0718 am: ec40d6fe am: 1ab7224f am: 549143a3 am: a38bf83c am: 52ac1089
am: 47e32c35

* commit '47e32c35':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I6ba39af5dd38cbeace747f58ad615a41991a8c40

Add tests for security vulnerability CVE-2016-0718 am: ec40d6fe am: 1ab7224f am: 549143a3 am: a38bf83c
am: 52ac1089

* commit '52ac1089':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: If8e9628eee3b0776f1243e785ef43bda73f744ac

am: a38bf83c

* commit 'a38bf83c':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I84c28366faad2789da5d774f33dc0b0a4248785c

am: 549143a3

* commit '549143a3':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I2783847d969d2f27996eda9fd8d0058d93886c38

am: 1ab7224f

* commit '1ab7224f':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I441762ca3a8a015b1aa342a845ab8f75d8edcc79

am: ec40d6fe

* commit 'ec40d6fe':
  Add tests for security vulnerability CVE-2016-0718

Change-Id: I46d5294d5dd1fa3cdd6ec1d9d7e99ceeee823612

The fixes are in external/expat.

(cherry picked from commit e168b494)

Bug: 28698301
Change-Id: Iafe4a3387be20a05c217abd65588871bb7b47160

Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev am: 5a020161  -s ours am: bdedf741
am: a0341598

* commit 'a0341598':
  DO NOT MERGE CipherTest: add test for multiple updateAAD calls

Change-Id: I5c657292415538f3a2ec3902170ac9c8b2f8bb21

Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into marshmallow-cts-dev am: 0aa7ec19  -s ours am: 696028e4
am: 4679dc10

* commit '4679dc10':
  DO NOT MERGE CipherTest: test instance reuse with updateAAD

Change-Id: Ia494e184f5a2a002359529d084aa7123a01723d1

Merge "DO NOT MERGE CipherTest: add test for multiple updateAAD calls" into marshmallow-cts-dev am: 5a020161  -s ours
am: bdedf741

* commit 'bdedf741':
  DO NOT MERGE CipherTest: add test for multiple updateAAD calls

Change-Id: I4661f654d144f663c3f6e6e4c19789d1f11e8eab

Merge "DO NOT MERGE CipherTest: test instance reuse with updateAAD" into marshmallow-cts-dev am: 0aa7ec19  -s ours
am: 696028e4

* commit '696028e4':
  DO NOT MERGE CipherTest: test instance reuse with updateAAD

Change-Id: Ic15fd20c8c39a497261f44207475f0325540ef76

am: 5a020161  -s ours

* commit '5a020161':
  DO NOT MERGE CipherTest: add test for multiple updateAAD calls

Change-Id: I59a028d5d69784553b9371b38eff2cbbeea8eb50

am: 0aa7ec19  -s ours

* commit '0aa7ec19':
  DO NOT MERGE CipherTest: test instance reuse with updateAAD

Change-Id: Ice3c406dbd72145d6ba2fdac313bfb3164dfb3cd

CipherTest: add test for multiple updateAAD calls

Make sure that multiple updateAAD calls are equivalent to other calls to
updateAAD with the same data.

(cherry picked from commit 67ee3c5c)

Bug: 27371173
Change-Id: Ie69df0906438ad26c566daed3f55b07ba60fe468

CipherTest: test instance reuse with updateAAD

AAD was not being reset on each Cipher init or doFinal call, so add
regression tests to make sure that is now the case.

(cherry picked from commit d90a44bf)

Bug: 27324690
Change-Id: I5f7606efb6dfcd412166eed2bd5f417097a97f1f

Merge "Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev am: a76a5016  -s ours" into marshmallow-cts-dev am: f65a8424  -s ours am: 8c8cfb63
am: 7d226f33

* commit '7d226f33':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: I53d8077f6d236336b5824b4e9baa13f762282573

Merge "Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev am: a76a5016  -s ours" into marshmallow-cts-dev am: f65a8424  -s ours
am: 8c8cfb63

* commit '8c8cfb63':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: I9edb605839461e5cddaea8736e6540d40b18b827

Merge "Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev am: a76a5016  -s ours" into marshmallow-cts-dev
am: f65a8424  -s ours

* commit 'f65a8424':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: Ieb194cc6e5efe25da3e37bcd566cb4bca4b13724

Merge "Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev am: a76a5016  -s ours" into marshmallow-cts-dev

Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev
am: a76a5016  -s ours

* commit 'a76a5016':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: Ic8d4909ac23b5cda9d940a2e346fdcee6f11ad1c

Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev

am: fe20752d  -s ours

* commit 'fe20752d':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: I4f13693aa4f7f34fef848ee3e83b445196f05ecb

am: 67f6d0eb

* commit '67f6d0eb':
  CipherTest: add test for multiple updateAAD calls
  CipherTest: test instance reuse with updateAAD

am: 7e4ec4fe

* commit '7e4ec4fe':
  CipherTest: add test for multiple updateAAD calls
  CipherTest: test instance reuse with updateAAD

* changes:
  CipherTest: add test for multiple updateAAD calls
  CipherTest: test instance reuse with updateAAD

Merge "Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"" into marshmallow-cts-dev am: 420e3be1 am: 6ebbfba8
am: 830b5ba6

* commit '830b5ba6':
  Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"

Merge "Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"" into marshmallow-cts-dev am: 420e3be1
am: 6ebbfba8

* commit '6ebbfba8':
  Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"

Merge "Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"" into marshmallow-cts-dev
am: 420e3be1

* commit '420e3be1':
  Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"

Merge "Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"" into marshmallow-cts-dev

This reverts commit b0153676.

Change-Id: I9777bd90be7b92e4e06c12acc80b40a8612362fb

Merge "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs" into marshmallow-cts-dev am: 07808473 am: b55e932c
am: d21008d7

* commit 'd21008d7':
  Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs

Merge "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs" into marshmallow-cts-dev am: 07808473
am: b55e932c

* commit 'b55e932c':
  Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs

Merge "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs" into marshmallow-cts-dev
am: 07808473

* commit '07808473':
  Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs

Merge "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs" into marshmallow-cts-dev