GCMParameters: in ASN1 encoding, use 12 when no value is specified am: 48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 am: 7148f9f891 am: 485552e5d2 am: c47471be71 am: dc814878da
am: dd64614fe4
Change-Id: I8e8d6d9386965e120341c9053974c26de2f4a768
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));
}