diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-05 12:31:10 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-05 12:31:10 -0700 |
| commit | b757c435af720c497e10579d9596ec2f2b0929eb (patch) | |
| tree | 4bba5e6dcf3edc765d723426a73a387271cf78e8 | |
| parent | 00d6351f879cf3d883149dc2a182341bc2fdd0c1 (diff) | |
| parent | 8f469df8ec40730de2fb1cb2d2d9897af8fb9cc3 (diff) | |
| download | android_external_bouncycastle-b757c435af720c497e10579d9596ec2f2b0929eb.tar.gz android_external_bouncycastle-b757c435af720c497e10579d9596ec2f2b0929eb.tar.bz2 android_external_bouncycastle-b757c435af720c497e10579d9596ec2f2b0929eb.zip | |
Merge tag 'android-6.0.1_r24' into HEAD
Ticket: CYNGNOS-2213
Android 6.0.1 release 24
| -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)); } |