--- a/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,583 +0,0 @@
-/*
- * Copyright (c) 2003, 2020, 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.
- */
-
-// SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.
-
-/*
- * @test
- * @bug 8051498 8145849 8170282
- * @summary JEP 244: TLS Application-Layer Protocol Negotiation Extension
- * @compile MyX509ExtendedKeyManager.java
- *
- * @run main/othervm SSLEngineAlpnTest h2          UNUSED   h2          h2
- * @run main/othervm SSLEngineAlpnTest h2          UNUSED   h2,http/1.1 h2
- * @run main/othervm SSLEngineAlpnTest h2,http/1.1 UNUSED   h2,http/1.1 h2
- * @run main/othervm SSLEngineAlpnTest http/1.1,h2 UNUSED   h2,http/1.1 http/1.1
- * @run main/othervm SSLEngineAlpnTest h4,h3,h2    UNUSED   h1,h2       h2
- * @run main/othervm SSLEngineAlpnTest EMPTY       UNUSED   h2,http/1.1 NONE
- * @run main/othervm SSLEngineAlpnTest h2          UNUSED   EMPTY       NONE
- * @run main/othervm SSLEngineAlpnTest H2          UNUSED   h2          ERROR
- * @run main/othervm SSLEngineAlpnTest h2          UNUSED   http/1.1    ERROR
- *
- * @run main/othervm SSLEngineAlpnTest UNUSED      h2       h2          h2
- * @run main/othervm SSLEngineAlpnTest UNUSED      h2       h2,http/1.1 h2
- * @run main/othervm SSLEngineAlpnTest UNUSED      h2       http/1.1,h2 h2
- * @run main/othervm SSLEngineAlpnTest UNUSED      http/1.1 h2,http/1.1 http/1.1
- * @run main/othervm SSLEngineAlpnTest UNUSED      EMPTY    h2,http/1.1 NONE
- * @run main/othervm SSLEngineAlpnTest UNUSED      h2       EMPTY       NONE
- * @run main/othervm SSLEngineAlpnTest UNUSED      H2       h2          ERROR
- * @run main/othervm SSLEngineAlpnTest UNUSED      h2       http/1.1    ERROR
- *
- * @run main/othervm SSLEngineAlpnTest h2          h2       h2          h2
- * @run main/othervm SSLEngineAlpnTest H2          h2       h2,http/1.1 h2
- * @run main/othervm SSLEngineAlpnTest h2,http/1.1 http/1.1 h2,http/1.1 http/1.1
- * @run main/othervm SSLEngineAlpnTest http/1.1,h2 h2       h2,http/1.1 h2
- * @run main/othervm SSLEngineAlpnTest EMPTY       h2       h2          h2
- * @run main/othervm SSLEngineAlpnTest h2,http/1.1 EMPTY    http/1.1    NONE
- * @run main/othervm SSLEngineAlpnTest h2,http/1.1 h2       EMPTY       NONE
- * @run main/othervm SSLEngineAlpnTest UNUSED      UNUSED   http/1.1,h2 NONE
- * @run main/othervm SSLEngineAlpnTest h2          h2       http/1.1    ERROR
- * @run main/othervm SSLEngineAlpnTest h2,http/1.1 H2       http/1.1    ERROR
- */
-/**
- * A simple SSLEngine-based client/server that demonstrates the proposed API
- * changes for JEP 244 in support of the TLS ALPN extension (RFC 7301).
- *
- * Usage:
- *     java SSLEngineAlpnTest <server-APs> <callback-AP> <client-APs> <result>
- *
- * where:
- *      EMPTY  indicates that ALPN is disabled
- *      UNUSED indicates that no ALPN values are supplied (server-side only)
- *      ERROR  indicates that an exception is expected
- *      NONE   indicates that no ALPN is expected
- *
- * This example is based on our standard SSLEngineTemplate.
- *
- * The immediate consumer of ALPN will be HTTP/2 (RFC 7540), aka H2. The H2 IETF
- * Working Group wanted to use TLSv1.3+ as the secure transport mechanism, but
- * TLSv1.3 wasn't ready. The H2 folk agreed to a compromise that only TLSv1.2+
- * can be used, and that if TLSv1.2 was selected, non-TLSv.1.3-approved
- * ciphersuites would be blacklisted and their use discouraged.
- *
- * In order to support connections that might negotiate either HTTP/1.1 and H2,
- * the guidance from the IETF Working Group is that the H2 ciphersuites be
- * prioritized/tried first.
- */
-
-/*
- * The original SSLEngineTemplate comments follow.
- *
- * A SSLEngine usage example which simplifies the presentation
- * by removing the I/O and multi-threading concerns.
- *
- * The test creates two SSLEngines, simulating a client and server.
- * The "transport" layer consists two byte buffers:  think of them
- * as directly connected pipes.
- *
- * Note, this is a *very* simple example: real code will be much more
- * involved.  For example, different threading and I/O models could be
- * used, transport mechanisms could close unexpectedly, and so on.
- *
- * When this application runs, notice that several messages
- * (wrap/unwrap) pass before any application data is consumed or
- * produced.  (For more information, please see the SSL/TLS
- * specifications.)  There may several steps for a successful handshake,
- * so it's typical to see the following series of operations:
- *
- *      client          server          message
- *      ======          ======          =======
- *      wrap()          ...             ClientHello
- *      ...             unwrap()        ClientHello
- *      ...             wrap()          ServerHello/Certificate
- *      unwrap()        ...             ServerHello/Certificate
- *      wrap()          ...             ClientKeyExchange
- *      wrap()          ...             ChangeCipherSpec
- *      wrap()          ...             Finished
- *      ...             unwrap()        ClientKeyExchange
- *      ...             unwrap()        ChangeCipherSpec
- *      ...             unwrap()        Finished
- *      ...             wrap()          ChangeCipherSpec
- *      ...             wrap()          Finished
- *      unwrap()        ...             ChangeCipherSpec
- *      unwrap()        ...             Finished
- */
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-import java.util.Arrays;
-
-public class SSLEngineAlpnTest {
-
-    /*
-     * Enables logging of the SSLEngine operations.
-     */
-    private static final boolean logging = true;
-
-    /*
-     * Enables the JSSE system debugging system property:
-     *
-     *     -Djavax.net.debug=all
-     *
-     * This gives a lot of low-level information about operations underway,
-     * including specific handshake messages, and might be best examined
-     * after gaining some familiarity with this application.
-     */
-    private static final boolean debug = false;
-
-    private static boolean hasServerAPs; // whether server APs are present
-    private static boolean hasCallback; // whether a callback is present
-
-    private final SSLContext sslc;
-
-    private SSLEngine clientEngine;     // client Engine
-    private ByteBuffer clientOut;       // write side of clientEngine
-    private ByteBuffer clientIn;        // read side of clientEngine
-
-    private SSLEngine serverEngine;     // server Engine
-    private ByteBuffer serverOut;       // write side of serverEngine
-    private ByteBuffer serverIn;        // read side of serverEngine
-
-    /*
-     * For data transport, this example uses local ByteBuffers.  This
-     * isn't really useful, but the purpose of this example is to show
-     * SSLEngine concepts, not how to do network transport.
-     */
-    private ByteBuffer cTOs;            // "reliable" transport client->server
-    private ByteBuffer sTOc;            // "reliable" transport server->client
-
-    /*
-     * The following is to set up the keystores.
-     */
-    private static final String pathToStores = "../etc";
-    private static final String keyStoreFile = "keystore";
-    private static final String trustStoreFile = "truststore";
-    private static final String passwd = "passphrase";
-
-    private static final String keyFilename
-            = System.getProperty("test.src", ".") + "/" + pathToStores
-            + "/" + keyStoreFile;
-    private static final String trustFilename
-            = System.getProperty("test.src", ".") + "/" + pathToStores
-            + "/" + trustStoreFile;
-
-    /*
-     * Main entry point for this test.
-     */
-    public static void main(String args[]) throws Exception {
-        if (debug) {
-            System.setProperty("javax.net.debug", "all");
-        }
-        System.out.println("Test args: " + Arrays.toString(args));
-
-        // Validate parameters
-        if (args.length != 4) {
-            throw new Exception("Invalid number of test parameters");
-        }
-
-        hasServerAPs = !args[0].equals("UNUSED"); // are server APs being used?
-        hasCallback = !args[1].equals("UNUSED"); // is callback being used?
-
-        SSLEngineAlpnTest test = new SSLEngineAlpnTest(args[3]);
-        try {
-            test.runTest(convert(args[0]), args[1], convert(args[2]), args[3]);
-        } catch (SSLHandshakeException she) {
-            if (args[3].equals("ERROR")) {
-                System.out.println("Caught the expected exception: " + she);
-            } else {
-                throw she;
-            }
-        }
-
-        System.out.println("Test Passed.");
-    }
-
-    /*
-     * Create an initialized SSLContext to use for these tests.
-     */
-    public SSLEngineAlpnTest(String expectedAP) throws Exception {
-
-        KeyStore ks = KeyStore.getInstance("JKS");
-        KeyStore ts = KeyStore.getInstance("JKS");
-
-        char[] passphrase = "passphrase".toCharArray();
-
-        ks.load(new FileInputStream(keyFilename), passphrase);
-        ts.load(new FileInputStream(trustFilename), passphrase);
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, passphrase);
-
-        KeyManager [] kms = kmf.getKeyManagers();
-        if (!(kms[0] instanceof X509ExtendedKeyManager)) {
-            throw new Exception("kms[0] not X509ExtendedKeyManager");
-        }
-
-        kms = new KeyManager[] { new MyX509ExtendedKeyManager(
-                (X509ExtendedKeyManager) kms[0], expectedAP,
-                !hasCallback && hasServerAPs) };
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(ts);
-
-        SSLContext sslCtx = SSLContext.getInstance("TLS");
-
-        sslCtx.init(kms, tmf.getTrustManagers(), null);
-
-        sslc = sslCtx;
-    }
-
-    /*
-     * Convert a comma-separated list into an array of strings.
-     */
-    private static String[] convert(String list) {
-        if (list.equals("UNUSED")) {
-            return null;
-        }
-
-        if (list.equals("EMPTY")) {
-            return new String[0];
-        }
-
-        String[] strings;
-        if (list.indexOf(',') > 0) {
-            strings = list.split(",");
-        } else {
-            strings = new String[]{ list };
-        }
-
-        return strings;
-    }
-
-    /*
-     * Run the test.
-     *
-     * Sit in a tight loop, both engines calling wrap/unwrap regardless
-     * of whether data is available or not.  We do this until both engines
-     * report back they are closed.
-     *
-     * The main loop handles all of the I/O phases of the SSLEngine's
-     * lifetime:
-     *
-     *     initial handshaking
-     *     application data transfer
-     *     engine closing
-     *
-     * One could easily separate these phases into separate
-     * sections of code.
-     */
-    private void runTest(String[] serverAPs, String callbackAP,
-            String[] clientAPs, String expectedAP) throws Exception {
-
-        boolean dataDone = false;
-
-        createSSLEngines(serverAPs, callbackAP, clientAPs);
-        createBuffers();
-
-        SSLEngineResult clientResult;   // results from client's last operation
-        SSLEngineResult serverResult;   // results from server's last operation
-
-        /*
-         * Examining the SSLEngineResults could be much more involved,
-         * and may alter the overall flow of the application.
-         *
-         * For example, if we received a BUFFER_OVERFLOW when trying
-         * to write to the output pipe, we could reallocate a larger
-         * pipe, but instead we wait for the peer to drain it.
-         */
-        while (!isEngineClosed(clientEngine)
-                || !isEngineClosed(serverEngine)) {
-
-            log("================");
-
-            clientResult = clientEngine.wrap(clientOut, cTOs);
-            log("client wrap: ", clientResult);
-            runDelegatedTasks(clientResult, clientEngine);
-            checkAPResult(clientEngine, clientResult, expectedAP);
-
-            serverResult = serverEngine.wrap(serverOut, sTOc);
-            log("server wrap: ", serverResult);
-            runDelegatedTasks(serverResult, serverEngine);
-            checkAPResult(serverEngine, serverResult, expectedAP);
-
-            cTOs.flip();
-            sTOc.flip();
-
-            log("----");
-
-            clientResult = clientEngine.unwrap(sTOc, clientIn);
-            log("client unwrap: ", clientResult);
-            runDelegatedTasks(clientResult, clientEngine);
-            checkAPResult(clientEngine, clientResult, expectedAP);
-
-            serverResult = serverEngine.unwrap(cTOs, serverIn);
-            log("server unwrap: ", serverResult);
-            runDelegatedTasks(serverResult, serverEngine);
-            checkAPResult(serverEngine, serverResult, expectedAP);
-
-            cTOs.compact();
-            sTOc.compact();
-
-            /*
-             * After we've transfered all application data between the client
-             * and server, we close the clientEngine's outbound stream.
-             * This generates a close_notify handshake message, which the
-             * server engine receives and responds by closing itself.
-             */
-            if (!dataDone && (clientOut.limit() == serverIn.position())
-                    && (serverOut.limit() == clientIn.position())) {
-
-                /*
-                 * A sanity check to ensure we got what was sent.
-                 */
-                checkTransfer(serverOut, clientIn);
-                checkTransfer(clientOut, serverIn);
-
-                log("\tClosing clientEngine's *OUTBOUND*...");
-                clientEngine.closeOutbound();
-                dataDone = true;
-            }
-        }
-    }
-
-    /*
-     * Check that the resulting connection meets our defined ALPN
-     * criteria.  If we were connecting to a non-JSSE implementation,
-     * the server might have negotiated something we shouldn't accept.
-     *
-     * If we were expecting an ALPN value from server, let's make sure
-     * the conditions match.
-     */
-    private static void checkAPResult(SSLEngine engine, SSLEngineResult result,
-            String expectedAP) throws Exception {
-
-        if (result.getHandshakeStatus() != HandshakeStatus.FINISHED) {
-            return;
-        }
-
-        if (engine.getHandshakeApplicationProtocol() != null) {
-            throw new Exception ("getHandshakeApplicationProtocol() should "
-                    + "return null after the handshake is completed");
-        }
-
-        String ap = engine.getApplicationProtocol();
-        System.out.println("Application Protocol: \"" + ap + "\"");
-
-        if (ap == null) {
-            throw new Exception(
-                "Handshake was completed but null was received");
-        }
-        if (expectedAP.equals("NONE")) {
-            if (!ap.isEmpty()) {
-                throw new Exception("Expected no ALPN value");
-            } else {
-                System.out.println("No ALPN value negotiated, as expected");
-            }
-        } else if (!expectedAP.equals(ap)) {
-            throw new Exception(expectedAP +
-                " ALPN value not available on negotiated connection");
-        }
-    }
-
-    /*
-     * Using the SSLContext created during object creation,
-     * create/configure the SSLEngines we'll use for this test.
-     */
-    private void createSSLEngines(String[] serverAPs, String callbackAP,
-            String[] clientAPs) throws Exception {
-        /*
-         * Configure the serverEngine to act as a server in the SSL/TLS
-         * handshake.  Also, require SSL client authentication.
-         */
-        serverEngine = sslc.createSSLEngine();
-        serverEngine.setUseClientMode(false);
-
-        SSLParameters sslp = serverEngine.getSSLParameters();
-
-        sslp.setNeedClientAuth(true);
-
-        /*
-         * The default ciphersuite ordering from the SSLContext may not
-         * reflect "h2" ciphersuites as being preferred, additionally the
-         * client may not send them in an appropriate order. We could resort
-         * the suite list if so desired.
-         */
-        String[] suites = sslp.getCipherSuites();
-        sslp.setCipherSuites(suites);
-        if (serverAPs != null) {
-            sslp.setApplicationProtocols(serverAPs);
-        }
-        sslp.setUseCipherSuitesOrder(true);  // Set server side order
-
-        serverEngine.setSSLParameters(sslp);
-
-        // check that no callback has been registered
-        if (serverEngine.getHandshakeApplicationProtocolSelector() != null) {
-            throw new Exception("getHandshakeApplicationProtocolSelector() " +
-                "should return null");
-        }
-
-        if (hasCallback) {
-            serverEngine.setHandshakeApplicationProtocolSelector(
-                (sslEngine, clientProtocols) -> {
-                    return callbackAP.equals("EMPTY") ? "" : callbackAP;
-                });
-
-            // check that the callback can be retrieved
-            if (serverEngine.getHandshakeApplicationProtocolSelector()
-                    == null) {
-                throw new Exception("getHandshakeApplicationProtocolSelector()"
-                    + " should return non-null");
-            }
-        }
-
-        /*
-         * Similar to above, but using client mode instead.
-         */
-        clientEngine = sslc.createSSLEngine("client", 80);
-        clientEngine.setUseClientMode(true);
-        sslp = clientEngine.getSSLParameters();
-        if (clientAPs != null) {
-            sslp.setApplicationProtocols(clientAPs);
-        }
-        clientEngine.setSSLParameters(sslp);
-
-        if ((clientEngine.getHandshakeApplicationProtocol() != null) ||
-                (serverEngine.getHandshakeApplicationProtocol() != null)) {
-            throw new Exception ("getHandshakeApplicationProtocol() should "
-                    + "return null before the handshake starts");
-        }
-    }
-
-    /*
-     * Create and size the buffers appropriately.
-     */
-    private void createBuffers() {
-
-        /*
-         * We'll assume the buffer sizes are the same
-         * between client and server.
-         */
-        SSLSession session = clientEngine.getSession();
-        int appBufferMax = session.getApplicationBufferSize();
-        int netBufferMax = session.getPacketBufferSize();
-
-        /*
-         * We'll make the input buffers a bit bigger than the max needed
-         * size, so that unwrap()s following a successful data transfer
-         * won't generate BUFFER_OVERFLOWS.
-         *
-         * We'll use a mix of direct and indirect ByteBuffers for
-         * tutorial purposes only.  In reality, only use direct
-         * ByteBuffers when they give a clear performance enhancement.
-         */
-        clientIn = ByteBuffer.allocate(appBufferMax + 50);
-        serverIn = ByteBuffer.allocate(appBufferMax + 50);
-
-        cTOs = ByteBuffer.allocateDirect(netBufferMax);
-        sTOc = ByteBuffer.allocateDirect(netBufferMax);
-
-        clientOut = ByteBuffer.wrap("Hi Server, I'm Client".getBytes());
-        serverOut = ByteBuffer.wrap("Hello Client, I'm Server".getBytes());
-    }
-
-    /*
-     * If the result indicates that we have outstanding tasks to do,
-     * go ahead and run them in this thread.
-     */
-    private static void runDelegatedTasks(SSLEngineResult result,
-            SSLEngine engine) throws Exception {
-
-        if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-            Runnable runnable;
-            while ((runnable = engine.getDelegatedTask()) != null) {
-                log("\trunning delegated task...");
-                runnable.run();
-            }
-            HandshakeStatus hsStatus = engine.getHandshakeStatus();
-            if (hsStatus == HandshakeStatus.NEED_TASK) {
-                throw new Exception(
-                        "handshake shouldn't need additional tasks");
-            }
-            log("\tnew HandshakeStatus: " + hsStatus);
-        }
-    }
-
-    private static boolean isEngineClosed(SSLEngine engine) {
-        return (engine.isOutboundDone() && engine.isInboundDone());
-    }
-
-    /*
-     * Simple check to make sure everything came across as expected.
-     */
-    private static void checkTransfer(ByteBuffer a, ByteBuffer b)
-            throws Exception {
-        a.flip();
-        b.flip();
-
-        if (!a.equals(b)) {
-            throw new Exception("Data didn't transfer cleanly");
-        } else {
-            log("\tData transferred cleanly");
-        }
-
-        a.position(a.limit());
-        b.position(b.limit());
-        a.limit(a.capacity());
-        b.limit(b.capacity());
-    }
-
-    /*
-     * Logging code
-     */
-    private static boolean resultOnce = true;
-
-    private static void log(String str, SSLEngineResult result) {
-        if (!logging) {
-            return;
-        }
-        if (resultOnce) {
-            resultOnce = false;
-            System.out.println("The format of the SSLEngineResult is: \n"
-                    + "\t\"getStatus() / getHandshakeStatus()\" +\n"
-                    + "\t\"bytesConsumed() / bytesProduced()\"\n");
-        }
-        HandshakeStatus hsStatus = result.getHandshakeStatus();
-        log(str
-                + result.getStatus() + "/" + hsStatus + ", "
-                + result.bytesConsumed() + "/" + result.bytesProduced()
-                + " bytes");
-        if (hsStatus == HandshakeStatus.FINISHED) {
-            log("\t...ready for application data");
-        }
-    }
-
-    private static void log(String str) {
-        if (logging) {
-            System.out.println(str);
-        }
-    }
-}

