diff options
| author | Kenny Root <kroot@google.com> | 2013-12-13 15:56:53 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-12-13 15:58:23 -0800 |
| commit | b6f0864d4715861be258f5e61d8959bf4bcf0e8c (patch) | |
| tree | 6fed9d2e240f9766b9a669867aacceddfb4bb5f0 /bcprov | |
| parent | 647411244c1d77a71a67372528828ef2e26ff3c3 (diff) | |
| download | android_external_bouncycastle-b6f0864d4715861be258f5e61d8959bf4bcf0e8c.tar.gz android_external_bouncycastle-b6f0864d4715861be258f5e61d8959bf4bcf0e8c.tar.bz2 android_external_bouncycastle-b6f0864d4715861be258f5e61d8959bf4bcf0e8c.zip | |
Add support for Cipher#getIV with GCM
Change-Id: I80cb9e09d75fdb690721c07f54701e6d043cf7b1
Diffstat (limited to 'bcprov')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 90d98b2..5b85ef5 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 @@ -178,6 +178,11 @@ public class BaseBlockCipher protected byte[] engineGetIV() { + // BEGIN android-added + if (aeadParams != null) { + return aeadParams.getNonce(); + } + // END android-added return (ivParam != null) ? ivParam.getIV() : null; } |