diff options
| author | Sergio Giro <sgiro@google.com> | 2016-07-19 13:19:53 +0100 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2016-09-09 17:32:22 +0100 |
| commit | 7b6632c1f661075fa6eb86934f251453bd974f29 (patch) | |
| tree | 0e44a79ae6e987460078d3b35a4b74cd0b0504f2 /bcprov | |
| parent | 54416dd637f5fb07da71651f0546ad45c6285e88 (diff) | |
| download | bouncycastle-7b6632c1f661075fa6eb86934f251453bd974f29.tar.gz | |
GCMParameters: in ASN1 encoding, use 12 when no value is specified
This reverts commit 4d0e19131da68053fe1a73d43052bedadb107c70
(cherry picked from commit 48c093f131532fc163625304c60d0a8d07689327)
Bug: 26231099
Bug: 26234568
Bug: 29876633
Change-Id: I7d194de82506cf3da4dbb0b2cc67b72f3623abe7
Diffstat (limited to 'bcprov')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java | 15 |
1 files changed, 3 insertions, 12 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 7fcaa01b..0f03c879 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java @@ -16,10 +16,7 @@ import org.bouncycastle.util.Arrays; * <pre> GCMParameters ::= SEQUENCE { aes-nonce OCTET STRING, -- recommended size is 12 octets - // BEGIN android-changed - // Was: aes-ICVlen AES-GCM-ICVlen DEFAULT 12 } - aes-ICVlen AES-GCM-ICVlen DEFAULT 16 } - // END android-changed + aes-ICVlen AES-GCM-ICVlen DEFAULT 12 } * </pre> */ public class GCMParameters @@ -67,10 +64,7 @@ public class GCMParameters } else { - // BEGIN android-changed - // Was: this.icvLen = 12; - this.icvLen = 16; - // END android-changed + this.icvLen = 12; } } @@ -98,10 +92,7 @@ public class GCMParameters v.add(new DEROctetString(nonce)); - // BEGIN android-changed - // Was: if (icvLen != 12) - if (icvLen != 16) - // END android-changed + if (icvLen != 12) { v.add(new ASN1Integer(icvLen)); } |