diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-04 17:47:17 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-04 17:47:17 -0700 |
| commit | dca9c936aea6f61f9b9529f27ee2d01434d40f46 (patch) | |
| tree | f8ec72414c69f2d815fe2df8d127a0abf635c36a | |
| parent | fb07459868e0b08cfa50caa1444e7a47e1b610a2 (diff) | |
| parent | b3bddea0f33c0459293c6419569ad151b4a7b44b (diff) | |
| download | android_external_bouncycastle-dca9c936aea6f61f9b9529f27ee2d01434d40f46.tar.gz android_external_bouncycastle-dca9c936aea6f61f9b9529f27ee2d01434d40f46.tar.bz2 android_external_bouncycastle-dca9c936aea6f61f9b9529f27ee2d01434d40f46.zip | |
Merge tag 'android-5.1.1_r37' into HEAD
Ticket: CYNGNOS-2213
Android 5.1.1 release 37
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java | 15 |
1 files changed, 12 insertions, 3 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 0f03c87..7fcaa01 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java @@ -16,7 +16,10 @@ import org.bouncycastle.util.Arrays; * <pre> GCMParameters ::= SEQUENCE { aes-nonce OCTET STRING, -- recommended size is 12 octets - aes-ICVlen AES-GCM-ICVlen DEFAULT 12 } + // BEGIN android-changed + // Was: aes-ICVlen AES-GCM-ICVlen DEFAULT 12 } + aes-ICVlen AES-GCM-ICVlen DEFAULT 16 } + // END android-changed * </pre> */ public class GCMParameters @@ -64,7 +67,10 @@ public class GCMParameters } else { - this.icvLen = 12; + // BEGIN android-changed + // Was: this.icvLen = 12; + this.icvLen = 16; + // END android-changed } } @@ -92,7 +98,10 @@ public class GCMParameters v.add(new DEROctetString(nonce)); - if (icvLen != 12) + // BEGIN android-changed + // Was: if (icvLen != 12) + if (icvLen != 16) + // END android-changed { v.add(new ASN1Integer(icvLen)); } |