| commit | c8aa82daad8c213545fe32ec1c3164446dfaec31 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Fri Mar 20 23:09:09 2020 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Mar 20 23:09:09 2020 +0000 |
| tree | 16b30287d1aae0c26e4e761a023136f1ee8fb2ff | |
| parent | 7f368592677d262880b2016bddc3ce29f9c459cf [diff] | |
| parent | 14ceec126e49f2f4748f0d540be820515cc725a6 [diff] |
Snap for 6317653 from 14ceec126e49f2f4748f0d540be820515cc725a6 to qt-qpr3-release Change-Id: Ie660853e1f3926fc0215c66c3436d38efaf9f87d
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java index db2f66c..d3d04db 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
@@ -454,7 +454,8 @@ } */ // END Android-removed: Unsupported modes - else if (modeName.startsWith("GCM")) + // Android-changed: Use equals instead of startsWith to not catch GCM-SIV + else if (modeName.equalsIgnoreCase("GCM")) { ivLength = baseEngine.getBlockSize(); // BEGIN Android-removed: Unsupported algorithms
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java index 5c29fae..1351477 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
@@ -458,7 +458,8 @@ } */ // END Android-removed: Unsupported modes - else if (modeName.startsWith("GCM")) + // Android-changed: Use equals instead of startsWith to not catch GCM-SIV + else if (modeName.equalsIgnoreCase("GCM")) { ivLength = baseEngine.getBlockSize(); // BEGIN Android-removed: Unsupported algorithms