diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-23 20:38:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 20:38:55 +0000 |
| commit | 9ca2dfa49bd6ea3a9731d1349fe0191e018bf909 (patch) | |
| tree | f8ec72414c69f2d815fe2df8d127a0abf635c36a /bcprov/src/main/java | |
| parent | f7aa994e2694911d3a8efb5625b608cc23bae0b3 (diff) | |
| parent | 4d0e19131da68053fe1a73d43052bedadb107c70 (diff) | |
| download | bouncycastle-9ca2dfa49bd6ea3a9731d1349fe0191e018bf909.tar.gz | |
GCMParameters: fix insecure tag size
am: 4d0e19131d
* commit '4d0e19131da68053fe1a73d43052bedadb107c70':
GCMParameters: fix insecure tag size
Diffstat (limited to 'bcprov/src/main/java')
| -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)); } |