tree ad19a1b6724dfa8d10736ef0f9797b4f7eb9072b
parent bd086d9c0704b340879f925741567e5a6610b333
parent 64f0eda4e9bb5af5ad785ec56de0f061ea5d140d
author Adam Vartanian <flooey@google.com> 1499271649 +0100
committer Adam Vartanian <flooey@google.com> 1499334532 +0000

Merge upstream master

Includes a lot of refactorings of the core SSL classes (especially
session code), some bug fixes, and AlgorithmParameters.GCM.  There
shouldn't be any large changes in behavior.

A number of classes have been renamed, but shims are left in place to
handle cases where users are using reflection to access unexposed
APIs (see, eg, OpenSSLSocketImpl.java).


Bug: 62852271
Bug: 62369410
Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsLibcoreOkHttpTestCases
Test: cts -m CtsLibcoreWycheproofConscryptTestCases
Change-Id: Ib6eb0819f2b38d1b8e49b49a0eba769eb8afc4cf