diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:17 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:17 -0700 |
| commit | e73530ddf96e4a82a245c5d96cef9a2606b6d110 (patch) | |
| tree | 0903c5b48ac1e3d0e6c0d3ead6e13debc55478a0 | |
| parent | ac1940f0b140951d36575ebc2162ff946a4c7303 (diff) | |
| parent | 2096fd133087ad9c1362572187d7e2a8932abf3a (diff) | |
| download | android_external_bouncycastle-e73530ddf96e4a82a245c5d96cef9a2606b6d110.tar.gz android_external_bouncycastle-e73530ddf96e4a82a245c5d96cef9a2606b6d110.tar.bz2 android_external_bouncycastle-e73530ddf96e4a82a245c5d96cef9a2606b6d110.zip | |
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
# gpg: Signature made Tue 06 Sep 2016 09:26:12 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/cms/GCMParameters.java | 15 |
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)); } |