--- a/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2001, 2011, 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 4387882 4451038
- * @summary Need to revisit the javadocs for JSSE, especially the
- *      promoted classes, and HttpsURLConnection.getCipherSuite throws
- *      NullPointerException
- * @run main/othervm ComURLNulls
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
- * @author Brad Wetmore
- */
-
-import java.net.*;
-import java.io.*;
-import javax.net.ssl.*;
-import com.sun.net.ssl.HttpsURLConnection;
-import com.sun.net.ssl.HostnameVerifier;
-
-/*
- * Tests that the com null argument changes made it in ok.
- */
-
-public class ComURLNulls {
-
-    public static void main(String[] args) throws Exception {
-        HostnameVerifier reservedHV =
-            HttpsURLConnection.getDefaultHostnameVerifier();
-        try {
-            System.setProperty("java.protocol.handler.pkgs",
-                                    "com.sun.net.ssl.internal.www.protocol");
-            /**
-             * This test does not establish any connection to the specified
-             * URL, hence a dummy URL is used.
-             */
-            URL foobar = new URL("https://example.com/");
-
-            HttpsURLConnection urlc =
-                (HttpsURLConnection) foobar.openConnection();
-
-            try {
-                urlc.getCipherSuite();
-            } catch (IllegalStateException e) {
-                System.out.print("Caught proper exception: ");
-                System.out.println(e.getMessage());
-            }
-
-            try {
-                urlc.getServerCertificateChain();
-            } catch (IllegalStateException e) {
-                System.out.print("Caught proper exception: ");
-                System.out.println(e.getMessage());
-            }
-
-            try {
-                urlc.setDefaultHostnameVerifier(null);
-            } catch (IllegalArgumentException e) {
-                System.out.print("Caught proper exception: ");
-                System.out.println(e.getMessage());
-            }
-
-            try {
-                urlc.setHostnameVerifier(null);
-            } catch (IllegalArgumentException e) {
-                System.out.print("Caught proper exception: ");
-                System.out.println(e.getMessage());
-            }
-
-            try {
-                urlc.setDefaultSSLSocketFactory(null);
-            } catch (IllegalArgumentException e) {
-                System.out.print("Caught proper exception: ");
-                System.out.println(e.getMessage());
-            }
-
-            try {
-                urlc.setSSLSocketFactory(null);
-            } catch (IllegalArgumentException e) {
-                System.out.print("Caught proper exception");
-                System.out.println(e.getMessage());
-            }
-            System.out.println("TESTS PASSED");
-        } finally {
-            HttpsURLConnection.setDefaultHostnameVerifier(reservedHV);
-        }
-    }
-}

