diff options
| author | Sergio Giro <sgiro@google.com> | 2016-07-19 18:32:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-19 18:32:35 +0000 |
| commit | 7148f9f8911dc86d847a09b765e8593b53c48b6d (patch) | |
| tree | 0903c5b48ac1e3d0e6c0d3ead6e13debc55478a0 | |
| parent | abff585398e17ca95561cb7e0612f865077d9c01 (diff) | |
| parent | 15f85eeba951286927342ba518dfe3f8e6cba818 (diff) | |
| download | bouncycastle-7148f9f8911dc86d847a09b765e8593b53c48b6d.tar.gz | |
GCMParameters: in ASN1 encoding, use 12 when no value is specified am: 48c093f131 am: b529b45d02 am: 11297dc70a
am: 15f85eeba9
Change-Id: I8106c27afc25af631db4bb0464f5c8376f1318a4
| -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)); } |