From c95c72ec796254f98e12d108d6f6d0e06d01bcd3 Mon Sep 17 00:00:00 2001 From: Sergio Giro Date: Tue, 19 Jul 2016 14:40:40 +0100 Subject: CipherTest: in ASN1 encoding for GCM, no value for tag size means 12 Bug: 26231099 Bug: 26234568 Bug: 29876633 Change-Id: I44c0c68f1e92caf6547c9e3b494ec5b82b8cff5f --- luni/src/test/java/libcore/javax/crypto/CipherTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/luni/src/test/java/libcore/javax/crypto/CipherTest.java b/luni/src/test/java/libcore/javax/crypto/CipherTest.java index 0f642cf..398c688 100644 --- a/luni/src/test/java/libcore/javax/crypto/CipherTest.java +++ b/luni/src/test/java/libcore/javax/crypto/CipherTest.java @@ -3203,6 +3203,9 @@ public final class CipherTest extends TestCase { } } + // Test that when reading GCM parameters encoded using ASN1, a value for the tag size + // not present indicates a value of 12. + // https://b/29876633 public void test_DefaultGCMTagSizeAlgorithmParameterSpec() throws Exception { final String AES = "AES"; final String AES_GCM = "AES/GCM/NoPadding"; @@ -3215,14 +3218,12 @@ public final class CipherTest extends TestCase { (byte) 14, // DER encoding : total length (byte) 4, // DER encoding : tag_OctetString (byte) 12, // DER encoding : counter length - // Note that IV's size 12 bytes is recommended, but authentication tag size should be 16 - // bytes. (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0 }); cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, AES), param); byte[] ciphertext = cipher.update(input); byte[] tag = cipher.doFinal(); - assertEquals(16, tag.length); + assertEquals(12, tag.length); } public void testAES_ECB_PKCS5Padding_ShortBuffer_Failure() throws Exception { -- cgit v1.1