| commit | a29f79ff61bfd1bf34a69557f7ded940efd6acdf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jul 31 13:28:48 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jul 31 13:28:48 2019 +0000 |
| tree | 67b4dac0e18d97192218cc035e159f602b9a5933 | |
| parent | 584f3b23aa2adc076c3151ff94957d3e71d1724f [diff] | |
| parent | a39e15c4ac3e023172e41c8162996a8e564d6486 [diff] |
Merge "Fix srcgen problems in BC"
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