diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-23 20:59:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-23 20:59:26 +0000 |
| commit | abff585398e17ca95561cb7e0612f865077d9c01 (patch) | |
| tree | 4bba5e6dcf3edc765d723426a73a387271cf78e8 | |
| parent | 1af9aad12fedf1d93333e19f5ed0ab86f1cc4e2a (diff) | |
| parent | bc2920a01178e113adae55c9c49883395a554448 (diff) | |
| download | bouncycastle-abff585398e17ca95561cb7e0612f865077d9c01.tar.gz | |
GCMParameters: fix insecure tag size am: 4d0e19131d am: 9ca2dfa49b
am: bc2920a011
* commit 'bc2920a01178e113adae55c9c49883395a554448':
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)); } |