From 8d6cfdd6e6e99eaa39473d11fb40f797ca8b964d Mon Sep 17 00:00:00 2001 From: Adam Vartanian Date: Tue, 13 Feb 2018 13:37:49 +0000 Subject: [PATCH] Widen Conscrypt greylist. Conscrypt has historically provided a number of nonpublic APIs that provide functionality beyond that exposed on SSLSocket, and users have been expected to access those methods via reflection. We'll keep those on the greylist for now. Bug: 64382372 Test: make Change-Id: I4870fd044fa90fa2234627c1ee2b540f935dbda8 --- config/hiddenapi-light-greylist.txt | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index f3997a43ea05c..f9cb381c2a1f0 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -2403,11 +2403,45 @@ Lcom/android/okhttp/OkHttpClient;->dns:Lcom/android/okhttp/Dns; Lcom/android/okhttp/OkHttpClient;->setProtocols(Ljava/util/List;)Lcom/android/okhttp/OkHttpClient; Lcom/android/okhttp/okio/ByteString;->readObject(Ljava/io/ObjectInputStream;)V Lcom/android/okhttp/okio/ByteString;->writeObject(Ljava/io/ObjectOutputStream;)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getAlpnSelectedProtocol()[B +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocol()Ljava/lang/String; +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocols()[Ljava/lang/String; +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getChannelId()[B +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHandshakeApplicationProtocol()Ljava/lang/String; +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostname()Ljava/lang/String; +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostnameOrIP()Ljava/lang/String; +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getNpnSelectedProtocol()[B +Lcom/android/org/conscrypt/AbstractConscryptSocket;->getSoWriteTimeout()I +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setAlpnProtocols([Ljava/lang/String;)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setAlpnProtocols([B)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setApplicationProtocols([Ljava/lang/String;)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setChannelIdEnabled(Z)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setHandshakeTimeout(I)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setHostname(Ljava/lang/String;)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setNpnProtocols([B)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setSoWriteTimeout(I)V +Lcom/android/org/conscrypt/AbstractConscryptSocket;->setUseSessionTickets(Z)V +Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostname()Ljava/lang/String; +Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostnameOrIP()Ljava/lang/String; +Lcom/android/org/conscrypt/ConscryptSocketBase;->getSoWriteTimeout()I +Lcom/android/org/conscrypt/ConscryptSocketBase;->setHandshakeTimeout(I)V +Lcom/android/org/conscrypt/ConscryptSocketBase;->setHostname(Ljava/lang/String;)V +Lcom/android/org/conscrypt/ConscryptSocketBase;->setSoWriteTimeout(I)V Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostname()Ljava/lang/String; +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostnameOrIP()Ljava/lang/String; Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getNpnSelectedProtocol()[B +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getSoWriteTimeout()I +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([Ljava/lang/String;)V Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([B)V +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdEnabled(Z)V +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHandshakeTimeout(I)V Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHostname(Ljava/lang/String;)V Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setNpnProtocols([B)V +Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setSoWriteTimeout(I)V Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setUseSessionTickets(Z)V Lcom/android/org/conscrypt/TrustManagerImpl;->(Ljava/security/KeyStore;)V Ldalvik/system/BaseDexClassLoader;->getLdLibraryPath()Ljava/lang/String;