zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds flag to enable AES_GCM from the Java API.

Browse Source 
This changeset allows Java API users to enable or disable AES_GCM from the
PeerConnectionFactory.

Bug: chromium:713701
Change-Id: I8798e4eeb6907f8e16a646bfb8a20db510f960c8
Reviewed-on: https://webrtc-review.googlesource.com/89260
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24030}
This commit is contained in:
Benjamin Wright
2018-07-18 10:47:02 -07:00
committed by Commit Bot
parent 92f9c2a087
commit 702f4da4b9
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/android/api/org/webrtc/PeerConnectionFactory.java
View File

@ -134,6 +134,7 @@ public class PeerConnectionFactory {
public boolean disableEncryption; public boolean disableEncryption;
public boolean disableNetworkMonitor; public boolean disableNetworkMonitor;
public boolean enableAes128Sha1_32CryptoCipher; public boolean enableAes128Sha1_32CryptoCipher;
public boolean enableGcmCryptoSuites;
@CalledByNative("Options") @CalledByNative("Options")
int getNetworkIgnoreMask() { int getNetworkIgnoreMask() {
@ -154,6 +155,11 @@ public class PeerConnectionFactory {
boolean getEnableAes128Sha1_32CryptoCipher() { boolean getEnableAes128Sha1_32CryptoCipher() {
return enableAes128Sha1_32CryptoCipher; return enableAes128Sha1_32CryptoCipher;
} }
@CalledByNative("Options")
boolean getEnableGcmCryptoSuites() {
return enableGcmCryptoSuites;
}
} }
public static class Builder { public static class Builder {

4
sdk/android/src/jni/pc/peerconnectionfactory.cc
View File

@ -54,6 +54,8 @@ JavaToNativePeerConnectionFactoryOptions(JNIEnv* jni,
Java_Options_getDisableNetworkMonitor(jni, options); Java_Options_getDisableNetworkMonitor(jni, options);
bool enable_aes128_sha1_32_crypto_cipher = bool enable_aes128_sha1_32_crypto_cipher =
Java_Options_getEnableAes128Sha1_32CryptoCipher(jni, options); Java_Options_getEnableAes128Sha1_32CryptoCipher(jni, options);
bool enable_gcm_crypto_suites =
Java_Options_getEnableGcmCryptoSuites(jni, options);
PeerConnectionFactoryInterface::Options native_options; PeerConnectionFactoryInterface::Options native_options;
@ -65,6 +67,8 @@ JavaToNativePeerConnectionFactoryOptions(JNIEnv* jni,
native_options.crypto_options.enable_aes128_sha1_32_crypto_cipher = native_options.crypto_options.enable_aes128_sha1_32_crypto_cipher =
enable_aes128_sha1_32_crypto_cipher; enable_aes128_sha1_32_crypto_cipher;
native_options.crypto_options.enable_gcm_crypto_suites =
enable_gcm_crypto_suites;
return native_options; return native_options;
} }
} // namespace } // namespace