GitLab

Bug: 10666742

(cherry picked from commit e1a6c9cd)

Change-Id: Ia1cd5cde3c54a64be886aaba67588cb6c8bf9648

EVP_DecryptFinal_ex can have an error on the wrong block length at the
end of a decrypted block, so throw IllegalBlockSizeException when that
happens instead of a RuntimeException.

(cherry picked from commit 9a4eb515)

Bug: 10610957
Bug: https://code.google.com/p/android/issues/detail?id=58396
Change-Id: I4a4ee85f57e1507bb645b2177cfdf44e5e274b49

It takes ~1ms to create a DateIntervalFormat on a z620, and around 8ms on a
current mobile device (Nexus 4). Add a small cache of recently-used formatters,
using a big lock rather than per-thread caches since this typically only
happens on the UI thread anyway, and because all the other frameworks date/time
formatting is behind a single lock too.

Bug: 10696944

(cherry picked from commit fd1d5e92)

Change-Id: Iefd573ff6f9851efda0ebe18418dba61fb151e65

This reverts commit c2bcd6f0.

Bug: 10424836
Change-Id: I63f801c4f451383bfadd9c76f99c3ebb2726e7b0

This reverts commit bb68396d.

Change-Id: I56daf02fe24cc592844a5d0a9f1ca7432da2293e

We were leaking X509 references from stacks before so we could get away
with reusing references that should have been freed. Since we're properly
tracking references now, we need to up the reference of things we're
using.

Bug: 10610037
Change-Id: I7c7a15f37a3c1f97ca01df890fa32e342ea65f12

Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.

Bug: 10424836
Change-Id: I6dcbb5234142dc8574052be2b18f062ef2e93b02

The getParameters() call was unimplemented in the OpenSSLCipher as an
oversight. Add it so code relying on it will continue to work.

Additionally add tests for getIV() and getParameters() to make sure they
work correctly.

Bug: 10423926
Change-Id: Ie42007b15c080aab4040375f2d9c40b9d82c4f0c

Bug: 10680559
Change-Id: Idfc643f1d220ace34de5b9e2cec123e545a44b95

Bug: 10599593
Change-Id: Iade24eed691756281dfd925abe57740a1ad4145b

The proper way to free a stack of owned "FOO" items is to use
sk_FOO_pop_free since that will iterate through all the FOO instances
in the stack and free them. Calling sk_FOO_free just frees the stack and
not the items.

Bug: 10610037
Change-Id: I4ec899649a0272b82cc1ab3107a6cb62f0a14266

In the current design, if AlgNameMapper's class initialization is run
too early, the data will be incomplete. This change uses the Services's
cache versioning system to check when it should update its internal
cache ensuring it's never out of date.

Bug: 10666722
Change-Id: I0549ebb8fa1b5b3a8af71ceb179d5d217bdbdf59

Bug: 10209343

(cherry picked from commit e1a17472)

Change-Id: I9931c3e72d5623dec8cc21c09eae5532aa7eb7f6

Conscrypt was moved out of libcore, so the call directly to NativeCrypto
was removed as well. To break the dependency, introduce an interface
that Conscrypt registers as to answer algorithm name to OID mapping
queries and vice versa.

Bug: 10310296
Change-Id: I5fcda678a995bc800b97d8fb0ce2f16553dff5dd

This causes the preloading to explode because it touches a native class.

This reverts commit 6fcfb5a7.

Change-Id: I7dfc922de827ec5d01ead7592efd01c48ec17fc2

Conscrypt was moved out of libcore, so the call directly to NativeCrypto
was removed as well. To break the dependency, introduce an interface
that Conscrypt registers as to answer algorithm name to OID mapping
queries and vice versa.

Bug: 10310296
Change-Id: I06de1501681d28afbc36de9c32e384dd32790a53

Bug: 10508141
Bug: https://code.google.com/p/android/issues/detail?id=54433
Change-Id: Icf39b98802e2c6128e79c44eaf2cabc7b4805cc5

Android's formatDateRange's interpretation of a time span running until 0 ms
into a day is different from icu4c. Traditionally we didn't count that as
being the next day, but icu4c does.

Bug: 10560853

(cherry picked from commit e6d0a351)

Change-Id: Ia394fe541afcfccfe801a8aa704ad8d14212d817

This test used the test ChannelID key, but it didn't make sure it was
initialized first. This made it appear sometimes depending on the order
the tests were executed.

Bug: 10210673
Change-Id: Id8c27b7e86189290950140f0d5a56a5439e983ae

am b65643c3: am 15bfa857: am d480e87c: am b458aaf6: am 9709ed21: am 3ec381ea: am c0033066: am 97452bf6: Merge "Test fallback SHA1PRNG uses full width seeds" into jb-dev

* commit 'b65643c3':
  Test fallback SHA1PRNG uses full width seeds

am 9197f972: (-s ours) am 4dbed73a: am f45e4cbe: am 7ffdc696: am 7925d364: am 58f1d208: am 5761584c: am a3c562af: Merge "Move SHA1PRNG_SecureRandomImpl tests to libcore" into jb-dev

* commit '9197f972':
  Move SHA1PRNG_SecureRandomImpl tests to libcore

am 15bfa857: am d480e87c: am b458aaf6: am 9709ed21: am 3ec381ea: am c0033066: am 97452bf6: Merge "Test fallback SHA1PRNG uses full width seeds" into jb-dev

* commit '15bfa857':
  Test fallback SHA1PRNG uses full width seeds

am 4dbed73a: am f45e4cbe: am 7ffdc696: am 7925d364: am 58f1d208: am 5761584c: am a3c562af: Merge "Move SHA1PRNG_SecureRandomImpl tests to libcore" into jb-dev

* commit '4dbed73a':
  Move SHA1PRNG_SecureRandomImpl tests to libcore

am d480e87c: am b458aaf6: am 9709ed21: am 3ec381ea: am c0033066: am 97452bf6: Merge "Test fallback SHA1PRNG uses full width seeds" into jb-dev

* commit 'd480e87c':
  Test fallback SHA1PRNG uses full width seeds

am f45e4cbe: am 7ffdc696: am 7925d364: am 58f1d208: am 5761584c: am a3c562af: Merge "Move SHA1PRNG_SecureRandomImpl tests to libcore" into jb-dev

* commit 'f45e4cbe':
  Move SHA1PRNG_SecureRandomImpl tests to libcore

am b458aaf6: am 9709ed21: am 3ec381ea: am c0033066: am 97452bf6: Merge "Test fallback SHA1PRNG uses full width seeds" into jb-dev

* commit 'b458aaf6':
  Test fallback SHA1PRNG uses full width seeds

am 7ffdc696: am 7925d364: am 58f1d208: am 5761584c: am a3c562af: Merge "Move SHA1PRNG_SecureRandomImpl tests to libcore" into jb-dev

* commit '7ffdc696':
  Move SHA1PRNG_SecureRandomImpl tests to libcore

am 9709ed21: am 3ec381ea: am c0033066: am 97452bf6: Merge "Test fallback SHA1PRNG uses full width seeds" into jb-dev

* commit '9709ed21':
  Test fallback SHA1PRNG uses full width seeds

am 7925d364: am 58f1d208: am 5761584c: am a3c562af: Merge "Move SHA1PRNG_SecureRandomImpl tests to libcore" into jb-dev

* commit '7925d364':
  Move SHA1PRNG_SecureRandomImpl tests to libcore