summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Giro <sgiro@google.com>2016-07-19 13:19:53 +0100
committerJessica Wagantall <jwagantall@cyngn.com>2016-09-12 15:23:39 -0700
commitec2dc9daf073fd69746b7005afc1d62bfb59ac1f (patch)
treeee14d9625f03f7a9042cbd4e9e76e47d336cc223
parentdca9c936aea6f61f9b9529f27ee2d01434d40f46 (diff)
downloadandroid_external_bouncycastle-stable/cm-12.1-YOG7D.tar.gz
android_external_bouncycastle-stable/cm-12.1-YOG7D.tar.bz2
android_external_bouncycastle-stable/cm-12.1-YOG7D.zip
GCMParameters: in ASN1 encoding, use 12 when no value is specifiedstable/cm-12.1-YOG7D
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.java15
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));
}