GitLab

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

Note: port of cr/110497945

Bug: 26231099
Bug: 26234568
Change-Id: I3eef233b15ded9553c3cdfd1c51ffef306276f7d

If System.nanoTime() returns the same value twice in awaitNanos()
then (remaining == initialNanos) will be true but the code
will conclude that a (less likely) overflow occurred.

Bug: 24284239
(cherry-picked from commit 8fc2ac0f)
Change-Id: I3b9d573ea822e18f4c1849c8ab66071e66274a50

am b75ac565: am 8c894eed: am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit 'b75ac565':
  Fixes associated with the tzdata 2015a update

am ff15358d: am 3ee1e2ac: am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit 'ff15358d':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

am 8c894eed: am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit '8c894eed':
  Fixes associated with the tzdata 2015a update

am 3ee1e2ac: am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '3ee1e2ac':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit '58ca9e81':
  Fixes associated with the tzdata 2015a update

am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit 'ab44963a':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit '74b5e062':
  Fixes associated with the tzdata 2015a update

am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '7999eb24':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit 'f6a672c7':
  Fixes associated with the tzdata 2015a update

am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '904fb41d':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit 'b266f2c0':
  Fixes associated with the tzdata 2015a update

am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '0e5d0c76':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit 'fd2df146':
  Fixes associated with the tzdata 2015a update

am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '9551a862':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit '917c8e09':
  Fixes associated with the tzdata 2015a update

am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '97a16d1a':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

* commit 'fe790a73':
  Fixes associated with the tzdata 2015a update

am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit 'afc1b34a':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

* commit '779c726a':
  Fixes associated with the tzdata 2015a update

* commit '1d1abc5b':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

Chile has changed the rules for DST. The test duplicates
testApia below it, so it can be removed.

Bug: 19212588
(cherry-picked from commit ebfb8f8b)

Change-Id: Ibe7c0dc510813826dca13993b6600d368e03740a
(cherry picked from commit a8885648)
(cherry picked from commit 60da282d)

This test was more complicated than necessary, and now we have better
historical data for Asia/Saigon it's started to fail. I've removed that
part of the test (because there are now a lot more transitions) and rely
solely on Africa/Bissau. We really only need one transition so we can
test two times: one before the first transition and one after the last
transition.

Bug: 18285300
Change-Id: Ic820e88b319095b89779d271f45f5cb1c90173da
(cherry picked from commit d05995d8)

am ef93e2f3: am 73e64b14: am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev

* commit 'ef93e2f3':
  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. (from cl/107214) b/23693318

am 73e64b14: am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev

* commit '73e64b14':
  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. (from cl/107214) b/23693318

am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev

* commit 'afe2e6ce':
  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. (from cl/107214) b/23693318

am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev

* commit '68232740':
  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. (from cl/107214) b/23693318

* commit 'c43d70e6':
  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. (from cl/107214) b/23693318

* commit '9073d215':
  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. (from cl/107214) b/23693318

* commit 'ba1b44d5':
  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. (from cl/107214) b/23693318

Change-Id: I1cd7c9a1a026e73f4e7ff7cc8ae69fc269866640

am 66b3ce69: am 70a463cb: Merge "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. (from cl/107214) b/23693318" into kitkat-c

* commit '66b3ce69':
  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. (from cl/107214) b/23693318

am 70a463cb: Merge "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. (from cl/107214) b/23693318" into kitkat-cts-dev

* commit '70a463cb':
  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. (from cl/107214) b/23693318

Merge "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. (from cl/107214) b/23693318" into kitkat-cts-dev

am c1ae4fde: (-s ours) am 75090d49: (-s ours) am ebc4ca82: (-s ours) am c5a96cff: (-s ours) am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707

* commit 'c1ae4fde':

am e60752f7: am 13405d75: am 55b43a5c: am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

* commit 'e60752f7':