--- old/test/jdk/com/oracle/security/ucrypto/TestCICOWithGCMAndAAD.java	2020-05-20 18:12:40.444674482 -0700
+++ /dev/null	2020-03-09 18:57:19.455001459 -0700
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-
-/*
- * @test
- * @bug 8014374
- * @summary Test CipherInputStream/OutputStream func w/ GCM mode and AAD.
- * @author Valerie Peng
- * @key randomness
- */
-
-import java.io.*;
-import java.security.*;
-import java.util.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
-
-public class TestCICOWithGCMAndAAD extends UcryptoTest {
-    public static void main(String[] args) throws Exception {
-        main(new TestCICOWithGCMAndAAD(), null);
-    }
-
-    public void doTest(Provider p) throws Exception {
-        // check if GCM support exists
-        try {
-            Cipher.getInstance("AES/GCM/NoPadding", p);
-        } catch (NoSuchAlgorithmException nsae) {
-            System.out.println("Skipping Test due to no GCM support");
-            return;
-        }
-
-        Random rdm = new Random();
-
-        //init Secret Key
-        byte[] keyValue = new byte[16];
-        rdm.nextBytes(keyValue);
-        SecretKey key = new SecretKeySpec(keyValue, "AES");
-
-        //Do initialization of the plainText
-        byte[] plainText = new byte[400];
-        rdm.nextBytes(plainText);
-
-        byte[] aad = new byte[128];
-        rdm.nextBytes(aad);
-        byte[] aad2 = aad.clone();
-        aad2[50]++;
-
-        byte[] iv = new byte[16];
-        rdm.nextBytes(iv);
-
-        GCMParameterSpec spec = new GCMParameterSpec(128, iv);
-        Cipher encCipher = Cipher.getInstance("AES/GCM/NoPadding", p);
-        encCipher.init(Cipher.ENCRYPT_MODE, key, spec);
-        encCipher.updateAAD(aad);
-        Cipher decCipher = Cipher.getInstance("AES/GCM/NoPadding", p);
-        decCipher.init(Cipher.DECRYPT_MODE, key, spec);  //encCipher.getParameters());
-        decCipher.updateAAD(aad);
-
-        byte[] recovered = test(encCipher, decCipher, plainText);
-        if (!Arrays.equals(plainText, recovered)) {
-            throw new Exception("sameAAD: diff check failed!");
-        } else System.out.println("sameAAD: passed");
-
-        encCipher.init(Cipher.ENCRYPT_MODE, key);
-        encCipher.updateAAD(aad2);
-        recovered = test(encCipher, decCipher, plainText);
-        if (recovered != null && recovered.length != 0) {
-            throw new Exception("diffAAD: no data should be returned!");
-        } else System.out.println("diffAAD: passed");
-   }
-
-   private static byte[] test(Cipher encCipher, Cipher decCipher, byte[] plainText)
-            throws Exception {
-        //init cipher streams
-        ByteArrayInputStream baInput = new ByteArrayInputStream(plainText);
-        CipherInputStream ciInput = new CipherInputStream(baInput, encCipher);
-        ByteArrayOutputStream baOutput = new ByteArrayOutputStream();
-        CipherOutputStream ciOutput = new CipherOutputStream(baOutput, decCipher);
-
-        //do test
-        byte[] buffer = new byte[200];
-        int len = ciInput.read(buffer);
-        System.out.println("read " + len + " bytes from input buffer");
-
-        while (len != -1) {
-            ciOutput.write(buffer, 0, len);
-            System.out.println("wite " + len + " bytes to output buffer");
-            len = ciInput.read(buffer);
-            if (len != -1) {
-                System.out.println("read " + len + " bytes from input buffer");
-            } else {
-                System.out.println("finished reading");
-            }
-        }
-
-        ciOutput.flush();
-        ciInput.close();
-        ciOutput.close();
-
-        return baOutput.toByteArray();
-    }
-}