commit 259caa302fff216882b4fa6155af1cb6de7f31cc
author gitbuildkicker <android-build@google.com> Fri Dec 02 18:05:50 2016 -0800
committer gitbuildkicker <android-build@google.com> Fri Dec 02 18:05:50 2016 -0800
tree dfa565140f3fa2305e66515633cca91210d3b545
parent dd64614fe4e5ad189f5a54a7ec2421edb4d56af1
parent 27f271daade3b55a80ff0389c535371208472c7c

merge in nougat-cts-release history after reset to nougat-cts-dev

bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java

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 @@
  * <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 @@
         }
         else
         {
-            // BEGIN android-changed
-            // Was: this.icvLen = 12;
-            this.icvLen = 16;
-            // END android-changed
+            this.icvLen = 12;
         }
     }
 
@@ -98,10 +92,7 @@
 
         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));
         }