--- a/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) 2001, 2011, 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 4387882
- * @summary Need to revisit the javadocs for JSSE, especially the
- *      promoted classes.
- * @run main/othervm SSLSessionNulls
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
- * @author Brad Wetmore
- */
-
-import java.io.*;
-import java.net.*;
-import javax.net.ssl.*;
-
-public class SSLSessionNulls {
-
-    /*
-     * =============================================================
-     * Set the various variables needed for the tests, then
-     * specify what tests to run on each side.
-     */
-
-    /*
-     * Should we run the client or server in a separate thread?
-     * Both sides can throw exceptions, but do you have a preference
-     * as to which side should be the main thread.
-     */
-    static boolean separateServerThread = true;
-
-    /*
-     * Where do we find the keystores?
-     */
-    static String pathToStores = "../etc";
-    static String keyStoreFile = "keystore";
-    static String trustStoreFile = "truststore";
-    static String passwd = "passphrase";
-
-    /*
-     * Is the server ready to serve?
-     */
-    volatile static boolean serverReady = false;
-
-    /*
-     * Turn on SSL debugging?
-     */
-    static boolean debug = false;
-
-    /*
-     * If the client or server is doing some kind of object creation
-     * that the other side depends on, and that thread prematurely
-     * exits, you may experience a hang.  The test harness will
-     * terminate all hung threads after its timeout has expired,
-     * currently 3 minutes by default, but you might try to be
-     * smart about it....
-     */
-
-    /*
-     * Define the server side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
-     */
-    void doServerSide() throws Exception {
-        SSLServerSocketFactory sslssf =
-            (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
-        SSLServerSocket sslServerSocket =
-            (SSLServerSocket) sslssf.createServerSocket(serverPort);
-        serverPort = sslServerSocket.getLocalPort();
-
-        /*
-         * Signal Client, we're ready for his connect.
-         */
-        serverReady = true;
-
-        SSLSocket sslSocket = (SSLSocket) sslServerSocket.accept();
-        InputStream sslIS = sslSocket.getInputStream();
-        OutputStream sslOS = sslSocket.getOutputStream();
-
-        sslIS.read();
-        sslOS.write(85);
-        sslOS.flush();
-
-        sslSocket.close();
-    }
-
-    /*
-     * Define the client side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
-     */
-    void doClientSide() throws Exception {
-
-        /*
-         * Wait for server to get started.
-         */
-        while (!serverReady) {
-            Thread.sleep(50);
-        }
-
-        SSLSocketFactory sslsf =
-            (SSLSocketFactory) SSLSocketFactory.getDefault();
-        SSLSocket sslSocket = (SSLSocket)
-            sslsf.createSocket("localhost", serverPort);
-
-        InputStream sslIS = sslSocket.getInputStream();
-        OutputStream sslOS = sslSocket.getOutputStream();
-
-        sslOS.write(280);
-        sslOS.flush();
-        sslIS.read();
-
-        SSLSession sslSession = sslSocket.getSession();
-
-        try {
-            sslSession.getValue(null);
-        } catch (IllegalArgumentException e) {
-            System.out.print("Caught proper exception: ");
-            System.out.println(e.getMessage());
-        }
-
-        try {
-            sslSession.putValue(null, null);
-        } catch (IllegalArgumentException e) {
-            System.out.print("Caught proper exception: ");
-            System.out.println(e.getMessage());
-        }
-
-        try {
-            sslSession.removeValue(null);
-        } catch (IllegalArgumentException e) {
-            System.out.print("Caught proper exception: ");
-            System.out.println(e.getMessage());
-        }
-
-        String [] names = sslSession.getValueNames();
-        if ((names == null) || (names.length != 0)) {
-            throw new IOException(
-                "getValueNames didn't return 0-length arrary");
-        }
-
-        sslSocket.close();
-    }
-
-    /*
-     * =============================================================
-     * The remainder is just support stuff
-     */
-
-    // use any free port by default
-    volatile int serverPort = 0;
-
-    volatile Exception serverException = null;
-    volatile Exception clientException = null;
-
-    public static void main(String[] args) throws Exception {
-        String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-        String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-        System.setProperty("javax.net.ssl.keyStore", keyFilename);
-        System.setProperty("javax.net.ssl.keyStorePassword", passwd);
-        System.setProperty("javax.net.ssl.trustStore", trustFilename);
-        System.setProperty("javax.net.ssl.trustStorePassword", passwd);
-
-        if (debug)
-            System.setProperty("javax.net.debug", "all");
-
-        /*
-         * Start the tests.
-         */
-        new SSLSessionNulls();
-    }
-
-    Thread clientThread = null;
-    Thread serverThread = null;
-
-    /*
-     * Primary constructor, used to drive remainder of the test.
-     *
-     * Fork off the other side, then do your work.
-     */
-    SSLSessionNulls() throws Exception {
-        if (separateServerThread) {
-            startServer(true);
-            startClient(false);
-        } else {
-            startClient(true);
-            startServer(false);
-        }
-
-        /*
-         * Wait for other side to close down.
-         */
-        if (separateServerThread) {
-            serverThread.join();
-        } else {
-            clientThread.join();
-        }
-
-        /*
-         * When we get here, the test is pretty much over.
-         *
-         * If the main thread excepted, that propagates back
-         * immediately.  If the other thread threw an exception, we
-         * should report back.
-         */
-        if (serverException != null) {
-            System.out.print("Server Exception:");
-            throw serverException;
-        }
-        if (clientException != null) {
-            System.out.print("Client Exception:");
-            throw clientException;
-        }
-    }
-
-    void startServer(boolean newThread) throws Exception {
-        if (newThread) {
-            serverThread = new Thread() {
-                public void run() {
-                    try {
-                        doServerSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our server thread just died.
-                         *
-                         * Release the client, if not active already...
-                         */
-                        System.err.println("Server died...");
-                        serverReady = true;
-                        serverException = e;
-                    }
-                }
-            };
-            serverThread.start();
-        } else {
-            doServerSide();
-        }
-    }
-
-    void startClient(boolean newThread) throws Exception {
-        if (newThread) {
-            clientThread = new Thread() {
-                public void run() {
-                    try {
-                        doClientSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our client thread just died.
-                         */
-                        System.err.println("Client died...");
-                        clientException = e;
-                    }
-                }
-            };
-            clientThread.start();
-        } else {
-            doClientSide();
-        }
-    }
-}

--- a/test/javax/net/ssl/SSLEngine/Arrays.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, 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 5019096
- * @summary Add scatter/gather APIs for SSLEngine
- *
- */
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-
-public class Arrays {
-
-    private static boolean debug = false;
-
-    private SSLContext sslc;
-    private SSLEngine ssle1;    // client
-    private SSLEngine ssle2;    // server
-
-    private static String pathToStores = "../etc";
-    private static String keyStoreFile = "keystore";
-    private static String trustStoreFile = "truststore";
-    private static String passwd = "passphrase";
-
-    private static String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-    private static String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-    private ByteBuffer [] appOutArray1;
-    private ByteBuffer [] appInArray1;
-
-    private ByteBuffer appOut2;         // write side of ssle2
-    private ByteBuffer appIn2;          // read side of ssle2
-
-    private ByteBuffer oneToTwo;        // "reliable" transport ssle1->ssle2
-    private ByteBuffer twoToOne;        // "reliable" transport ssle2->ssle1
-
-    /*
-     * Majority of the test case is here, setup is done below.
-     */
-    private void createSSLEngines() throws Exception {
-        ssle1 = sslc.createSSLEngine("client", 1);
-        ssle1.setUseClientMode(true);
-
-        ssle2 = sslc.createSSLEngine();
-        ssle2.setUseClientMode(false);
-        ssle2.setNeedClientAuth(true);
-    }
-
-    private void runTest() throws Exception {
-        boolean dataDone = false;
-
-        createSSLEngines();
-        createBuffers();
-
-        SSLEngineResult result1;        // ssle1's results from last operation
-        SSLEngineResult result2;        // ssle2's results from last operation
-
-        while (!isEngineClosed(ssle1) || !isEngineClosed(ssle2)) {
-
-            log("================");
-
-            result1 = ssle1.wrap(appOutArray1, oneToTwo);
-            result2 = ssle2.wrap(appOut2, twoToOne);
-
-            log("wrap1:  " + result1);
-            log("oneToTwo  = " + oneToTwo);
-            log("");
-
-            log("wrap2:  " + result2);
-            log("twoToOne  = " + twoToOne);
-
-            runDelegatedTasks(result1, ssle1);
-            runDelegatedTasks(result2, ssle2);
-
-            oneToTwo.flip();
-            twoToOne.flip();
-
-            log("----");
-
-            result1 = ssle1.unwrap(twoToOne, appInArray1);
-            result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-            log("unwrap1: " + result1);
-            log("twoToOne  = " + twoToOne);
-            log("");
-
-            log("unwrap2: " + result2);
-            log("oneToTwo  = " + oneToTwo);
-
-            runDelegatedTasks(result1, ssle1);
-            runDelegatedTasks(result2, ssle2);
-
-            oneToTwo.compact();
-            twoToOne.compact();
-
-            /*
-             * If we've transfered all the data between app1 and app2,
-             * we try to close and see what that gets us.
-             */
-            if (!dataDone) {
-                boolean done = true;
-
-                for (int i = 0; i < appOutArray1.length; i++) {
-                    if (appOutArray1[i].remaining() != 0) {
-                        done = false;
-                    }
-                }
-
-                if (appOut2.remaining() != 0) {
-                    done = false;
-                }
-
-                if (done) {
-                    log("Closing ssle1's *OUTBOUND*...");
-                    for (int i = 0; i < appOutArray1.length; i++) {
-                        appOutArray1[i].rewind();
-                    }
-                    ssle1.closeOutbound();
-                    dataDone = true;
-                }
-            }
-        }
-        checkTransfer(appOutArray1,  appIn2);
-        appInArray1[appInArray1.length - 1].limit(
-            appInArray1[appInArray1.length - 1].position());
-        checkTransfer(appInArray1, appOut2);
-    }
-
-    public static void main(String args[]) throws Exception {
-
-        Arrays test;
-
-        test = new Arrays();
-
-        test.createSSLEngines();
-
-        test.runTest();
-
-        System.out.println("Test Passed.");
-    }
-
-    /*
-     * **********************************************************
-     * Majority of the test case is above, below is just setup stuff
-     * **********************************************************
-     */
-
-    public Arrays() throws Exception {
-        sslc = getSSLContext(keyFilename, trustFilename);
-    }
-
-    /*
-     * Create an initialized SSLContext to use for this test.
-     */
-    private SSLContext getSSLContext(String keyFile, String trustFile)
-            throws Exception {
-
-        KeyStore ks = KeyStore.getInstance("JKS");
-        KeyStore ts = KeyStore.getInstance("JKS");
-
-        char[] passphrase = "passphrase".toCharArray();
-
-        ks.load(new FileInputStream(keyFile), passphrase);
-        ts.load(new FileInputStream(trustFile), passphrase);
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, passphrase);
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(ts);
-
-        SSLContext sslCtx = SSLContext.getInstance("TLS");
-
-        sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-
-        return sslCtx;
-    }
-
-    private void createBuffers() {
-        // Size the buffers as appropriate.
-
-        SSLSession session = ssle1.getSession();
-        int appBufferMax = session.getApplicationBufferSize();
-        int netBufferMax = session.getPacketBufferSize();
-
-        appIn2 = ByteBuffer.allocateDirect(appBufferMax + 50);
-
-        oneToTwo = ByteBuffer.allocateDirect(netBufferMax);
-        twoToOne = ByteBuffer.allocateDirect(netBufferMax);
-
-        ByteBuffer strBB = ByteBuffer.wrap(
-            "Hi Engine2, I'm SSLEngine1, So Be it" .getBytes());
-
-        strBB.position(0);
-        strBB.limit(5);
-        ByteBuffer appOut1a = strBB.slice();
-
-        strBB.position(5);
-        strBB.limit(15);
-        ByteBuffer appOut1b = strBB.slice();
-
-        strBB.position(15);
-        strBB.limit(strBB.capacity());
-        ByteBuffer appOut1c = strBB.slice();
-
-        strBB.rewind();
-
-        appOutArray1 = new ByteBuffer [] { appOut1a, appOut1b, appOut1c };
-
-        appOut2 = ByteBuffer.wrap("Hello Engine1, I'm SSLEngine2".getBytes());
-
-        ByteBuffer appIn1a = ByteBuffer.allocateDirect(5);
-        ByteBuffer appIn1b = ByteBuffer.allocateDirect(10);
-        ByteBuffer appIn1c = ByteBuffer.allocateDirect(appBufferMax + 50);
-        appInArray1 = new ByteBuffer [] { appIn1a, appIn1b, appIn1c };
-
-        log("AppOut1a = " + appOut1a);
-        log("AppOut1a = " + appOut1b);
-        log("AppOut1a = " + appOut1c);
-        log("AppOut2 = " + appOut2);
-        log("");
-    }
-
-    private static void runDelegatedTasks(SSLEngineResult result,
-            SSLEngine engine) throws Exception {
-
-        if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-            Runnable runnable;
-            while ((runnable = engine.getDelegatedTask()) != null) {
-                log("running delegated task...");
-                runnable.run();
-            }
-        }
-    }
-
-    private static boolean isEngineClosed(SSLEngine engine) {
-        return (engine.isOutboundDone() && engine.isInboundDone());
-    }
-
-    private static void checkTransfer(ByteBuffer [] a, ByteBuffer b)
-            throws Exception {
-
-        b.flip();
-
-        for (int i = 0; i < a.length; i++) {
-            a[i].rewind();
-
-            b.limit(b.position() + a[i].remaining());
-
-            if (!a[i].equals(b)) {
-                throw new Exception("Data didn't transfer cleanly");
-            }
-
-            b.position(b.limit());
-        }
-
-        log("Data transferred cleanly");
-    }
-
-    private static void log(String str) {
-        if (debug) {
-            System.out.println(str);
-        }
-    }
-}

