Skip to content

Export from Google3 #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
miguelaranda0 wants to merge 1 commit into from
Closed

Export from Google3 #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions android/proguard-rules.pro
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application/>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.conscrypt">

<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30" />

</manifest>
34 changes: 0 additions & 34 deletions android/src/main/java/org/conscrypt/NativeCryptoJni.java
View file
Open in desktop

This file was deleted.

29 changes: 11 additions & 18 deletions android/src/main/java/org/conscrypt/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,8 @@
import android.os.SystemClock;
import android.system.Os;
import android.util.Log;

import dalvik.system.BlockGuard;
import dalvik.system.CloseGuard;

import org.conscrypt.NativeCrypto;
import org.conscrypt.ct.CertificateTransparency;
import org.conscrypt.metrics.CertificateTransparencyVerificationReason;
import org.conscrypt.metrics.NoopStatsLog;
import org.conscrypt.metrics.Source;
import org.conscrypt.metrics.StatsLog;
import org.conscrypt.metrics.StatsLogImpl;

import java.io.FileDescriptor;
import java.io.IOException;
import java.lang.reflect.Constructor;
Expand All @@ -50,7 +40,6 @@
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.Security;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
Expand All @@ -61,7 +50,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;

import javax.net.ssl.SNIHostName;
import javax.net.ssl.SNIMatcher;
import javax.net.ssl.SNIServerName;
Expand All @@ -71,11 +59,16 @@
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.StandardConstants;
import javax.net.ssl.X509TrustManager;
import org.conscrypt.ct.CertificateTransparency;
import org.conscrypt.metrics.CertificateTransparencyVerificationReason;
import org.conscrypt.metrics.NoopStatsLog;
import org.conscrypt.metrics.Source;
import org.conscrypt.metrics.StatsLog;
import org.conscrypt.metrics.StatsLogImpl;

/**
* Platform-specific methods for unbundled Android.
*/
/** Platform-specific methods for unbundled Android. */
@Internal
@SuppressLint("DiscouragedPrivateApi")
final public class Platform {
private static final String TAG = "Conscrypt";
private static boolean DEPRECATED_TLS_V1 = true;
Expand Down Expand Up @@ -332,8 +325,7 @@ private static void getSSLParametersFromImpl(SSLParameters params, SSLParameters
m_setUseCipherSuitesOrder.invoke(params, impl.getUseCipherSuitesOrder());

try {
Method setNamedGroupsMethod =
params.getClass().getMethod("setNamedGroups", String[].class);
Method setNamedGroupsMethod = params.getClass().getMethod("setNamedGroups", String[].class);
setNamedGroupsMethod.invoke(params, (Object) impl.getNamedGroups());
} catch (NoSuchMethodException | IllegalArgumentException e) {
// Do nothing.
Expand Down Expand Up @@ -787,7 +779,8 @@ public static SSLSession wrapSSLSession(ExternalSession sslSession) {
return sslSession;
}

public static String getOriginalHostNameFromInetAddress(InetAddress addr) {
@SuppressWarnings("SoonBlockedPrivateApi")
public static String getOriginalHostNameFromInetAddress(InetAddress addr) {
if (Build.VERSION.SDK_INT > 27) {
try {
Method getHolder = InetAddress.class.getDeclaredMethod("holder");
Expand Down
Loading
Loading