diff options
| author | Sergio Giro <sgiro@google.com> | 2016-07-19 13:19:53 +0100 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 17:26:36 -0700 |
| commit | a019c010b3f049e8e4602d2a4e28b9c8c690857d (patch) | |
| tree | 0903c5b48ac1e3d0e6c0d3ead6e13debc55478a0 | |
| parent | 70363d36e37c9b57efc126f18e7d45dc8e6c1c64 (diff) | |
| download | android_external_bouncycastle-stable/cm-13.0-ZNH2K.tar.gz android_external_bouncycastle-stable/cm-13.0-ZNH2K.tar.bz2 android_external_bouncycastle-stable/cm-13.0-ZNH2K.zip | |
GCMParameters: in ASN1 encoding, use 12 when no value is specifiedstable/cm-13.0-ZNH2K
This reverts commit 4d0e19131da68053fe1a73d43052bedadb107c70
CYNGNOS-3235
Bug: 26231099
Bug: 26234568
Bug: 29876633
Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f
(cherry picked from commit 48c093f131532fc163625304c60d0a8d07689327)
| -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 7fcaa01..0f03c87 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)); } |