diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-23 12:15:15 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-02-26 16:55:48 -0800 |
| commit | 6183c7536df5c6b7f31812cb89ba8f6b9c43a3e2 (patch) | |
| tree | 4bba5e6dcf3edc765d723426a73a387271cf78e8 | |
| parent | 434e2549fba11aac00ec4deb19fa8c9ade2b6f4b (diff) | |
| download | android_external_bouncycastle-6183c7536df5c6b7f31812cb89ba8f6b9c43a3e2.tar.gz android_external_bouncycastle-6183c7536df5c6b7f31812cb89ba8f6b9c43a3e2.tar.bz2 android_external_bouncycastle-6183c7536df5c6b7f31812cb89ba8f6b9c43a3e2.zip | |
GCMParameters: fix insecure tag size
Note: port of cr/110497945
Bug: 26231099
Bug: 26234568
Change-Id: I3eef233b15ded9553c3cdfd1c51ffef306276f7d
| -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 0f03c87..7fcaa01 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)); } |