--- a/test/javax/net/ssl/SSLEngine/CheckStatus.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,729 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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 4948079
- * @summary SSLEngineResult needs updating [none yet]
- *
- * This is a simple hack to test a bunch of conditions and check
- * their return codes.
- *
- * @run main/othervm -Djsse.enableCBCProtection=false CheckStatus
- *
- * @author Brad Wetmore
- */
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-
-public class CheckStatus {
-
-    private static boolean debug = true;
-
-    private SSLContext sslc;
-    private SSLEngine ssle1;    // client
-    private SSLEngine ssle2;    // server
-
-    private static String pathToStores = "../etc";
-    private static String keyStoreFile = "keystore";
-    private static String trustStoreFile = "truststore";
-    private static String passwd = "passphrase";
-
-    private static String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-    private static String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-    private ByteBuffer appOut1;         // write side of ssle1
-    private ByteBuffer appIn1;          // read side of ssle1
-    private ByteBuffer appOut2;         // write side of ssle2
-    private ByteBuffer appIn2;          // read side of ssle2
-
-    private ByteBuffer oneToTwo;        // "reliable" transport ssle1->ssle2
-    private ByteBuffer twoToOne;        // "reliable" transport ssle2->ssle1
-
-    /*
-     * Majority of the test case is here, setup is done below.
-     */
-
-    private void createSSLEngines() throws Exception {
-        ssle1 = sslc.createSSLEngine("client", 1);
-        ssle1.setUseClientMode(true);
-
-        ssle2 = sslc.createSSLEngine("server", 2);
-        ssle2.setUseClientMode(false);
-    }
-
-    private boolean isHandshaking(SSLEngine e) {
-        return (e.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING);
-    }
-
-    private void checkResult(ByteBuffer bbIn, ByteBuffer bbOut,
-            SSLEngineResult result,
-            Status status, HandshakeStatus hsStatus,
-            int consumed, int produced)
-            throws Exception {
-
-        if ((status != null) && (result.getStatus() != status)) {
-            throw new Exception("Unexpected Status: need = " + status +
-                " got = " + result.getStatus());
-        }
-
-        if ((hsStatus != null) && (result.getHandshakeStatus() != hsStatus)) {
-            throw new Exception("Unexpected hsStatus: need = " + hsStatus +
-                " got = " + result.getHandshakeStatus());
-        }
-
-        if ((consumed != -1) && (consumed != result.bytesConsumed())) {
-            throw new Exception("Unexpected consumed: need = " + consumed +
-                " got = " + result.bytesConsumed());
-        }
-
-        if ((produced != -1) && (produced != result.bytesProduced())) {
-            throw new Exception("Unexpected produced: need = " + produced +
-                " got = " + result.bytesProduced());
-        }
-
-        if ((consumed != -1) && (bbIn.position() != result.bytesConsumed())) {
-            throw new Exception("Consumed " + bbIn.position() +
-                " != " + consumed);
-        }
-
-        if ((produced != -1) && (bbOut.position() != result.bytesProduced())) {
-            throw new Exception("produced " + bbOut.position() +
-                " != " + produced);
-        }
-    }
-
-    private void test() throws Exception {
-        createSSLEngines();
-        createBuffers();
-
-        SSLEngineResult result1;        // ssle1's results from last operation
-        SSLEngineResult result2;        // ssle2's results from last operation
-
-        String [] suite1 = new String [] {
-            "SSL_RSA_WITH_RC4_128_MD5" };
-        String [] suite2 = new String [] {
-            "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA" };
-
-        ssle1.setEnabledCipherSuites(suite1);
-        ssle2.setEnabledCipherSuites(suite1);
-
-        log("================");
-
-        log("unexpected empty unwrap");
-        twoToOne.limit(0);
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.NEED_WRAP, 0, 0);
-        twoToOne.limit(twoToOne.capacity());
-
-        log("======================================");
-        log("client hello");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_UNWRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_TASK, result1.bytesProduced(), 0);
-        runDelegatedTasks(ssle2);
-
-        oneToTwo.compact();
-
-        log("Check for unwrap when wrap needed");
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(oneToTwo, appIn2, result2,
-            Status.OK, HandshakeStatus.NEED_WRAP, 0, 0);
-
-        log("======================================");
-        log("ServerHello");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NEED_UNWRAP, 0, -1);
-        twoToOne.flip();
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.NEED_TASK, result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        runDelegatedTasks(ssle1);
-
-        log("======================================");
-        log("Key Exchange");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_WRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_TASK, result1.bytesProduced(), 0);
-        runDelegatedTasks(ssle2);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("CCS");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_WRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_UNWRAP,
-             result1.bytesProduced(), 0);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("Finished");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_UNWRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_WRAP, result1.bytesProduced(), 0);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("CCS");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NEED_WRAP, 0, -1);
-        twoToOne.flip();
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.NEED_UNWRAP, result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        log("======================================");
-        log("FINISHED");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.FINISHED, 0, -1);
-        twoToOne.flip();
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.FINISHED, result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        log("======================================");
-        log("Check Session/Ciphers");
-
-        String suite = ssle1.getSession().getCipherSuite();
-        if (!suite.equals(suite1[0])) {
-            throw new Exception("suites not equal: " + suite + "/" +
-                suite1[0]);
-        }
-
-        suite = ssle2.getSession().getCipherSuite();
-        if (!suite.equals(suite1[0])) {
-            throw new Exception("suites not equal: " + suite + "/" +
-                suite1[0]);
-        }
-
-        log("======================================");
-        log("DATA");
-
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            appOut1.capacity(), -1);
-        oneToTwo.flip();
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            appOut2.capacity(), -1);
-        twoToOne.flip();
-
-        SSLEngineResult result3 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result3,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            result2.bytesProduced(), result2.bytesConsumed());
-        twoToOne.compact();
-
-        SSLEngineResult result4 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(oneToTwo, appIn2, result4,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            result1.bytesProduced(), result1.bytesConsumed());
-        oneToTwo.compact();
-
-        appIn1.clear();
-        appIn2.clear();
-        appOut1.rewind();
-        appOut2.rewind();
-
-        log("======================================");
-        log("RENEGOTIATE");
-
-        ssle2.getSession().invalidate();
-        ssle2.setNeedClientAuth(true);
-
-        ssle1.setEnabledCipherSuites(suite2);
-        ssle2.setEnabledCipherSuites(suite2);
-
-        ssle2.beginHandshake();
-
-        log("======================================");
-        log("HelloRequest");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NEED_UNWRAP, 0, -1);
-        twoToOne.flip();
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.NEED_TASK, result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        runDelegatedTasks(ssle1);
-
-        log("======================================");
-        log("ClientHello");
-
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_UNWRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_TASK, result1.bytesProduced(), 0);
-        runDelegatedTasks(ssle2);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("CLIENT->SERVER DATA IN MIDDLE OF HANDSHAKE");
-
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-            Status.OK, HandshakeStatus.NEED_UNWRAP,
-            appOut1.capacity(), -1);
-        oneToTwo.flip();
-
-        result4 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(oneToTwo, appIn2, result4,
-            Status.OK, HandshakeStatus.NEED_WRAP,
-            result1.bytesProduced(), result1.bytesConsumed());
-        oneToTwo.compact();
-
-        appIn2.clear();
-        appOut1.rewind();
-
-        log("======================================");
-        log("ServerHello");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NEED_UNWRAP, 0, -1);
-        twoToOne.flip();
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.NEED_TASK, result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        runDelegatedTasks(ssle1);
-
-        log("======================================");
-        log("SERVER->CLIENT DATA IN MIDDLE OF HANDSHAKE");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NEED_UNWRAP,
-            appOut2.capacity(), -1);
-        twoToOne.flip();
-
-        result3 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result3,
-            Status.OK, HandshakeStatus.NEED_WRAP,
-            result2.bytesProduced(), result2.bytesConsumed());
-        twoToOne.compact();
-
-        appIn1.clear();
-        appOut2.rewind();
-
-        log("======================================");
-        log("Client Cert");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_WRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_TASK, result1.bytesProduced(), 0);
-        runDelegatedTasks(ssle2);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("Key Exchange");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_WRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_TASK,
-             result1.bytesProduced(), 0);
-        runDelegatedTasks(ssle2);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("CCS");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_WRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_UNWRAP,
-             result1.bytesProduced(), 0);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("Finished");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.OK, HandshakeStatus.NEED_UNWRAP, 0, -1);
-
-        oneToTwo.flip();
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.OK, HandshakeStatus.NEED_WRAP, result1.bytesProduced(), 0);
-
-        oneToTwo.compact();
-
-        log("======================================");
-        log("CCS");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NEED_WRAP, 0, -1);
-        twoToOne.flip();
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.NEED_UNWRAP, result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        log("======================================");
-        log("FINISHED");
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.FINISHED, 0, -1);
-        twoToOne.flip();
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.OK, HandshakeStatus.FINISHED, result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        log("======================================");
-        log("Check Session/Ciphers");
-
-        suite = ssle1.getSession().getCipherSuite();
-        if (!suite.equals(suite2[0])) {
-            throw new Exception("suites not equal: " + suite + "/" +
-                suite2[0]);
-        }
-
-        suite = ssle2.getSession().getCipherSuite();
-        if (!suite.equals(suite2[0])) {
-            throw new Exception("suites not equal: " + suite + "/" +
-                suite2[0]);
-        }
-
-        log("======================================");
-        log("DATA USING NEW SESSION");
-
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            appOut1.capacity(), -1);
-        oneToTwo.flip();
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            appOut2.capacity(), -1);
-        twoToOne.flip();
-
-        result3 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result3,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            result2.bytesProduced(), result2.bytesConsumed());
-        twoToOne.compact();
-
-        result4 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(oneToTwo, appIn2, result4,
-            Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            result1.bytesProduced(), result1.bytesConsumed());
-        oneToTwo.compact();
-
-        appIn1.clear();
-        appIn2.clear();
-        appOut1.rewind();
-        appOut2.rewind();
-
-        log("======================================");
-        log("CN");
-
-        if (isHandshaking(ssle1)) {
-            throw new Exception("ssle1 IS handshaking");
-        }
-
-        if (isHandshaking(ssle2)) {
-            throw new Exception("ssle2 IS handshaking");
-        }
-
-        ssle2.closeOutbound();
-
-        if (!isHandshaking(ssle2)) {
-            throw new Exception("ssle1 IS NOT handshaking");
-        }
-
-        appOut1.rewind();
-        appOut2.rewind();
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.CLOSED, HandshakeStatus.NEED_UNWRAP, 0, -1);
-        twoToOne.flip();
-
-        if (ssle1.isInboundDone()) {
-            throw new Exception("ssle1 inboundDone");
-        }
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(twoToOne, appIn1, result1,
-            Status.CLOSED, HandshakeStatus.NEED_WRAP,
-            result2.bytesProduced(), 0);
-        twoToOne.compact();
-
-        if (!ssle1.isInboundDone()) {
-            throw new Exception("ssle1 inboundDone");
-        }
-
-        if (!isHandshaking(ssle1)) {
-            throw new Exception("ssle1 IS NOT handshaking");
-        }
-
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(appOut2, twoToOne, result2,
-            Status.CLOSED, HandshakeStatus.NEED_UNWRAP, 0, 0);
-        twoToOne.flip();
-
-        log("======================================");
-        log("CN response");
-
-        if (ssle1.isOutboundDone()) {
-            throw new Exception("ssle1 outboundDone");
-        }
-
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(appOut1, oneToTwo, result1,
-             Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING, 0, -1);
-
-        if (!ssle1.isOutboundDone()) {
-            throw new Exception("ssle1 outboundDone is NOT done");
-        }
-
-        if (isHandshaking(ssle1)) {
-            throw new Exception("ssle1 IS handshaking");
-        }
-
-        oneToTwo.flip();
-
-        if (!ssle2.isOutboundDone()) {
-            throw new Exception("ssle1 outboundDone");
-        }
-
-        if (ssle2.isInboundDone()) {
-            throw new Exception("ssle1 inboundDone");
-        }
-
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-        checkResult(oneToTwo, appIn2, result2,
-             Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING,
-             result1.bytesProduced(), 0);
-
-        if (!ssle2.isOutboundDone()) {
-            throw new Exception("ssle1 outboundDone is NOT done");
-        }
-
-        if (!ssle2.isInboundDone()) {
-            throw new Exception("ssle1 inboundDone is NOT done");
-        }
-
-        if (isHandshaking(ssle2)) {
-            throw new Exception("ssle1 IS handshaking");
-        }
-
-        oneToTwo.compact();
-    }
-
-    public static void main(String args[]) throws Exception {
-        // reset the security property to make sure that the algorithms
-        // and keys used in this test are not disabled.
-        Security.setProperty("jdk.tls.disabledAlgorithms", "");
-
-        CheckStatus cs;
-
-        cs = new CheckStatus();
-
-        cs.createSSLEngines();
-
-        cs.test();
-
-        System.out.println("Test Passed.");
-    }
-
-    /*
-     * **********************************************************
-     * Majority of the test case is above, below is just setup stuff
-     * **********************************************************
-     */
-
-    public CheckStatus() throws Exception {
-        sslc = getSSLContext(keyFilename, trustFilename);
-    }
-
-    /*
-     * Create an initialized SSLContext to use for this test.
-     */
-    private SSLContext getSSLContext(String keyFile, String trustFile)
-            throws Exception {
-
-        KeyStore ks = KeyStore.getInstance("JKS");
-        KeyStore ts = KeyStore.getInstance("JKS");
-
-        char[] passphrase = "passphrase".toCharArray();
-
-        ks.load(new FileInputStream(keyFile), passphrase);
-        ts.load(new FileInputStream(trustFile), passphrase);
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, passphrase);
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(ts);
-
-        SSLContext sslCtx = SSLContext.getInstance("TLS");
-
-        sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-
-        return sslCtx;
-    }
-
-    private void createBuffers() {
-        // Size the buffers as appropriate.
-
-        SSLSession session = ssle1.getSession();
-        int appBufferMax = session.getApplicationBufferSize();
-        int netBufferMax = session.getPacketBufferSize();
-
-        appIn1 = ByteBuffer.allocateDirect(appBufferMax + 50);
-        appIn2 = ByteBuffer.allocateDirect(appBufferMax + 50);
-
-        oneToTwo = ByteBuffer.allocateDirect(netBufferMax);
-        twoToOne = ByteBuffer.allocateDirect(netBufferMax);
-
-        appOut1 = ByteBuffer.wrap("Hi Engine2, I'm SSLEngine1".getBytes());
-        appOut2 = ByteBuffer.wrap("Hello Engine1, I'm SSLEngine2".getBytes());
-
-        log("AppOut1 = " + appOut1);
-        log("AppOut2 = " + appOut2);
-        log("");
-    }
-
-    private static void runDelegatedTasks(SSLEngine engine) throws Exception {
-
-        Runnable runnable;
-        while ((runnable = engine.getDelegatedTask()) != null) {
-            log("running delegated task...");
-            runnable.run();
-        }
-    }
-
-    private static void checkTransfer(ByteBuffer a, ByteBuffer b)
-            throws Exception {
-        a.flip();
-        b.flip();
-
-        if (!a.equals(b)) {
-            throw new Exception("Data didn't transfer cleanly");
-        } else {
-            log("Data transferred cleanly");
-        }
-
-        a.position(a.limit());
-        b.position(b.limit());
-        a.limit(a.capacity());
-        b.limit(b.capacity());
-    }
-
-    private static void log(String str) {
-        if (debug) {
-            System.out.println(str);
-        }
-    }
-}

