< prev index next >

test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java

Print this page
rev 14340 : 8202343: Disable TLS 1.0 and 1.1
Reviewed-by: xuelei, dfuchs, coffeys

*** 1,7 **** /* ! * Copyright (c) 2003, 2013, 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. --- 1,7 ---- /* ! * 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.
*** 20,33 **** * or visit www.oracle.com if you need additional information or have any * questions. */ /* ! * test * @bug 7126889 * @summary Incorrect SSLEngine debug output ! * * Debug output was reporting n+1 bytes of data was written when it was * really was n. * * SunJSSE does not support dynamic system properties, no way to re-use * system properties in samevm/agentvm mode. --- 20,36 ---- * or visit www.oracle.com if you need additional information or have any * questions. */ /* ! * @test * @bug 7126889 * @summary Incorrect SSLEngine debug output ! * @library /lib /lib/security ! * @run main DebugReportsOneExtraByte ! */ ! /* * Debug output was reporting n+1 bytes of data was written when it was * really was n. * * SunJSSE does not support dynamic system properties, no way to re-use * system properties in samevm/agentvm mode.
*** 73,100 **** import javax.net.ssl.SSLEngineResult.*; import java.io.*; import java.security.*; import java.nio.*; public class DebugReportsOneExtraByte { /* * 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 --- 76,95 ---- import javax.net.ssl.SSLEngineResult.*; import java.io.*; import java.security.*; import java.nio.*; + import jdk.test.lib.process.OutputAnalyzer; + import jdk.test.lib.process.ProcessTools; + public class DebugReportsOneExtraByte { /* * Enables logging of the SSLEngine operations. */ private static boolean logging = true; private SSLContext sslc; private SSLEngine clientEngine; // client Engine private ByteBuffer clientOut; // write side of clientEngine private ByteBuffer clientIn; // read side of clientEngine
*** 128,145 **** /* * Main entry point for this test. */ public static void main(String args[]) throws Exception { - if (debug) { - System.setProperty("javax.net.debug", "all"); - } ! DebugReportsOneExtraByte test = new DebugReportsOneExtraByte(); ! test.runTest(); System.out.println("Test Passed."); } /* * Create an initialized SSLContext to use for these tests. */ --- 123,147 ---- /* * Main entry point for this test. */ public static void main(String args[]) throws Exception { ! if (args.length == 0) { ! OutputAnalyzer output = ProcessTools.executeTestJvm( ! "-Dtest.src=" + System.getProperty("test.src"), ! "-Djavax.net.debug=all", "DebugReportsOneExtraByte", "p"); ! output.shouldContain("WRITE: TLS10 application_data, length = 8"); System.out.println("Test Passed."); + } else { + // Re-enable TLSv1 since test depends on it + SecurityUtils.removeFromDisabledTlsAlgs("TLSv1"); + + DebugReportsOneExtraByte test = new DebugReportsOneExtraByte(); + test.runTest(); + } } /* * Create an initialized SSLContext to use for these tests. */
< prev index next >