From ec2dc9daf073fd69746b7005afc1d62bfb59ac1f Mon Sep 17 00:00:00 2001
From: Sergio Giro <sgiro@google.com>
Date: Tue, 19 Jul 2016 13:19:53 +0100
Subject: GCMParameters: in ASN1 encoding, use 12 when no value is specified

This reverts commit 4d0e19131da68053fe1a73d43052bedadb107c70

CYNGNOS-3235
Bug: 26231099
Bug: 26234568
Bug: 29876633
Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f
(cherry picked from commit 48c093f131532fc163625304c60d0a8d07689327)
---
 .../java/org/bouncycastle/asn1/cms/GCMParameters.java     | 15 +++------------
 1 file 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));
         }
-- 
cgit v1.2.3