diff options
| author | Kenny Root <kroot@google.com> | 2015-05-11 17:19:13 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-05-13 10:47:02 -0700 |
| commit | eaa486a9a2ef620ba3c4d45e373709b31f354a09 (patch) | |
| tree | a421a69d2d5f4f2815691c2b8d6c88d0f4e7d77f /bcprov | |
| parent | 5807a4a5f96af3fca8def98793f25fcdad00c6cf (diff) | |
| download | android_external_bouncycastle-eaa486a9a2ef620ba3c4d45e373709b31f354a09.tar.gz android_external_bouncycastle-eaa486a9a2ef620ba3c4d45e373709b31f354a09.tar.bz2 android_external_bouncycastle-eaa486a9a2ef620ba3c4d45e373709b31f354a09.zip | |
Change default GCM name to AES/GCM/NOPADDING
This matches the RI and doesn't get late binding confused when you call
Cipher.getInstance
(cherry picked from commit 4046cd0249e7ffa820dcd4318f4e81f737d8634c)
Bug: 21085702
Change-Id: I8f69e7b342fde4881f20e103240f0b289322ef4e
Diffstat (limited to 'bcprov')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java index 00b80aa..3ac173b 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java @@ -736,10 +736,12 @@ public final class AES // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes256_GCM, "GCM"); // END android-removed - provider.addAlgorithm("Cipher.GCM", PREFIX + "$GCM"); - provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes128_GCM, "GCM"); - provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes192_GCM, "GCM"); - provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes256_GCM, "GCM"); + // BEGIN android-changed + provider.addAlgorithm("Cipher.AES/GCM/NOPADDING", PREFIX + "$GCM"); + provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes128_GCM, "AES/GCM/NOPADDING"); + provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes192_GCM, "AES/GCM/NOPADDING"); + provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes256_GCM, "AES/GCM/NOPADDING"); + // END android-changed provider.addAlgorithm("KeyGenerator.AES", PREFIX + "$KeyGen"); // BEGIN android-removed |