diff options
author | Kenny Root <kroot@google.com> | 2015-07-23 19:10:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:10:15 +0000 |
commit | ad7eaff2effc56306ad2d07a282e60ddd5571b9f (patch) | |
tree | cec9ffa6dc46293b1436fe5238940ded49aa48d6 /bcprov | |
parent | c90b3bc35e68f8ac2bba647b0b9c876bfacc874a (diff) | |
parent | ab6fbde31a14919f5e0ff8792ace53be30230a15 (diff) | |
download | bouncycastle-ad7eaff2effc56306ad2d07a282e60ddd5571b9f.tar.gz |
am ab6fbde3: Merge "GCM: fix mode and padding set"
* commit 'ab6fbde31a14919f5e0ff8792ace53be30230a15':
GCM: fix mode and padding set
Diffstat (limited to 'bcprov')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java | 15 |
1 files changed, 15 insertions, 0 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 3ac173ba..d476df8f 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 @@ -3,6 +3,9 @@ package org.bouncycastle.jcajce.provider.symmetric; import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Method; +// BEGIN android-added +import java.security.NoSuchAlgorithmException; +// END android-added // BEGIN android-removed // import java.security.AlgorithmParameters; // import java.security.InvalidAlgorithmParameterException; @@ -15,6 +18,9 @@ import java.security.spec.InvalidParameterSpecException; // import javax.crypto.spec.IvParameterSpec; // END android-removed +// BEGIN android-added +import javax.crypto.NoSuchPaddingException; +// END android-added import org.bouncycastle.asn1.bc.BCObjectIdentifiers; // BEGIN android-removed // import org.bouncycastle.asn1.cms.CCMParameters; @@ -112,6 +118,15 @@ public final class AES public GCM() { super(new GCMBlockCipher(new AESFastEngine())); + // BEGIN android-added + try { + engineSetMode("GCM"); + engineSetPadding("NoPadding"); + } catch (NoSuchAlgorithmException | NoSuchPaddingException e) { + // this should not be possible + throw new RuntimeException("Could not set mode or padding for GCM mode", e); + } + // END android-added } } |