OpenJDK / jdk / jdk
changeset 25971:e0831270085f
8043836: Need new tests for AES cipher
Summary: Add AES cipher tests with various modes, padding schemes and read methods of CipherInputStream for SunJCE provider
Reviewed-by: valeriep
Contributed-by: felix.yang@oracle.com
author | valeriep |
---|---|
date | Fri, 08 Aug 2014 17:47:50 +0000 |
parents | 70df4064ebfc |
children | dca4e4c83da4 541d3bb1825e 7585e2404b2a |
files | jdk/test/ProblemList.txt jdk/test/com/sun/crypto/provider/Cipher/AES/CICO.java jdk/test/com/sun/crypto/provider/Cipher/AES/CTR.java jdk/test/com/sun/crypto/provider/Cipher/AES/Padding.java jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java jdk/test/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java jdk/test/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java |
diffstat | 7 files changed, 894 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/ProblemList.txt Thu Aug 07 14:20:53 2014 -0700 +++ b/jdk/test/ProblemList.txt Fri Aug 08 17:47:50 2014 +0000 @@ -217,6 +217,9 @@ java/security/KeyPairGenerator/SolarisShortDSA.java solaris-all sun/security/tools/keytool/standard.sh solaris-all +# 8049312 +com/sun/crypto/provider/Cipher/AES/CICO.java generic-all + ############################################################################ # jdk_sound
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/CICO.java Fri Aug 08 17:47:50 2014 +0000 @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Random; +import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; + +/** + * @test + * @bug 8043836 + * @summary Test AES ciphers with different modes and padding schemes (ECB mode + * doesn't use IV). The test tries 3 different read methods of + * CipherInputStream. + */ +public class CICO { + private static final String ALGORITHM = "aEs"; + private static final String[] MODES = { "PCBC", "ECb", "cbC", "cFB", + "cFB24", "cFB32", "Cfb40", "CFB72", "OfB", "OfB20", "OfB48", + "OfB56", "OFB64", "OFB112", "CFB112", "pCbC" }; + private static final String[] PADDING = { "noPadding", "pkcs5padding" }; + private static final String PROVIDER = "SunJCE"; + private static final int NREADS = 3; + private static final int KEY_LENGTH = 128; + + private final byte[] plainText = new byte[1600000]; + + + public static void main(String argv[]) throws Exception { + CICO test = new CICO(); + for (String mode : MODES) { + for (String pad : PADDING) { + for (int m = 0; m < NREADS; m++) { + test.runTest(ALGORITHM, mode, pad, m); + } + } + } + } + + public void runTest(String algo, String mo, String pad, int whichRead) throws Exception { + Cipher ci1 = null; + Cipher ci2 = null; + byte[] iv = null; + AlgorithmParameterSpec aps = null; + SecretKey key = null; + + try { + // Do initialization + Random rdm = new Random(); + rdm.nextBytes(plainText); + KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER); + if (!kg.getAlgorithm().equals(algo)) { + throw new RuntimeException("Unexpected algorithm <" + + kg.getAlgorithm() + ">, expected value is <" + algo + + ">"); + } + + kg.init(KEY_LENGTH); + key = kg.generateKey(); + + ci1 = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER); + + if (mo.equalsIgnoreCase("ECB")) { + ci1.init(Cipher.ENCRYPT_MODE, key); + } else { + ci1.init(Cipher.ENCRYPT_MODE, key, aps); + } + + if (!mo.equalsIgnoreCase("ECB")) { + iv = ci1.getIV(); + aps = new IvParameterSpec(iv); + } else { + aps = null; + } + + ci2 = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER); + if (mo.equalsIgnoreCase("ECB")) { + ci2.init(Cipher.DECRYPT_MODE, key); + } else { + ci2.init(Cipher.DECRYPT_MODE, key, aps); + } + + ByteArrayInputStream baInput = new ByteArrayInputStream(plainText); + ByteArrayOutputStream baOutput = new ByteArrayOutputStream(); + try (CipherInputStream ciInput = new CipherInputStream(baInput, ci1); + CipherOutputStream ciOutput = new CipherOutputStream( + baOutput, ci2)) { + // According to specification, CipherInputStream does not support the + // mark and reset methods + if (ciInput.markSupported()) { + throw new RuntimeException( + "CipherInputStream unexpectedly supports the mark and reset methods"); + } + + // Read from the input and write to the output using 2 types + // of buffering : byte[] and int + switch (whichRead) { + case 0: + int buffer0 = ciInput.read(); + while (buffer0 != -1) { + ciOutput.write(buffer0); + buffer0 = ciInput.read(); + } + break; + case 1: + byte[] buffer1 = new byte[20]; + int len1 = ciInput.read(buffer1); + while (len1 != -1) { + ciOutput.write(buffer1, 0, len1); + len1 = ciInput.read(buffer1); + } + break; + case NREADS - 1: + byte[] buffer2 = new byte[ci1 + .getOutputSize(plainText.length)]; + int offset2 = 0; + int len2 = 0; + while (len2 != -1) { + len2 = ciInput.read(buffer2, offset2, buffer2.length + - offset2); + offset2 += len2; + } + ciOutput.write(buffer2, 0, buffer2.length); + break; + } + } + + // Get the output + byte[] recoveredText = new byte[baOutput.size()]; + recoveredText = baOutput.toByteArray(); + if (!java.util.Arrays.equals(plainText, recoveredText)) { + throw new RuntimeException( + "Original text is not equal with recovered text, with " + + algo + "/" + mo + "/" + pad + "/" + whichRead); + } + + // Compare input and output + + } catch (NoSuchAlgorithmException e) { + //OFB20 is for negative testing + if (!mo.equalsIgnoreCase("OFB20")) { + System.out.println("Unexpected NoSuchAlgorithmException with " + + algo + "/" + mo + "/" + pad + "/" + whichRead); + throw new RuntimeException("Test failed!"); + } + } catch (IOException | NoSuchProviderException | NoSuchPaddingException + | InvalidKeyException | InvalidAlgorithmParameterException e) { + System.out.println("Unexpected Exception with " + + algo + "/" + mo + "/" + pad + "/" + whichRead); + System.out.println("Test failed!"); + throw e; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/CTR.java Fri Aug 08 17:47:50 2014 +0000 @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Arrays; +import java.util.Random; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.IvParameterSpec; + + +/** + * @test + * @bug 8043836 + * @summary Test AES ciphers with 4 different modes with NoPadding. Check if + * data before encryption and after decryption is the same. + */ + +public class CTR { + + private static final String ALGORITHM = "AES"; + + private static final String PROVIDER = "SunJCE"; + + private static final String[] MODES = {"CTR","CFB24","OFB32","GCM"}; + + private static final String PADDING = "NoPadding"; + + + private static final int KEY_LENGTH = 128; + + public static void main(String argv[]) throws Exception { + CTR test = new CTR(); + for (String mode : MODES) { + test.runTest(ALGORITHM, mode, PADDING); + } + } + + + public void runTest(String algo, String mo, String pad) throws Exception { + Cipher ci = null; + byte[] iv = null; + AlgorithmParameterSpec aps = null; + SecretKey key = null; + + try { + Random rdm = new Random(); + byte[] plainText; + + ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER); + KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER); + kg.init(KEY_LENGTH); + key = kg.generateKey(); + + for (int i = 0; i < 15; i++) { + plainText = new byte[1600 + i + 1]; + rdm.nextBytes(plainText); + + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.ENCRYPT_MODE, key, aps); + } else { + ci.init(Cipher.ENCRYPT_MODE, key); + } + + byte[] cipherText = new byte[ci.getOutputSize(plainText.length)]; + int offset = ci.update(plainText, 0, plainText.length, + cipherText, 0); + + ci.doFinal(cipherText, offset); + + if (!mo.equalsIgnoreCase("ECB")) { + iv = ci.getIV(); + aps = new IvParameterSpec(iv); + } else { + aps = null; + } + + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.DECRYPT_MODE, key, aps); + } else { + ci.init(Cipher.DECRYPT_MODE, key, ci.getParameters()); + } + + byte[] recoveredText = new byte[ci.getOutputSize(cipherText.length)]; + int len = ci.doFinal(cipherText, 0, cipherText.length, + recoveredText); + byte[] tmp = new byte[len]; + + for (int j = 0; j < len; j++) { + tmp[j] = recoveredText[j]; + } + Arrays.toString(plainText); + if (!java.util.Arrays.equals(plainText, tmp)) { + System.out.println("Original: "); + dumpBytes(plainText); + System.out.println("Recovered: "); + dumpBytes(tmp); + throw new RuntimeException("Original text is not equal with recovered text, with mode:" + mo); + } + } + } catch (NoSuchAlgorithmException | NoSuchProviderException | NoSuchPaddingException + | InvalidKeyException | InvalidAlgorithmParameterException + | ShortBufferException | IllegalBlockSizeException + | BadPaddingException e) { + System.out.println("Test failed!"); + throw e; + } + } + + private void dumpBytes(byte[] bytes){ + for (byte b : bytes){ + System.out.print(Integer.toHexString(b)); + } + System.out.println(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/Padding.java Fri Aug 08 17:47:50 2014 +0000 @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Random; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.IvParameterSpec; + +/** + * @test + * @bug 8043836 + * @summary Test AES ciphers with different modes and padding schemes (ECB mode + * doesn't use IV). The test tries 3 different read methods of + * CipherInputStream. + */ +public class Padding { + + private static final String ALGORITHM = "AES"; + private static final String PROVIDER = "SunJCE"; + private static final String[] MODES = { "ECb", "CbC", "PCBC", "OFB", + "OFB150", "cFB", "CFB7", "cFB8", "cFB16", "cFB24", "cFB32", + "Cfb40", "cfB48", "cfB56", "cfB64", "cfB72", "cfB80", "cfB88", + "cfB96", "cfb104", "cfB112", "cfB120", "OFB8", "OFB16", "OFB24", + "OFB32", "OFB40", "OFB48", "OFB56", "OFB64", "OFB72", "OFB80", + "OFB88", "OFB96", "OFB104", "OFB112", "OFB120", "GCM" }; + private static final String PADDING = "PKCS5Padding"; + private static final int KEY_LENGTH = 128; + + public static void main(String argv[]) throws Exception { + Padding test = new Padding(); + for (String mode : MODES) { + test.runTest(ALGORITHM, mode, PADDING); + } + } + + public void runTest(String algo, String mo, String pad) throws Exception { + Cipher ci = null; + byte[] iv = null; + AlgorithmParameterSpec aps = null; + SecretKey key = null; + try { + Random rdm = new Random(); + byte[] plainText; + + ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER); + KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER); + kg.init(KEY_LENGTH); + key = kg.generateKey(); + + for (int i = 0; i < 15; i++) { + plainText = new byte[1600 + i + 1]; + rdm.nextBytes(plainText); + + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.ENCRYPT_MODE, key, aps); + } else { + ci.init(Cipher.ENCRYPT_MODE, key); + } + + byte[] cipherText = new byte[ci.getOutputSize(plainText.length)]; + int offset = ci.update(plainText, 0, plainText.length, + cipherText, 0); + ci.doFinal(cipherText, offset); + + if (!mo.equalsIgnoreCase("ECB")) { + iv = ci.getIV(); + aps = new IvParameterSpec(iv); + } else { + aps = null; + } + + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.DECRYPT_MODE, key, aps); + } else { + ci.init(Cipher.DECRYPT_MODE, key, ci.getParameters()); + } + + byte[] recoveredText = new byte[ci.getOutputSize(cipherText.length)]; + int len = ci.doFinal(cipherText, 0, cipherText.length, + recoveredText); + byte[] tmp = new byte[len]; + + for (int j = 0; j < len; j++) { + tmp[j] = recoveredText[j]; + } + + if (!java.util.Arrays.equals(plainText, tmp)) { + System.out.println("Original: "); + dumpBytes(plainText); + System.out.println("Recovered: "); + dumpBytes(tmp); + throw new RuntimeException( + "Original text is not equal with recovered text, with mode:" + + mo); + } + } + } catch (NoSuchAlgorithmException e) { + //CFB7 and OFB150 are for negative testing + if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("OFB150")) { + System.out + .println("Unexpected NoSuchAlgorithmException with mode: " + + mo); + throw new RuntimeException("Test failed!"); + } + } catch ( NoSuchProviderException | NoSuchPaddingException + | InvalidKeyException | InvalidAlgorithmParameterException + | ShortBufferException | IllegalBlockSizeException + | BadPaddingException e) { + System.out.println("Test failed!"); + throw e; + } + } + + private void dumpBytes(byte[] bytes) { + for (byte b : bytes) { + System.out.print(Integer.toHexString(b)); + } + + System.out.println(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCipher.java Fri Aug 08 17:47:50 2014 +0000 @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Random; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.IvParameterSpec; + +/** + * @test + * @bug 8043836 + * @summary Test AES ciphers with different modes and padding schemes (ECB mode + * doesn't use IV). + * @author Liwen Wang + * @author Parag Salvi + */ +public class TestAESCipher { + + private static final String ALGORITHM = "AES"; + private static final String PROVIDER = "SunJCE"; + private static final String[] MODES = { "ECb", "CbC", "CTR", "PCBC", "OFB", + "OFB150", "cFB", "CFB7", "cFB8", "cFB16", "cFB24", "cFB32", + "Cfb40", "cfB48", "cfB56", "cfB64", "cfB72", "cfB80", "cfB88", + "cfB96", "cfb104", "cfB112", "cfB120", "OFB8", "OFB16", "OFB24", + "OFB32", "OFB40", "OFB48", "OFB56", "OFB64", "OFB72", "OFB80", + "OFB88", "OFB96", "OFB104", "OFB112", "OFB120", "GCM" }; + private static final String[] PADDING = { "NoPadding", "PKCS5Padding" }; + private static final int KEY_LENGTH = 128; + + public static void main(String argv[]) throws Exception { + TestAESCipher test = new TestAESCipher(); + for (String mode : MODES) { + int padKinds = 1; + if (mode.equalsIgnoreCase("ECB") || mode.equalsIgnoreCase("PCBC") + || mode.equalsIgnoreCase("CBC")) { + padKinds = PADDING.length; + } + + for (int k = 0; k < padKinds; k++) { + test.runTest(ALGORITHM, mode, PADDING[k]); + } + } + } + + public void runTest(String algo, String mo, String pad) throws Exception { + Cipher ci = null; + byte[] iv = null; + AlgorithmParameterSpec aps = null; + SecretKey key = null; + try { + // Initialization + Random rdm = new Random(); + byte[] plainText = new byte[128]; + rdm.nextBytes(plainText); + + ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER); + KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER); + kg.init(KEY_LENGTH); + key = kg.generateKey(); + + // encrypt + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.ENCRYPT_MODE, key, aps); + } else { + ci.init(Cipher.ENCRYPT_MODE, key); + } + + byte[] cipherText = new byte[ci.getOutputSize(plainText.length)]; + int offset = ci.update(plainText, 0, plainText.length, cipherText, + 0); + ci.doFinal(cipherText, offset); + + if (!mo.equalsIgnoreCase("ECB")) { + iv = ci.getIV(); + aps = new IvParameterSpec(iv); + } else { + aps = null; + } + + if (!mo.equalsIgnoreCase("GCM")) { + ci.init(Cipher.DECRYPT_MODE, key, aps); + } else { + ci.init(Cipher.DECRYPT_MODE, key, ci.getParameters()); + } + + byte[] recoveredText = new byte[ci.getOutputSize(cipherText.length)]; + int len = ci.doFinal(cipherText, 0, cipherText.length, + recoveredText); + byte[] tmp = new byte[len]; + System.arraycopy(recoveredText, 0, tmp, 0, len); + + // Comparison + if (!java.util.Arrays.equals(plainText, tmp)) { + System.out.println("Original: "); + dumpBytes(plainText); + System.out.println("Recovered: "); + dumpBytes(tmp); + throw new RuntimeException( + "Original text is not equal with recovered text, with mode:" + + mo); + } + + } catch (NoSuchAlgorithmException e) { + //CFB7 and OFB150 are for negative testing + if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("OFB150")) { + System.out.println("Unexpected NoSuchAlgorithmException with mode: " + + mo); + throw new RuntimeException("Test failed!"); + } + } catch ( NoSuchProviderException | NoSuchPaddingException + | InvalidKeyException | InvalidAlgorithmParameterException + | ShortBufferException | IllegalBlockSizeException + | BadPaddingException e) { + System.out.println("Test failed!"); + throw e; + } + } + + private void dumpBytes(byte[] bytes) { + for (byte b : bytes) { + System.out.print(Integer.toHexString(b)); + } + + System.out.println(); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestNonexpanding.java Fri Aug 08 17:47:50 2014 +0000 @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.InvalidParameterSpecException; +import java.util.Random; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.GCMParameterSpec; + +/** + * @test + * @bug 8043836 + * @summary Test AES encryption with no padding. Expect the original data length + * is the same as the encrypted data. + */ +public class TestNonexpanding { + + private static final String ALGORITHM = "AES"; + private static final String PROVIDER = "SunJCE"; + private static final String[] MODES = { "ECb", "CbC", "OFB", "OFB150", + "cFB", "CFB7", "cFB8", "cFB16", "cFB24", "cFB32", "Cfb40", "cfB48", + "cfB56", "cfB64", "cfB72", "cfB80", "cfB88", "cfB96", "cfb104", + "cfB112", "cfB120", "GCM" }; + private static final String PADDING = "NoPadding"; + private static final int KEY_LENGTH = 128; + + public static void main(String argv[]) throws Exception { + TestNonexpanding test = new TestNonexpanding(); + for (String mode : MODES) { + test.runTest(ALGORITHM, mode, PADDING); + } + } + + public void runTest(String algo, String mo, String pad) throws Exception { + Cipher ci = null; + SecretKey key = null; + try { + // Initialization + Random rdm = new Random(); + byte[] plainText = new byte[128]; + rdm.nextBytes(plainText); + + ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER); + + KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER); + kg.init(KEY_LENGTH); + key = kg.generateKey(); + + // encrypt + ci.init(Cipher.ENCRYPT_MODE, key); + byte[] cipherText = new byte[ci.getOutputSize(plainText.length)]; + int offset = ci.update(plainText, 0, plainText.length, cipherText, + 0); + ci.doFinal(cipherText, offset); + + // Comparison + if (!(plainText.length == cipherText.length)) { + // The result of encryption in GCM is a combination of an + // authentication tag and cipher text. + if (mo.equalsIgnoreCase("GCM")) { + GCMParameterSpec spec = ci.getParameters().getParameterSpec(GCMParameterSpec.class); + int cipherTextLength = cipherText.length - spec.getTLen() + / 8; + if (plainText.length == cipherTextLength) { + return; + } + } + System.out.println("Original length: " + plainText.length); + System.out.println("Cipher text length: " + cipherText.length); + throw new RuntimeException("Test failed!"); + } + } catch (NoSuchAlgorithmException e) { + //CFB7 and OFB150 are for negative testing + if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("OFB150")) { + System.out.println("Unexpected NoSuchAlgorithmException with mode: " + + mo); + throw new RuntimeException("Test failed!"); + } + } catch ( NoSuchProviderException | NoSuchPaddingException + | InvalidKeyException | InvalidParameterSpecException + | ShortBufferException | IllegalBlockSizeException + | BadPaddingException e) { + System.out.println("Test failed!"); + throw e; + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestSameBuffer.java Fri Aug 08 17:47:50 2014 +0000 @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Random; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.IvParameterSpec; + +/** + * @test + * @bug 8043836 + * @summary Test AES ciphers with different modes and padding schemes (ECB mode + * doesn't use IV). The test tries 3 different read methods of + * CipherInputStream. + */ +public class TestSameBuffer { + + private static final String ALGORITHM = "Rijndael"; + private static final String PROVIDER = "SunJCE"; + private static final String[] MODES = { "ECb", "CbC", "OFB", "CFB150", + "cFB", "CFB7", " cFB8", "cFB16", "cFB24", "cFB32", "Cfb40", + "cfB48", " cfB56", "cfB64", "cfB72", "cfB80", "cfB88", "cfB96", + "cfb104", "cfB112", "cfB120" }; + private static final String PADDING = "NoPadding"; + private static final int KEY_LENGTH = 128; + + public static void main(String argv[]) throws Exception { + TestSameBuffer test = new TestSameBuffer(); + for (String mode : MODES) { + test.runTest(ALGORITHM, mode, PADDING); + } + } + + public void runTest(String algo, String mo, String pad) throws Exception { + Cipher ci = null; + byte[] iv = null; + AlgorithmParameterSpec aps = null; + SecretKey key = null; + try { + // Initialization + Random rdm = new Random(); + byte[] plainText = new byte[128]; + rdm.nextBytes(plainText); + + // keep the plain text + byte[] tmpText = new byte[plainText.length]; + for (int i = 0; i < plainText.length; i++) { + tmpText[i] = plainText[i]; + } + + ci = Cipher.getInstance(algo + "/" + mo + "/" + pad, PROVIDER); + + KeyGenerator kg = KeyGenerator.getInstance(algo, PROVIDER); + kg.init(KEY_LENGTH); + key = kg.generateKey(); + + // encrypt + ci.init(Cipher.ENCRYPT_MODE, key); + int offset = ci + .update(plainText, 0, plainText.length, plainText, 0); + ci.doFinal(plainText, offset); + + if (!mo.equalsIgnoreCase("ECB")) { + iv = ci.getIV(); + aps = new IvParameterSpec(iv); + } else { + aps = null; + } + + ci.init(Cipher.DECRYPT_MODE, key, aps); + byte[] recoveredText = new byte[ci.getOutputSize(plainText.length)]; + ci.doFinal(plainText, 0, plainText.length, recoveredText); + + // Comparison + if (!java.util.Arrays.equals(tmpText, recoveredText)) { + System.out.println("Original: "); + dumpBytes(plainText); + System.out.println("Recovered: "); + dumpBytes(recoveredText); + throw new RuntimeException( + "Original text is not equal with recovered text, with mode:" + + mo); + } + + } catch (NoSuchAlgorithmException e) { + //CFB7 and CFB150 are for negative testing + if (!mo.equalsIgnoreCase("CFB7") && !mo.equalsIgnoreCase("CFB150")) { + System.out.println("Unexpected NoSuchAlgorithmException with mode: " + + mo); + throw new RuntimeException("Test failed!"); + } + } catch (NoSuchProviderException | NoSuchPaddingException + | InvalidKeyException | InvalidAlgorithmParameterException + | ShortBufferException | IllegalBlockSizeException + | BadPaddingException e) { + System.out.println("Test failed!"); + throw e; + } + } + + private void dumpBytes(byte[] bytes) { + for (byte b : bytes) { + System.out.print(Integer.toHexString(b)); + } + + System.out.println(); + } +}