diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-23 21:45:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 21:45:21 +0000 |
| commit | 0b922e01ab200d5a40f56d1e645b1924e3f03fa0 (patch) | |
| tree | 1ca5fef459060c3881c1661c2f92a9fd5ac1226d | |
| parent | 6ed4776c09a8c5d0f57b8fc2a3d712e109166b77 (diff) | |
| parent | abff585398e17ca95561cb7e0612f865077d9c01 (diff) | |
| download | bouncycastle-0b922e01ab200d5a40f56d1e645b1924e3f03fa0.tar.gz | |
GCMParameters: fix insecure tag size am: 4d0e19131d am: 9ca2dfa49b am: bc2920a011
am: abff585398
* commit 'abff585398e17ca95561cb7e0612f865077d9c01':
GCMParameters: fix insecure tag size
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java index 0f03c879..7fcaa01b 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java @@ -16,7 +16,10 @@ import org.bouncycastle.util.Arrays; * <pre> GCMParameters ::= SEQUENCE { aes-nonce OCTET STRING, -- recommended size is 12 octets - aes-ICVlen AES-GCM-ICVlen DEFAULT 12 } + // BEGIN android-changed + // Was: aes-ICVlen AES-GCM-ICVlen DEFAULT 12 } + aes-ICVlen AES-GCM-ICVlen DEFAULT 16 } + // END android-changed * </pre> */ public class GCMParameters @@ -64,7 +67,10 @@ public class GCMParameters } else { - this.icvLen = 12; + // BEGIN android-changed + // Was: this.icvLen = 12; + this.icvLen = 16; + // END android-changed } } @@ -92,7 +98,10 @@ public class GCMParameters v.add(new DEROctetString(nonce)); - if (icvLen != 12) + // BEGIN android-changed + // Was: if (icvLen != 12) + if (icvLen != 16) + // END android-changed { v.add(new ASN1Integer(icvLen)); } |