moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 11:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fallback to IvParameterSpec if GCMParameterSpec is not available"

Browse Source 
This reverts commit 8324c2c772a191a726e2027b1487d872897bf184.
This commit is contained in:
Cameron Gutman 2016-04-21 13:28:31 -04:00
parent 248a135f86
commit 1a58b228a0
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moonlight-common/src/com/limelight/nvstream/input/ControllerStream.java
View File

@ -383,23 +383,6 @@ public class ControllerStream {
private static class AesGcmCipher implements InputCipher {
private SecretKey key;
private byte[] iv;
private static boolean useGcmParameterSpec;
static {
try {
// GCMParameterSpec is a class specifically for initialize GCM ciphers. On some versions of
// Oracle's JVM, GCMParameterSpec is required to successfully initialize a GCM cipher,
// while other versions also support IvParameterSpec being used in GCM mode.
// On Android, GCMParameterSpec wasn't added until API 19, so we'll need to use IvParameterSpec
// on those versions. Android doesn't seem to care between IvParameterSpec and GCMParameterSpec on
// any version. To cover all of these cases, we'll use GCMParameterSpec if it's available in the
// class path, otherwise use IvParameterSpec.
Class.forName("javax.crypto.spec.GCMParameterSpec");
useGcmParameterSpec = true;
} catch (ClassNotFoundException e) {
useGcmParameterSpec = false;
}
}
public int getEncryptedSize(int plaintextSize) {
// GCM uses no padding + 16 bytes tag for message authentication
@ -420,8 +403,7 @@ public class ControllerStream {
Cipher cipher;
try {
cipher = Cipher.getInstance("AES/GCM/NoPadding");
cipher.init(Cipher.ENCRYPT_MODE, key, useGcmParameterSpec ?
new GCMParameterSpec(128, iv) : new IvParameterSpec(iv));
cipher.init(Cipher.ENCRYPT_MODE, key, new GCMParameterSpec(128, iv));
// This is also non-ideal. Java gives us <ciphertext><tag> but we want to send <tag><ciphertext>
// so we'll take the output and arraycopy it into the right spot in the output buffer