GitLab

am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev

* commit '8a012b3a':
  DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE

* commit '977acac8':
  Skip TimaKeyStore in KeyStoreTest

am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit '19679b0f':
  Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback().

am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8 automerge: 81598a53

* commit '6da6b0e4':
  Fix race condition in WeakHashMapTest.

Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev

to missing CVE

Change-Id: I5688b4a658cef3b0822bfd9fc9ac0631abf6d733

TimaKeyStore is Samsung's TrustZone-based KeyStore
service provider. It should be skipped for KeyStore
test cases since Samsung has it's own test cases.
(cherry picked from commit f0cd15d2)

Change-Id: I7c63dd1e037b0d8bed58593c2c9c883010106286

Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

Add testInterfaceProperties(): verify if each interface can be retrieved
using getByName().  Use type properties of these interfaces to determine
if they are Ethernet.  Perform address tests on all active Ethernet interfaces.
Move Ethernet verification out of testLoopback into testInterfaceProperties.

Change-Id: I1641f2995f4ceb858eda38d1ba6137382b2c7ba3
Signed-off-by: Tochau Hoang <tochau.hoang@panasonic.aero>

Since mContext should not participate in the serialization process,
hide it with the transient qualifier. This will prevent the field from
initialization during the unserialization of this class. Then of course
the instance will be in a valid state.

(cherry picked from commit 8d57b9dbbd883422a0ff02083bfcf637b097e504)

For KLP during CTS runs, the OpenSSLX509Certificate#getContext() is not
public so we have to call the function we are interested in via
reflection.

Bug: 21437603
Change-Id: Id5b8a83b6000c2219f3246f93aff7a9c6453f639

Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8
automerge: 81598a53

* commit '81598a53':
  Fix race condition in WeakHashMapTest.

automerge: 8806a8e8

* commit '8806a8e8':
  Fix race condition in WeakHashMapTest.

automerge: 62538d84  -s ours

* commit '62538d84':
  Fix race condition in WeakHashMapTest.

* commit 'c8e1b9c1':
  Fix for TLS HTTP connections with GMS sockets

Change-Id: If065adcf5fafb6cee6dffdaef4cc84b4f22d741c

The logic was incorrect. If the socket is not the platform version all
connection attempts would be treated as fallbacks.

Bug: 18675956
Change-Id: I7bb1f84127fbede75f12b0a8dec7d4a7374f0b22

* commit '08855205':
  Fix a bug in DefaultHostnameVerifier wildcard handling.

* commit '77a7e48a':
  Fix a bug in DefaultHostnameVerifier wildcard handling.

Wildcard domain name patterns of the form *.remainder are supposed to
match domain names that exactly match the remainder. Due to a bug,
the match was not exact but rather a prefix match: domain names
starting with the remainder would match too.

This CL fixes the issue.

(cherry picked from commit eecc5b7c)

Bug: 18432707
Change-Id: I3b7715adf7a66e57fafe2a0218a73f4ff2dd4182

* commit '2164d895':
  Add support for TLS_FALLBACK_SCSV

Change-Id: I552e60c4cc00bf422aad5ba3939ed50eaef11e56

Backport of commits:

external/conscrypt: 8d7e23e117da591a8d48e6bcda9ed6f58ff1a375
libcore: e6a6e935
libcore: 957ec8b0

Plus additional changes to:
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
luni/src/test/java/libcore/java/net/URLConnectionTest.java
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java
support/src/test/java/libcore/java/security/StandardNames.java

to account for KitKat differences.

Bug: 17750026
Change-Id: Ic6e9474275bc3ffec3b5c2d6df1f8d6ffe77bff8

Backport of commits:

external/conscrypt: 8d7e23e117da591a8d48e6bcda9ed6f58ff1a375
libcore: e6a6e935
libcore: 957ec8b0

Plus additional changes to:
luni/src/main/java/libcore/net/http/HttpConnection.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
luni/src/test/java/libcore/java/net/URLConnectionTest.java
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java
support/src/test/java/libcore/java/security/StandardNames.java

to account for JellyBean differences.

Bug: 17750026
Change-Id: I7b60b1260fa0b275631ce9987168c7b5fc7ca138

* commit 'd6aa6177':
  Add additional field checks for deserialization.

* commit '008b2de6':
  Add additional field checks for deserialization.

Check that a field is not static when deserializing.

Contains some additional tests to confirm and document behavior
and prevent regressions for field deserialization.

(cherry picked from commit f4d72bcf)
Bug: 17202597

Change-Id: I72456a8b45ca0de1d3dd2b0f9515548b02e0a7be

am 009ec47d: am 7c761052: am 8114da7b: resolved conflicts for merge of 590e76dd to jb-mr1-dev-plus-aosp

* commit '009ec47d':
  DO NOT MERGE: Add a way to get all values of an attribute of DN.

* commit '7c761052':
  DO NOT MERGE: Add a way to get all values of an attribute of DN.

* commit '8114da7b':
  DO NOT MERGE: Add a way to get all values of an attribute of DN.

Change-Id: I50ce5fdaf05829b51e5353671226d1dd73d831e9

* commit '883946c5':
  DO NOT MERGE: Add a way to get all values of an attribute of DN.

* commit '4fec20ec':
  DO NOT MERGE: Add a way to get all values of an attribute of DN.

This is needed to switch Apache HTTP hostname verification from its
own Distinguished Name (DN) parsing code to this library's
DistinguishedNameParser.

Bug: 16510257

(cherry picked from commit 7bbe7cb0)

Change-Id: I4a20729dad557aebe0bd055736777e34b51167e8

am a99ec913: am be5fed6a: am 4d73cf3c: am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aosp

* commit 'a99ec913':
  Add additional checks in ObjectInputStream

am be5fed6a: am 4d73cf3c: am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aosp

* commit 'be5fed6a':
  Add additional checks in ObjectInputStream

am 4d73cf3c: am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aosp

* commit '4d73cf3c':
  Add additional checks in ObjectInputStream

am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aosp

* commit '81feaa00':
  Add additional checks in ObjectInputStream

* commit '889e1d5a':
  Add additional checks in ObjectInputStream

* commit '1fe89b7b':
  Add additional checks in ObjectInputStream