--- a/test/javax/net/ssl/SSLEngine/ConnectionTest.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,684 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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 4495742
- * @summary Add non-blocking SSL/TLS functionality, usable with any
- *      I/O abstraction
- *
- * This is a bit hacky, meant to test various conditions.  The main
- * thing I wanted to do with this was to do buffer reads/writes
- * when buffers were not empty.  (buffer.position() = 10)
- * The code could certainly be tightened up a lot.
- *
- * @author Brad Wetmore
- *
- * @run main/othervm ConnectionTest
- */
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-
-public class ConnectionTest {
-
-    private SSLContext sslc;
-    private SSLEngine ssle1;
-    private SSLEngine ssle2;
-
-    private static String pathToStores = "../etc";
-    private static String keyStoreFile = "keystore";
-    private static String trustStoreFile = "truststore";
-    private static String passwd = "passphrase";
-
-    private static String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-    private static String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-    private ByteBuffer appIn1, appOut1;
-    private ByteBuffer appIn2, appOut2;
-    private ByteBuffer oneToTwo, twoToOne;
-    private ByteBuffer emptyBuffer;
-
-    private ByteBuffer  oneToTwoShifter, twoToOneShifter;
-
-    private String hostname = "hostname";
-    private int portNumber = 77;
-
-    public ConnectionTest()
-            throws Exception {
-
-        sslc = getSSLContext();
-        ssle1 = sslc.createSSLEngine(hostname, portNumber);
-        ssle2 = sslc.createSSLEngine();
-
-        ssle1.setEnabledCipherSuites(new String [] {
-            "SSL_RSA_WITH_RC4_128_MD5"});
-
-        ssle2.setEnabledCipherSuites(new String [] {
-            "SSL_RSA_WITH_RC4_128_MD5"});
-
-        createBuffers();
-    }
-
-    private SSLContext getSSLContext() throws Exception {
-        KeyStore ks = KeyStore.getInstance("JKS");
-        KeyStore ts = KeyStore.getInstance("JKS");
-        char[] passphrase = "passphrase".toCharArray();
-
-        ks.load(new FileInputStream(keyFilename), passphrase);
-        ts.load(new FileInputStream(trustFilename), passphrase);
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, passphrase);
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(ts);
-
-        SSLContext sslCtx = SSLContext.getInstance("TLS");
-
-        sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-
-        return sslCtx;
-    }
-
-    private void createBuffers() {
-        // Size the buffers as appropriate.
-        SSLSession session = ssle1.getSession();
-        int appBufferMax = session.getApplicationBufferSize();
-        int netBufferMax = session.getPacketBufferSize();
-
-        appIn1 = ByteBuffer.allocateDirect(appBufferMax + 10);
-        appIn2 = ByteBuffer.allocateDirect(appBufferMax + 10);
-
-        appIn1.position(10);
-        appIn2.position(10);
-
-        oneToTwo = ByteBuffer.allocateDirect(netBufferMax + 10);
-        twoToOne = ByteBuffer.allocateDirect(netBufferMax + 10);
-
-        oneToTwo.position(10);
-        twoToOne.position(10);
-        oneToTwoShifter = oneToTwo.slice();
-        twoToOneShifter = twoToOne.slice();
-
-        appOut1 = ByteBuffer.wrap("Hi Engine2, I'm SSLEngine1".getBytes());
-        appOut2 = ByteBuffer.wrap("Hello Engine1, I'm SSLEngine2".getBytes());
-
-        emptyBuffer = ByteBuffer.allocate(10);
-        emptyBuffer.limit(5);
-        emptyBuffer.position(emptyBuffer.limit());
-
-        System.out.println("AppOut1 = " + appOut1);
-        System.out.println("AppOut2 = " + appOut2);
-        System.out.println();
-    }
-
-    private void checkResult(SSLEngineResult result, Status status,
-            HandshakeStatus hsStatus, int consumed, int produced,
-            boolean done) throws Exception {
-
-        if ((status != null) && (result.getStatus() != status)) {
-            throw new Exception("Unexpected Status: need = " + status +
-                " got = " + result.getStatus());
-        }
-
-        if ((hsStatus != null) && (result.getHandshakeStatus() != hsStatus)) {
-            throw new Exception("Unexpected hsStatus: need = " + hsStatus +
-                " got = " + result.getHandshakeStatus());
-        }
-
-        if ((consumed != -1) && (consumed != result.bytesConsumed())) {
-            throw new Exception("Unexpected consumed: need = " + consumed +
-                " got = " + result.bytesConsumed());
-        }
-
-        if ((produced != -1) && (produced != result.bytesProduced())) {
-            throw new Exception("Unexpected produced: need = " + produced +
-                " got = " + result.bytesProduced());
-        }
-
-        if (done && (hsStatus == HandshakeStatus.FINISHED)) {
-            throw new Exception(
-                "Handshake already reported finished");
-        }
-
-    }
-
-    private boolean isHandshaking(SSLEngine e) {
-        return (e.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING);
-    }
-
-    private void test() throws Exception {
-        ssle1.setUseClientMode(true);
-        ssle2.setUseClientMode(false);
-        ssle2.setNeedClientAuth(true);
-
-        System.out.println("Testing for early unwrap/wrap");
-        SSLEngineResult result1 = ssle1.unwrap(twoToOne, appIn1);
-        SSLEngineResult result2 = ssle2.wrap(appOut2, oneToTwo);
-
-        /*
-         * These should not consume/produce data, because they
-         * are client and server, respectively, and don't
-         * start handshaking this way.
-         */
-        checkResult(result1, Status.OK, HandshakeStatus.NEED_WRAP,
-            0, 0, false);
-        checkResult(result2, Status.OK, HandshakeStatus.NEED_UNWRAP,
-            0, 0, false);
-
-        System.out.println("Doing Initial Handshake");
-
-        boolean done1 = false;
-        boolean done2 = false;
-
-        /*
-         * Do initial handshaking
-         */
-        while (isHandshaking(ssle1) ||
-                isHandshaking(ssle2)) {
-
-            System.out.println("================");
-
-            result1 = ssle1.wrap(emptyBuffer, oneToTwo);
-            checkResult(result1, null, null, 0, -1, done1);
-            result2 = ssle2.wrap(emptyBuffer, twoToOne);
-            checkResult(result2, null, null, 0, -1, done2);
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done1 = true;
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done2 = true;
-            }
-
-            System.out.println("wrap1 = " + result1);
-            System.out.println("wrap2 = " + result2);
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle1.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle2.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            oneToTwo.flip();
-            twoToOne.flip();
-
-            oneToTwo.position(10);
-            twoToOne.position(10);
-
-            System.out.println("----");
-
-            result1 = ssle1.unwrap(twoToOne, appIn1);
-            checkResult(result1, null, null, -1, 0, done1);
-            result2 = ssle2.unwrap(oneToTwo, appIn2);
-            checkResult(result2, null, null, -1, 0, done2);
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done1 = true;
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done2 = true;
-            }
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle1.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle2.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            System.out.println("unwrap1 = " + result1);
-            System.out.println("unwrap2 = " + result2);
-
-            oneToTwoShifter.position(oneToTwo.position() - 10);
-            oneToTwoShifter.limit(oneToTwo.limit() - 10);
-            twoToOneShifter.position(twoToOne.position() - 10);
-            twoToOneShifter.limit(twoToOne.limit() - 10);
-            oneToTwoShifter.compact();
-            twoToOneShifter.compact();
-            oneToTwo.position(oneToTwoShifter.position() + 10);
-            oneToTwo.limit(oneToTwoShifter.limit() + 10);
-            twoToOne.position(twoToOneShifter.position() + 10);
-            twoToOne.limit(twoToOneShifter.limit() + 10);
-        }
-
-        System.out.println("\nDONE HANDSHAKING");
-        System.out.println("================");
-
-        if (!done1 || !done2) {
-            throw new Exception("Both should be true:\n" +
-                " done1 = " + done1 + " done2 = " + done2);
-        }
-
-        String host = ssle1.getPeerHost();
-        int port = ssle1.getPeerPort();
-        if (!host.equals(hostname) || (port != portNumber)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        host = ssle2.getPeerHost();
-        port = ssle2.getPeerPort();
-        if ((host != null) || (port != -1)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        SSLSession ssls1 = ssle1.getSession();
-
-        host = ssls1.getPeerHost();
-        port = ssls1.getPeerPort();
-        if (!host.equals(hostname) || (port != portNumber)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        SSLSession ssls2 = ssle2.getSession();
-
-        host = ssls2.getPeerHost();
-        port = ssls2.getPeerPort();
-        if ((host != null) || (port != -1)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        /*
-         * Should be able to write/read a small buffer like this.
-         */
-        int appOut1Len = appOut1.remaining();
-        int appOut2Len = appOut2.remaining();
-        int net1Len;
-        int net2Len;
-
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(result1, Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            appOut1Len, -1, false);
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(result2, Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            appOut2Len, -1, false);
-        net1Len = result1.bytesProduced();
-        net2Len = result2.bytesProduced();
-
-        System.out.println("wrap1 = " + result1);
-        System.out.println("wrap2 = " + result2);
-
-        oneToTwo.flip();
-        twoToOne.flip();
-
-        oneToTwo.position(10);
-        twoToOne.position(10);
-
-        System.out.println("----");
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(result1, Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            net2Len, appOut2Len, false);
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(result2, Status.OK, HandshakeStatus.NOT_HANDSHAKING,
-            net1Len, appOut1Len, false);
-
-        System.out.println("unwrap1 = " + result1);
-        System.out.println("unwrap2 = " + result2);
-
-        oneToTwoShifter.position(oneToTwo.position() - 10);
-        oneToTwoShifter.limit(oneToTwo.limit() - 10);
-        twoToOneShifter.position(twoToOne.position() - 10);
-        twoToOneShifter.limit(twoToOne.limit() - 10);
-        oneToTwoShifter.compact();
-        twoToOneShifter.compact();
-        oneToTwo.position(oneToTwoShifter.position() + 10);
-        oneToTwo.limit(oneToTwoShifter.limit() + 10);
-        twoToOne.position(twoToOneShifter.position() + 10);
-        twoToOne.limit(twoToOneShifter.limit() + 10);
-
-        ssls2.invalidate();
-        ssle2.beginHandshake();
-
-        System.out.println("\nRENEGOTIATING");
-        System.out.println("=============");
-
-        done1 = false;
-        done2 = false;
-
-        appIn1.clear();
-        appIn2.clear();
-
-        /*
-         * Do a quick test to see if this can do a switch
-         * into client mode, at this point, you shouldn't be able
-         * to switch back.
-         */
-        try {
-            System.out.println("Try to change client mode");
-            ssle2.setUseClientMode(true);
-            throw new Exception("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            System.out.println("Caught correct IllegalArgumentException");
-        }
-
-        while (isHandshaking(ssle1) ||
-                isHandshaking(ssle2)) {
-
-            System.out.println("================");
-
-            result1 = ssle1.wrap(emptyBuffer, oneToTwo);
-            checkResult(result1, null, null, 0, -1, done1);
-            result2 = ssle2.wrap(emptyBuffer, twoToOne);
-            checkResult(result2, null, null, 0, -1, done2);
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done1 = true;
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done2 = true;
-            }
-
-            System.out.println("wrap1 = " + result1);
-            System.out.println("wrap2 = " + result2);
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle1.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle2.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            oneToTwo.flip();
-            twoToOne.flip();
-
-            oneToTwo.position(10);
-            twoToOne.position(10);
-
-            System.out.println("----");
-
-            result1 = ssle1.unwrap(twoToOne, appIn1);
-            checkResult(result1, null, null, -1, 0, done1);
-            result2 = ssle2.unwrap(oneToTwo, appIn2);
-            checkResult(result2, null, null, -1, 0, done2);
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done1 = true;
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-                done2 = true;
-            }
-
-            System.out.println("unwrap1 = " + result1);
-            System.out.println("unwrap2 = " + result2);
-
-            if (result1.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle1.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            if (result2.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-                Runnable runnable;
-                while ((runnable = ssle2.getDelegatedTask()) != null) {
-                    runnable.run();
-                }
-            }
-
-            oneToTwoShifter.position(oneToTwo.position() - 10);
-            oneToTwoShifter.limit(oneToTwo.limit() - 10);
-            twoToOneShifter.position(twoToOne.position() - 10);
-            twoToOneShifter.limit(twoToOne.limit() - 10);
-            oneToTwoShifter.compact();
-            twoToOneShifter.compact();
-            oneToTwo.position(oneToTwoShifter.position() + 10);
-            oneToTwo.limit(oneToTwoShifter.limit() + 10);
-            twoToOne.position(twoToOneShifter.position() + 10);
-            twoToOne.limit(twoToOneShifter.limit() + 10);
-        }
-
-        host = ssle1.getPeerHost();
-        port = ssle1.getPeerPort();
-        if (!host.equals(hostname) || (port != portNumber)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        host = ssle2.getPeerHost();
-        port = ssle2.getPeerPort();
-        if ((host != null) || (port != -1)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        SSLSession ssls3 = ssle2.getSession();
-
-        host = ssls1.getPeerHost();
-        port = ssls1.getPeerPort();
-        if (!host.equals(hostname) || (port != portNumber)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        SSLSession ssls4 = ssle2.getSession();
-
-        host = ssls2.getPeerHost();
-        port = ssls2.getPeerPort();
-        if ((host != null) || (port != -1)) {
-            throw new Exception("unexpected host/port " + host + ":" + port);
-        }
-
-        System.out.println("\nDoing close");
-        System.out.println("===========");
-
-        ssle1.closeOutbound();
-        ssle2.closeOutbound();
-
-        oneToTwo.flip();
-        twoToOne.flip();
-        oneToTwo.position(10);
-        twoToOne.position(10);
-
-        appIn1.clear();
-        appIn2.clear();
-
-        System.out.println("LAST UNWRAP");
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(result1, Status.BUFFER_UNDERFLOW,
-            HandshakeStatus.NEED_WRAP, 0, 0, false);
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(result2, Status.BUFFER_UNDERFLOW,
-            HandshakeStatus.NEED_WRAP, 0, 0, false);
-
-        System.out.println("unwrap1 = " + result1);
-        System.out.println("unwrap2 = " + result2);
-
-        oneToTwoShifter.position(oneToTwo.position() - 10);
-        oneToTwoShifter.limit(oneToTwo.limit() - 10);
-        twoToOneShifter.position(twoToOne.position() - 10);
-        twoToOneShifter.limit(twoToOne.limit() - 10);
-        oneToTwoShifter.compact();
-        twoToOneShifter.compact();
-        oneToTwo.position(oneToTwoShifter.position() + 10);
-        oneToTwo.limit(oneToTwoShifter.limit() + 10);
-        twoToOne.position(twoToOneShifter.position() + 10);
-        twoToOne.limit(twoToOneShifter.limit() + 10);
-
-        System.out.println("LAST WRAP");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(result1, Status.CLOSED, HandshakeStatus.NEED_UNWRAP,
-            0, -1, false);
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(result2, Status.CLOSED, HandshakeStatus.NEED_UNWRAP,
-            0, -1, false);
-
-        System.out.println("wrap1 = " + result1);
-        System.out.println("wrap2 = " + result2);
-
-        net1Len = result1.bytesProduced();
-        net2Len = result2.bytesProduced();
-
-        oneToTwo.flip();
-        twoToOne.flip();
-
-        oneToTwo.position(10);
-        twoToOne.position(10);
-
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(result1, Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING,
-            net1Len, 0, false);
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(result2, Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING,
-            net2Len, 0, false);
-
-        System.out.println("unwrap1 = " + result1);
-        System.out.println("unwrap2 = " + result2);
-
-        oneToTwoShifter.position(oneToTwo.position() - 10);
-        oneToTwoShifter.limit(oneToTwo.limit() - 10);
-        twoToOneShifter.position(twoToOne.position() - 10);
-        twoToOneShifter.limit(twoToOne.limit() - 10);
-        oneToTwoShifter.compact();
-        twoToOneShifter.compact();
-        oneToTwo.position(oneToTwoShifter.position() + 10);
-        oneToTwo.limit(oneToTwoShifter.limit() + 10);
-        twoToOne.position(twoToOneShifter.position() + 10);
-        twoToOne.limit(twoToOneShifter.limit() + 10);
-
-        System.out.println("EXTRA WRAP");
-        result1 = ssle1.wrap(appOut1, oneToTwo);
-        checkResult(result1, Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING,
-            0, 0, false);
-        result2 = ssle2.wrap(appOut2, twoToOne);
-        checkResult(result2, Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING,
-            0, 0, false);
-
-        System.out.println("wrap1 = " + result1);
-        System.out.println("wrap2 = " + result2);
-
-        oneToTwo.flip();
-        twoToOne.flip();
-        oneToTwo.position(10);
-        twoToOne.position(10);
-
-        System.out.println("EXTRA UNWRAP");
-        result1 = ssle1.unwrap(twoToOne, appIn1);
-        checkResult(result1, Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING,
-            0, 0, false);
-        result2 = ssle2.unwrap(oneToTwo, appIn2);
-        checkResult(result2, Status.CLOSED, HandshakeStatus.NOT_HANDSHAKING,
-            0, 0, false);
-
-        System.out.println("unwrap1 = " + result1);
-        System.out.println("unwrap2 = " + result2);
-
-        checkSession(ssls1, ssls2, ssls3, ssls4);
-        System.out.println(ssle1);
-        System.out.println(ssle2);
-    }
-
-    private static void checkSession(SSLSession ssls1, SSLSession ssls2,
-            SSLSession ssls3, SSLSession ssls4) throws Exception {
-        System.out.println("\nSession Info for SSLEngine1");
-        System.out.println(ssls1);
-        System.out.println(ssls1.getCreationTime());
-        String peer1 = ssls1.getPeerHost();
-        System.out.println(peer1);
-        String protocol1 = ssls1.getProtocol();
-        System.out.println(protocol1);
-        java.security.cert.Certificate cert1 = ssls1.getPeerCertificates()[0];
-        System.out.println(cert1);
-        String ciphersuite1 = ssls1.getCipherSuite();
-        System.out.println(ciphersuite1);
-        System.out.println();
-
-        System.out.println("\nSession Info for SSLEngine2");
-        System.out.println(ssls2);
-        System.out.println(ssls2.getCreationTime());
-        String peer2 = ssls2.getPeerHost();
-        System.out.println(peer2);
-        String protocol2 = ssls2.getProtocol();
-        System.out.println(protocol2);
-        java.security.cert.Certificate cert2 = ssls2.getPeerCertificates()[0];
-        System.out.println(cert2);
-        String ciphersuite2 = ssls2.getCipherSuite();
-        System.out.println(ciphersuite2);
-        System.out.println();
-
-        if (peer1.equals(peer2)) {
-            throw new Exception("peer hostnames not equal");
-        }
-
-        if (!protocol1.equals(protocol2)) {
-            throw new Exception("protocols not equal");
-        }
-
-        if (!cert1.equals(cert2)) {
-            throw new Exception("certs not equal");
-        }
-
-        if (!ciphersuite1.equals(ciphersuite2)) {
-            throw new Exception("ciphersuites not equal");
-        }
-
-        System.out.println("\nSession Info for SSLEngine3");
-        System.out.println(ssls3);
-        System.out.println("\nSession Info for SSLEngine4");
-        System.out.println(ssls4);
-
-        if (ssls3.equals(ssls1) || ssls4.equals(ssls2)) {
-            throw new Exception("sessions should not be equals");
-        }
-    }
-
-    public static void main(String args[]) throws Exception {
-        // reset the security property to make sure that the algorithms
-        // and keys used in this test are not disabled.
-        Security.setProperty("jdk.tls.disabledAlgorithms", "");
-
-        ConnectionTest ct = new ConnectionTest();
-        ct.test();
-    }
-}

--- a/test/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 2004, 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 4981697
- * @summary Rework the X509KeyManager to avoid incompatibility issues
- * @author Brad R. Wetmore
- */
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-
-public class ExtendedKeyEngine {
-
-    private static boolean debug = false;
-
-    private SSLContext sslc;
-    private SSLEngine ssle1;    // client
-    private SSLEngine ssle2;    // server
-
-    private static String pathToStores = "../etc";
-    private static String keyStoreFile = "keystore";
-    private static String trustStoreFile = "truststore";
-    private static String passwd = "passphrase";
-
-    private static String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-    private static String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-    private ByteBuffer appOut1;         // write side of ssle1
-    private ByteBuffer appIn1;          // read side of ssle1
-    private ByteBuffer appOut2;         // write side of ssle2
-    private ByteBuffer appIn2;          // read side of ssle2
-
-    private ByteBuffer oneToTwo;        // "reliable" transport ssle1->ssle2
-    private ByteBuffer twoToOne;        // "reliable" transport ssle2->ssle1
-
-    /*
-     * Majority of the test case is here, setup is done below.
-     */
-    private void createSSLEngines() throws Exception {
-        ssle1 = sslc.createSSLEngine("client", 1);
-        ssle1.setUseClientMode(true);
-
-        ssle2 = sslc.createSSLEngine();
-        ssle2.setUseClientMode(false);
-        ssle2.setNeedClientAuth(true);
-    }
-
-    private void runTest() throws Exception {
-        boolean dataDone = false;
-
-        createSSLEngines();
-        createBuffers();
-
-        SSLEngineResult result1;        // ssle1's results from last operation
-        SSLEngineResult result2;        // ssle2's results from last operation
-
-        while (!isEngineClosed(ssle1) || !isEngineClosed(ssle2)) {
-
-            log("================");
-
-            result1 = ssle1.wrap(appOut1, oneToTwo);
-            result2 = ssle2.wrap(appOut2, twoToOne);
-
-            log("wrap1:  " + result1);
-            log("oneToTwo  = " + oneToTwo);
-            log("");
-
-            log("wrap2:  " + result2);
-            log("twoToOne  = " + twoToOne);
-
-            runDelegatedTasks(result1, ssle1);
-            runDelegatedTasks(result2, ssle2);
-
-            oneToTwo.flip();
-            twoToOne.flip();
-
-            log("----");
-
-            result1 = ssle1.unwrap(twoToOne, appIn1);
-            result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-            log("unwrap1: " + result1);
-            log("twoToOne  = " + twoToOne);
-            log("");
-
-            log("unwrap2: " + result2);
-            log("oneToTwo  = " + oneToTwo);
-
-            runDelegatedTasks(result1, ssle1);
-            runDelegatedTasks(result2, ssle2);
-
-            oneToTwo.compact();
-            twoToOne.compact();
-
-            /*
-             * If we've transfered all the data between app1 and app2,
-             * we try to close and see what that gets us.
-             */
-            if (!dataDone && (appOut1.limit() == appIn2.position()) &&
-                    (appOut2.limit() == appIn1.position())) {
-
-                checkTransfer(appOut1, appIn2);
-                checkTransfer(appOut2, appIn1);
-
-                log("Closing ssle1's *OUTBOUND*...");
-                ssle1.closeOutbound();
-                dataDone = true;
-            }
-        }
-    }
-
-    public static void main(String args[]) throws Exception {
-
-        ExtendedKeyEngine test;
-
-        System.out.println("This test should run to completion");
-        test = new ExtendedKeyEngine(true);
-        test.createSSLEngines();
-        test.runTest();
-        System.out.println("Done!");
-
-        System.out.println("This test should fail with a Handshake Error");
-        test = new ExtendedKeyEngine(false);
-        test.createSSLEngines();
-
-        try {
-            test.runTest();
-        } catch (SSLHandshakeException e) {
-            System.out.println(
-                "Caught proper exception, should be 'no suites in common'");
-            e.printStackTrace();
-        }
-
-        System.out.println("Test Passed.");
-    }
-
-    /*
-     * **********************************************************
-     * Majority of the test case is above, below is just setup stuff
-     * **********************************************************
-     */
-
-    public ExtendedKeyEngine(boolean abs) throws Exception {
-        sslc = getSSLContext(keyFilename, trustFilename, abs);
-    }
-
-    /*
-     * Create an initialized SSLContext to use for this test.
-     */
-    private SSLContext getSSLContext(String keyFile, String trustFile,
-            boolean abs) throws Exception {
-
-        KeyStore ks = KeyStore.getInstance("JKS");
-        KeyStore ts = KeyStore.getInstance("JKS");
-
-        char[] passphrase = "passphrase".toCharArray();
-
-        ks.load(new FileInputStream(keyFile), passphrase);
-        ts.load(new FileInputStream(trustFile), passphrase);
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, passphrase);
-
-        KeyManager [] kms = kmf.getKeyManagers();
-        if (abs) {
-            kms = new KeyManager [] {
-                new MyX509ExtendedKeyManager((X509ExtendedKeyManager)kms[0])
-            };
-        } else {
-            kms = new KeyManager [] {
-                new MyX509KeyManager((X509KeyManager)kms[0])
-            };
-        }
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(ts);
-        TrustManager [] tms = tmf.getTrustManagers();
-
-        SSLContext sslCtx = SSLContext.getInstance("TLS");
-
-        sslCtx.init(kms, tms, null);
-
-        return sslCtx;
-    }
-
-    private void createBuffers() {
-        // Size the buffers as appropriate.
-
-        SSLSession session = ssle1.getSession();
-        int appBufferMax = session.getApplicationBufferSize();
-        int netBufferMax = session.getPacketBufferSize();
-
-        appIn1 = ByteBuffer.allocateDirect(appBufferMax + 50);
-        appIn2 = ByteBuffer.allocateDirect(appBufferMax + 50);
-
-        oneToTwo = ByteBuffer.allocateDirect(netBufferMax);
-        twoToOne = ByteBuffer.allocateDirect(netBufferMax);
-
-        appOut1 = ByteBuffer.wrap("Hi Engine2, I'm SSLEngine1".getBytes());
-        appOut2 = ByteBuffer.wrap("Hello Engine1, I'm SSLEngine2".getBytes());
-
-        log("AppOut1 = " + appOut1);
-        log("AppOut2 = " + appOut2);
-        log("");
-    }
-
-    private static void runDelegatedTasks(SSLEngineResult result,
-            SSLEngine engine) throws Exception {
-
-        if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-            Runnable runnable;
-            while ((runnable = engine.getDelegatedTask()) != null) {
-                log("running delegated task...");
-                runnable.run();
-            }
-        }
-    }
-
-    private static boolean isEngineClosed(SSLEngine engine) {
-        return (engine.isOutboundDone() && engine.isInboundDone());
-    }
-
-    private static void checkTransfer(ByteBuffer a, ByteBuffer b)
-            throws Exception {
-        a.flip();
-        b.flip();
-
-        if (!a.equals(b)) {
-            throw new Exception("Data didn't transfer cleanly");
-        } else {
-            log("Data transferred cleanly");
-        }
-
-        a.position(a.limit());
-        b.position(b.limit());
-        a.limit(a.capacity());
-        b.limit(b.capacity());
-    }
-
-    private static void log(String str) {
-        if (debug) {
-            System.out.println(str);
-        }
-    }
-}

--- a/test/javax/net/ssl/SSLEngine/IllegalRecordVersion.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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.
- */
-
-// This test case relies on updated static security property, no way to re-use
-// security property in samevm/agentvm mode.
-
-/*
- * @test
- * @bug 8042449
- * @summary Issue for negative byte major record version
- *
- * @run main/othervm IllegalRecordVersion
- */
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-
-public class IllegalRecordVersion {
-
-    public static void main(String args[]) throws Exception {
-        SSLContext context = SSLContext.getDefault();
-
-        SSLEngine cliEngine = context.createSSLEngine();
-        cliEngine.setUseClientMode(true);
-        SSLEngine srvEngine = context.createSSLEngine();
-        srvEngine.setUseClientMode(false);
-
-        SSLSession session = cliEngine.getSession();
-        int netBufferMax = session.getPacketBufferSize();
-        int appBufferMax = session.getApplicationBufferSize();
-
-        ByteBuffer cliToSrv = ByteBuffer.allocateDirect(netBufferMax);
-        ByteBuffer srvIBuff = ByteBuffer.allocateDirect(appBufferMax + 50);
-        ByteBuffer cliOBuff = ByteBuffer.wrap("I'm client".getBytes());
-
-
-        System.out.println("client hello (record version(0xa9, 0xa2))");
-        SSLEngineResult cliRes = cliEngine.wrap(cliOBuff, cliToSrv);
-        System.out.println("Client wrap result: " + cliRes);
-        cliToSrv.flip();
-        if (cliToSrv.limit() > 5) {
-            cliToSrv.put(1, (byte)0xa9);
-            cliToSrv.put(2, (byte)0xa2);
-        }
-
-        try {
-            srvEngine.unwrap(cliToSrv, srvIBuff);
-            throw new Exception(
-                "Cannot catch the unsupported record version issue");
-        } catch (SSLException e) {
-            // get the expected exception
-        }
-    }
-}

--- a/test/javax/net/ssl/SSLEngine/LargeBufs.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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 4495742
- * @summary Add non-blocking SSL/TLS functionality, usable with any
- *      I/O abstraction
- *
- * This is to test larger buffer arrays, and make sure the maximum
- * is being passed.
- *
- * @run main/othervm -Djsse.enableCBCProtection=false LargeBufs
- *
- * @author Brad R. Wetmore
- */
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-import java.util.Random;
-
-public class LargeBufs {
-
-    private static boolean debug = false;
-
-    private SSLContext sslc;
-    static private SSLEngine ssle1;     // client
-    static private SSLEngine ssle2;     // server
-
-    private static String pathToStores = "../etc";
-    private static String keyStoreFile = "keystore";
-    private static String trustStoreFile = "truststore";
-    private static String passwd = "passphrase";
-
-    private static String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-    private static String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-    private ByteBuffer appOut1;         // write side of ssle1
-    private ByteBuffer appIn1;          // read side of ssle1
-    private ByteBuffer appOut2;         // write side of ssle2
-    private ByteBuffer appIn2;          // read side of ssle2
-
-    private ByteBuffer oneToTwo;        // "reliable" transport ssle1->ssle2
-    private ByteBuffer twoToOne;        // "reliable" transport ssle2->ssle1
-
-    private int appBufferMax;
-    private int netBufferMax;
-    private int OFFSET = 37;
-
-    /*
-     * Majority of the test case is here, setup is done below.
-     */
-    private void createSSLEngines() throws Exception {
-        ssle1 = sslc.createSSLEngine("client", 1);
-        ssle1.setUseClientMode(true);
-
-        ssle2 = sslc.createSSLEngine();
-        ssle2.setUseClientMode(false);
-        ssle2.setNeedClientAuth(true);
-    }
-
-    private void runTest(String cipher) throws Exception {
-        boolean dataDone = false;
-
-        createSSLEngines();
-
-        System.out.println("Using " + cipher);
-        ssle1.setEnabledCipherSuites(new String [] { cipher });
-        ssle2.setEnabledCipherSuites(new String [] { cipher });
-
-        createBuffers();
-
-        SSLEngineResult result1;        // ssle1's results from last operation
-        SSLEngineResult result2;        // ssle2's results from last operation
-
-        while (!isEngineClosed(ssle1) || !isEngineClosed(ssle2)) {
-
-            log("================");
-
-            result1 = ssle1.wrap(appOut1, oneToTwo);
-            result2 = ssle2.wrap(appOut2, twoToOne);
-
-            if ((result1.bytesConsumed() != 0) &&
-                (result1.bytesConsumed() != appBufferMax) &&
-                (result1.bytesConsumed() != OFFSET)) {
-                throw new Exception("result1: " + result1);
-            }
-
-            if ((result2.bytesConsumed() != 0) &&
-                (result2.bytesConsumed() != appBufferMax) &&
-                (result2.bytesConsumed() != 2 * OFFSET)) {
-                throw new Exception("result1: " + result1);
-            }
-
-            log("wrap1:  " + result1);
-            log("oneToTwo  = " + oneToTwo);
-            log("");
-
-            log("wrap2:  " + result2);
-            log("twoToOne  = " + twoToOne);
-
-            runDelegatedTasks(result1, ssle1);
-            runDelegatedTasks(result2, ssle2);
-
-            oneToTwo.flip();
-            twoToOne.flip();
-
-            log("----");
-
-            result1 = ssle1.unwrap(twoToOne, appIn1);
-            result2 = ssle2.unwrap(oneToTwo, appIn2);
-
-            if ((result1.bytesProduced() != 0) &&
-                (result1.bytesProduced() != appBufferMax) &&
-                (result1.bytesProduced() != 2 * OFFSET)) {
-                throw new Exception("result1: " + result1);
-            }
-
-            if ((result2.bytesProduced() != 0) &&
-                (result2.bytesProduced() != appBufferMax) &&
-                (result2.bytesProduced() != OFFSET)) {
-                throw new Exception("result1: " + result1);
-            }
-
-            log("unwrap1: " + result1);
-            log("twoToOne  = " + twoToOne);
-            log("");
-
-            log("unwrap2: " + result2);
-            log("oneToTwo  = " + oneToTwo);
-
-            runDelegatedTasks(result1, ssle1);
-            runDelegatedTasks(result2, ssle2);
-
-            oneToTwo.compact();
-            twoToOne.compact();
-
-            /*
-             * If we've transfered all the data between app1 and app2,
-             * we try to close and see what that gets us.
-             */
-            if (!dataDone && (appOut1.limit() == appIn2.position()) &&
-                    (appOut2.limit() == appIn1.position())) {
-
-                checkTransfer(appOut1, appIn2);
-                checkTransfer(appOut2, appIn1);
-
-                log("Closing ssle1's *OUTBOUND*...");
-                ssle1.closeOutbound();
-                dataDone = true;
-            }
-        }
-    }
-
-    public static void main(String args[]) throws Exception {
-        // reset the security property to make sure that the algorithms
-        // and keys used in this test are not disabled.
-        Security.setProperty("jdk.tls.disabledAlgorithms", "");
-
-        LargeBufs test;
-
-        test = new LargeBufs();
-        test.runTest("SSL_RSA_WITH_RC4_128_MD5");
-
-        test = new LargeBufs();
-        test.runTest("SSL_RSA_WITH_3DES_EDE_CBC_SHA");
-
-        System.out.println("Test Passed.");
-    }
-
-    /*
-     * **********************************************************
-     * Majority of the test case is above, below is just setup stuff
-     * **********************************************************
-     */
-
-    public LargeBufs() throws Exception {
-        sslc = getSSLContext(keyFilename, trustFilename);
-    }
-
-    /*
-     * Create an initialized SSLContext to use for this test.
-     */
-    private SSLContext getSSLContext(String keyFile, String trustFile)
-            throws Exception {
-
-        KeyStore ks = KeyStore.getInstance("JKS");
-        KeyStore ts = KeyStore.getInstance("JKS");
-
-        char[] passphrase = "passphrase".toCharArray();
-
-        ks.load(new FileInputStream(keyFile), passphrase);
-        ts.load(new FileInputStream(trustFile), passphrase);
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, passphrase);
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(ts);
-
-        SSLContext sslCtx = SSLContext.getInstance("TLS");
-
-        sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-
-        return sslCtx;
-    }
-
-    private void createBuffers() {
-        // Size the buffers as appropriate.
-
-        SSLSession session = ssle1.getSession();
-
-        // The maximum application buffer should calculate like
-        // appBufferMax = session.getApplicationBufferSize();
-        // however, the getApplicationBufferSize() doesn't guarantee
-        // that the ability to concume or produce applicaton data upto
-        // the size. 16384 is the default JSSE implementation maximum
-        // application size that could be consumed and produced.
-        appBufferMax = 16384;
-        netBufferMax = session.getPacketBufferSize();
-
-        Random random = new Random();
-        byte [] one = new byte [appBufferMax * 5 + OFFSET];
-        byte [] two = new byte [appBufferMax * 5 + 2 * OFFSET];
-
-        random.nextBytes(one);
-        random.nextBytes(two);
-
-        appOut1 = ByteBuffer.wrap(one);
-        appOut2 = ByteBuffer.wrap(two);
-
-        appIn1 = ByteBuffer.allocate(appBufferMax * 6);
-        appIn2 = ByteBuffer.allocate(appBufferMax * 6);
-
-        oneToTwo = ByteBuffer.allocateDirect(netBufferMax);
-        twoToOne = ByteBuffer.allocateDirect(netBufferMax);
-
-        System.out.println("Testing arrays of: " + one.length +
-            " and " + two.length);
-
-        log("AppOut1 = " + appOut1);
-        log("AppOut2 = " + appOut2);
-        log("");
-    }
-
-    private static void runDelegatedTasks(SSLEngineResult result,
-            SSLEngine engine) throws Exception {
-
-        if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-            Runnable runnable;
-            while ((runnable = engine.getDelegatedTask()) != null) {
-                log("running delegated task...");
-                runnable.run();
-            }
-        }
-    }
-
-    private static boolean isEngineClosed(SSLEngine engine) {
-        return (engine.isOutboundDone() && engine.isInboundDone());
-    }
-
-    private static void checkTransfer(ByteBuffer a, ByteBuffer b)
-            throws Exception {
-        a.flip();
-        b.flip();
-
-        if (!a.equals(b)) {
-            throw new Exception("Data didn't transfer cleanly");
-        } else {
-            log("Data transferred cleanly");
-        }
-    }
-
-    private static void log(String str) {
-        if (debug) {
-            System.out.println(str);
-        }
-    }
-}

--- a/test/javax/net/ssl/SSLEngine/NoAuthClientAuth.java	Tue Aug 25 16:27:54 2020 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,399 +0,0 @@
-/*
- * Copyright (c) 2003, 2011, 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 4495742
- * @summary Demonstrate SSLEngine switch from no client auth to client auth.
- * @run main/othervm NoAuthClientAuth
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
- *
- * @author Brad R. Wetmore
- */
-
-/**
- * A SSLEngine usage example which simplifies the presentation
- * by removing the I/O and multi-threading concerns.
- *
- * The test creates two SSLEngines, simulating a client and server.
- * The "transport" layer consists two byte buffers:  think of them
- * as directly connected pipes.
- *
- * Note, this is a *very* simple example: real code will be much more
- * involved.  For example, different threading and I/O models could be
- * used, transport mechanisms could close unexpectedly, and so on.
- *
- * When this application runs, notice that several messages
- * (wrap/unwrap) pass before any application data is consumed or
- * produced.  (For more information, please see the SSL/TLS
- * specifications.)  There may several steps for a successful handshake,
- * so it's typical to see the following series of operations:
- *
- *      client          server          message
- *      ======          ======          =======
- *      wrap()          ...             ClientHello
- *      ...             unwrap()        ClientHello
- *      ...             wrap()          ServerHello/Certificate
- *      unwrap()        ...             ServerHello/Certificate
- *      wrap()          ...             ClientKeyExchange
- *      wrap()          ...             ChangeCipherSpec
- *      wrap()          ...             Finished
- *      ...             unwrap()        ClientKeyExchange
- *      ...             unwrap()        ChangeCipherSpec
- *      ...             unwrap()        Finished
- *      ...             wrap()          ChangeCipherSpec
- *      ...             wrap()          Finished
- *      unwrap()        ...             ChangeCipherSpec
- *      unwrap()        ...             Finished
- *
- * In this example, we do a rehandshake and make sure that completes
- * correctly.
- */
-
-import javax.net.ssl.*;
-import javax.net.ssl.SSLEngineResult.*;
-import java.io.*;
-import java.security.*;
-import java.nio.*;
-
-public class NoAuthClientAuth {
-
-    /*
-     * Enables logging of the SSLEngine operations.
-     */
-    private static boolean logging = true;
-
-    /*
-     * Enables the JSSE system debugging system property:
-     *
-     *     -Djavax.net.debug=all
-     *
-     * This gives a lot of low-level information about operations underway,
-     * including specific handshake messages, and might be best examined
-     * after gaining some familiarity with this application.
-     */
-    private static boolean debug = false;
-
-    private SSLContext sslc;
-
-    private SSLEngine clientEngine;     // client Engine
-    private ByteBuffer clientOut;       // write side of clientEngine
-    private ByteBuffer clientIn;        // read side of clientEngine
-
-    private SSLEngine serverEngine;     // server Engine
-    private ByteBuffer serverOut;       // write side of serverEngine
-    private ByteBuffer serverIn;        // read side of serverEngine
-
-    /*
-     * For data transport, this example uses local ByteBuffers.  This
-     * isn't really useful, but the purpose of this example is to show
-     * SSLEngine concepts, not how to do network transport.
-     */
-    private ByteBuffer cTOs;            // "reliable" transport client->server
-    private ByteBuffer sTOc;            // "reliable" transport server->client
-
-    /*
-     * The following is to set up the keystores.
-     */
-    private static String pathToStores = "../etc";
-    private static String keyStoreFile = "keystore";
-    private static String trustStoreFile = "truststore";
-    private static String passwd = "passphrase";
-
-    private static String keyFilename =
-            System.getProperty("test.src", ".") + "/" + pathToStores +
-                "/" + keyStoreFile;
-    private static String trustFilename =
-            System.getProperty("test.src", ".") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-    /*
-     * Main entry point for this test.
-     */
-    public static void main(String args[]) throws Exception {
-        if (debug) {
-            System.setProperty("javax.net.debug", "all");
-        }
-
-        NoAuthClientAuth test = new NoAuthClientAuth();
-        test.runTest();
-
-        System.out.println("Test Passed.");
-    }
-
-    /*
-     * Create an initialized SSLContext to use for these tests.
-     */
-    public NoAuthClientAuth() throws Exception {
-
-        KeyStore ks = KeyStore.getInstance("JKS");
-        KeyStore ts = KeyStore.getInstance("JKS");
-
-        char[] passphrase = "passphrase".toCharArray();
-
-        ks.load(new FileInputStream(keyFilename), passphrase);
-        ts.load(new FileInputStream(trustFilename), passphrase);
-
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        kmf.init(ks, passphrase);
-
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        tmf.init(ts);
-
-        SSLContext sslCtx = SSLContext.getInstance("TLS");
-
-        sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-
-        sslc = sslCtx;
-    }
-
-    /*
-     * Run the test.
-     *
-     * Sit in a tight loop, both engines calling wrap/unwrap regardless
-     * of whether data is available or not.  We do this until both engines
-     * report back they are closed.
-     *
-     * The main loop handles all of the I/O phases of the SSLEngine's
-     * lifetime:
-     *
-     *     initial handshaking
-     *     application data transfer
-     *     engine closing
-     *
-     * One could easily separate these phases into separate
-     * sections of code.
-     */
-    private void runTest() throws Exception {
-
-        createSSLEngines();
-        createBuffers();
-
-        SSLEngineResult clientResult;   // results from client's last operation
-        SSLEngineResult serverResult;   // results from server's last operation
-
-        /*
-         * Examining the SSLEngineResults could be much more involved,
-         * and may alter the overall flow of the application.
-         *
-         * For example, if we received a BUFFER_OVERFLOW when trying
-         * to write to the output pipe, we could reallocate a larger
-         * pipe, but instead we wait for the peer to drain it.
-         */
-        int hsCompleted = 0;
-        while (!isEngineClosed(clientEngine) ||
-                !isEngineClosed(serverEngine)) {
-
-            log("================");
-
-            clientResult = clientEngine.wrap(clientOut, cTOs);
-            log("client wrap: ", clientResult);
-            runDelegatedTasks(clientResult, clientEngine);
-            clientOut.rewind();
-
-            serverResult = serverEngine.wrap(serverOut, sTOc);
-            log("server wrap: ", serverResult);
-            runDelegatedTasks(serverResult, serverEngine);
-            serverOut.rewind();
-
-            // Jeanfrancois:
-            // Here is the main rehandshaking step.
-            if (serverResult.getHandshakeStatus() ==
-                    HandshakeStatus.FINISHED) {
-                hsCompleted++;
-                log("\t" + hsCompleted + " handshake completed");
-                if (hsCompleted == 1) {
-                    try {
-                        serverEngine.getSession().getPeerCertificates();
-                        throw new Exception("Should have got exception");
-                    } catch (SSLPeerUnverifiedException e) {
-                        System.out.println("Caught proper exception." + e);
-                    }
-                    log("\tInvalidating session, setting client auth, " +
-                        " starting rehandshake");
-                    serverEngine.getSession().invalidate();
-                    serverEngine.setNeedClientAuth(true);
-                    serverEngine.beginHandshake();
-                } else if (hsCompleted == 2) {
-                    java.security.cert.Certificate [] certs =
-                        serverEngine.getSession().getPeerCertificates();
-                    System.out.println("Client Certificate(s) received");
-                    for (java.security.cert.Certificate c : certs) {
-                        System.out.println(c);
-                    }
-                    log("Closing server.");
-                    serverEngine.closeOutbound();
-                } // nothing.
-            }
-
-            cTOs.flip();
-            sTOc.flip();
-
-            log("----");
-
-            clientResult = clientEngine.unwrap(sTOc, clientIn);
-            log("client unwrap: ", clientResult);
-            runDelegatedTasks(clientResult, clientEngine);
-            clientIn.clear();
-
-            serverResult = serverEngine.unwrap(cTOs, serverIn);
-            log("server unwrap: ", serverResult);
-            runDelegatedTasks(serverResult, serverEngine);
-            serverIn.clear();
-
-            cTOs.compact();
-            sTOc.compact();
-        }
-    }
-
-    /*
-     * Using the SSLContext created during object creation,
-     * create/configure the SSLEngines we'll use for this test.
-     */
-    private void createSSLEngines() throws Exception {
-        /*
-         * Configure the serverEngine to act as a server in the SSL/TLS
-         * handshake.  Also, require SSL client authentication.
-         */
-        serverEngine = sslc.createSSLEngine();
-        serverEngine.setUseClientMode(false);
-        serverEngine.setNeedClientAuth(false);
-
-        /*
-         * Similar to above, but using client mode instead.
-         */
-        clientEngine = sslc.createSSLEngine("client", 80);
-        clientEngine.setUseClientMode(true);
-    }
-
-    /*
-     * Create and size the buffers appropriately.
-     */
-    private void createBuffers() {
-
-        /*
-         * We'll assume the buffer sizes are the same
-         * between client and server.
-         */
-        SSLSession session = clientEngine.getSession();
-        int appBufferMax = session.getApplicationBufferSize();
-        int netBufferMax = session.getPacketBufferSize();
-
-        /*
-         * We'll make the input buffers a bit bigger than the max needed
-         * size, so that unwrap()s following a successful data transfer
-         * won't generate BUFFER_OVERFLOWS.
-         *
-         * We'll use a mix of direct and indirect ByteBuffers for
-         * tutorial purposes only.  In reality, only use direct
-         * ByteBuffers when they give a clear performance enhancement.
-         */
-        clientIn = ByteBuffer.allocate(appBufferMax + 50);
-        serverIn = ByteBuffer.allocate(appBufferMax + 50);
-
-        cTOs = ByteBuffer.allocateDirect(netBufferMax);
-        sTOc = ByteBuffer.allocateDirect(netBufferMax);
-
-        clientOut = ByteBuffer.wrap("Hi Server, I'm Client".getBytes());
-        serverOut = ByteBuffer.wrap("Hello Client, I'm Server".getBytes());
-    }
-
-    /*
-     * If the result indicates that we have outstanding tasks to do,
-     * go ahead and run them in this thread.
-     */
-    private static void runDelegatedTasks(SSLEngineResult result,
-            SSLEngine engine) throws Exception {
-
-        if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
-            Runnable runnable;
-            while ((runnable = engine.getDelegatedTask()) != null) {
-                log("\trunning delegated task...");
-                runnable.run();
-            }
-            HandshakeStatus hsStatus = engine.getHandshakeStatus();
-            if (hsStatus == HandshakeStatus.NEED_TASK) {
-                throw new Exception(
-                    "handshake shouldn't need additional tasks");
-            }
-            log("\tnew HandshakeStatus: " + hsStatus);
-        }
-    }
-
-    private static boolean isEngineClosed(SSLEngine engine) {
-        return (engine.isOutboundDone() && engine.isInboundDone());
-    }
-
-    /*
-     * Simple check to make sure everything came across as expected.
-     */
-    private static void checkTransfer(ByteBuffer a, ByteBuffer b)
-            throws Exception {
-        a.flip();
-        b.flip();
-
-        if (!a.equals(b)) {
-            throw new Exception("Data didn't transfer cleanly");
-        } else {
-            log("\tData transferred cleanly");
-        }
-
-        a.position(a.limit());
-        b.position(b.limit());
-        a.limit(a.capacity());
-        b.limit(b.capacity());
-    }
-
-    /*
-     * Logging code
-     */
-    private static boolean resultOnce = true;
-
-    private static void log(String str, SSLEngineResult result) {
-        if (!logging) {
-            return;
-        }
-        if (resultOnce) {
-            resultOnce = false;
-            System.out.println("The format of the SSLEngineResult is: \n" +
-                "\t\"getStatus() / getHandshakeStatus()\" +\n" +
-                "\t\"bytesConsumed() / bytesProduced()\"\n");
-        }
-        HandshakeStatus hsStatus = result.getHandshakeStatus();
-        log(str +
-            result.getStatus() + "/" + hsStatus + ", " +
-            result.bytesConsumed() + "/" + result.bytesProduced() +
-            " bytes");
-        if (hsStatus == HandshakeStatus.FINISHED) {
-            log("\t...ready for application data");
-        }
-    }
-
-    private static void log(String str) {
-        if (logging) {
-            System.out.println(str);
-        }
-    }
-}