Skip to content

Export from Google3 #1462

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 #1462

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.

14 changes: 5 additions & 9 deletions ...n/java/org/conscrypt/NativeCryptoJni.java → ...java/org/conscrypt/ConscryptStatsLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015 The Android Open Source Project
* Copyright 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,14 +17,10 @@
package org.conscrypt;

/**
* Helper to initialize the JNI libraries. This version runs when compiled
* as part of the platform.
* Stub class for logging statistics events.
*/
class NativeCryptoJni {
public static void init() {
System.loadLibrary("javacrypto");
}
public class ConscryptStatsLog {
public static final int TLS_HANDSHAKE_REPORTED = 0;

private NativeCryptoJni() {
}
public static void write(int code, boolean arg1, int arg2, int arg3, int arg4) {}
}
34 changes: 0 additions & 34 deletions android/src/main/java/org/conscrypt/NativeCryptoJni.java
View file
Open in desktop

This file was deleted.

16 changes: 12 additions & 4 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 @@ -255,8 +255,12 @@ private static void setSSLParametersOnImpl(SSLParameters params, SSLParametersIm
Method m_getUseCipherSuitesOrder = params.getClass().getMethod("getUseCipherSuitesOrder");
impl.setUseCipherSuitesOrder((boolean) m_getUseCipherSuitesOrder.invoke(params));

Method getNamedGroupsMethod = params.getClass().getMethod("getNamedGroups");
impl.setNamedGroups((String[]) getNamedGroupsMethod.invoke(params));
try {
Method getNamedGroupsMethod = params.getClass().getMethod("getNamedGroups");
impl.setNamedGroups((String[]) getNamedGroupsMethod.invoke(params));
} catch (NoSuchMethodException | IllegalArgumentException e) {
// Do nothing.
}
}

public static void setSSLParameters(
Expand Down Expand Up @@ -327,8 +331,12 @@ private static void getSSLParametersFromImpl(SSLParameters params, SSLParameters
params.getClass().getMethod("setUseCipherSuitesOrder", boolean.class);
m_setUseCipherSuitesOrder.invoke(params, impl.getUseCipherSuitesOrder());

Method setNamedGroupsMethod = params.getClass().getMethod("setNamedGroups", String[].class);
setNamedGroupsMethod.invoke(params, (Object[]) impl.getNamedGroups());
try {
Method setNamedGroupsMethod = params.getClass().getMethod("setNamedGroups", String[].class);
setNamedGroupsMethod.invoke(params, (Object) impl.getNamedGroups());
} catch (NoSuchMethodException | IllegalArgumentException e) {
// Do nothing.
}
}

public static void getSSLParameters(
Expand Down
Loading
Loading