changeset 13488:8eacda982ccf

Sync from Linux changes in 8u202.
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 10 Feb 2019 09:27:00 -0800
parents 6490216c9b38
children c8bb92cfa42d
files src/share/lib/security/java.security-bsd src/solaris/classes/sun/nio/fs/BsdFileSystem.java test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java test/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java test/java/nio/file/Files/probeContentType/ParallelProbes.java test/javax/swing/LookAndFeel/8145547/DemandGTK.java
diffstat 6 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/lib/security/java.security-bsd	Sat Feb 09 18:57:03 2019 -0800
+++ b/src/share/lib/security/java.security-bsd	Sun Feb 10 09:27:00 2019 -0800
@@ -619,8 +619,8 @@
 #
 # Example:
 #   jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
-jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \
-    EC keySize < 224, DES40_CBC, RC4_40, 3DES_EDE_CBC
+jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \
+    EC keySize < 224, 3DES_EDE_CBC, anon, NULL
 
 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS)
 # processing in JSSE implementation.
--- a/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	Sat Feb 09 18:57:03 2019 -0800
+++ b/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	Sun Feb 10 09:27:00 2019 -0800
@@ -73,7 +73,7 @@
      * Returns object to iterate over mount entries
      */
     @Override
-    Iterable<UnixMountEntry> getMountEntries() {
+    List<UnixMountEntry> getMountEntries() {
         ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>();
         try {
             long iter = BsdNativeDispatcher.getfsstat();
--- a/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java	Sat Feb 09 18:57:03 2019 -0800
+++ b/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java	Sun Feb 10 09:27:00 2019 -0800
@@ -25,7 +25,7 @@
  * @bug 8157827
  * @summary AWT_Desktop/Automated/Exceptions/BasicTest loads incorrect GTK
  * version when jdk.gtk.version=3
- * @requires (os.family == "linux")
+ * @requires (os.family == "linux") | (os.family == "bsd")
  * @run main DesktopGtkLoadTest
  */
 
--- a/test/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java	Sat Feb 09 18:57:03 2019 -0800
+++ b/test/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java	Sun Feb 10 09:27:00 2019 -0800
@@ -25,7 +25,7 @@
  * @bug 8156121
  * @summary "Fail forward" fails for GTK3 if no GTK2 available
  * @modules java.desktop/sun.awt
- * @requires (os.family == "linux")
+ * @requires (os.family == "linux") | (os.family == "bsd")
  * @run main GtkVersionTest
  */
 
--- a/test/java/nio/file/Files/probeContentType/ParallelProbes.java	Sat Feb 09 18:57:03 2019 -0800
+++ b/test/java/nio/file/Files/probeContentType/ParallelProbes.java	Sun Feb 10 09:27:00 2019 -0800
@@ -28,7 +28,7 @@
 
 /* @test
  * @summary Test probing content type simultaneously from multiple threads.
- * @requires (os.family == "linux") | (os.family == "solaris")
+ * @requires (os.family == "linux") | (os.family == "solaris") | (os.family == "bsd")
  * @run main ParallelProbes 10
  */
 public class ParallelProbes {
--- a/test/javax/swing/LookAndFeel/8145547/DemandGTK.java	Sat Feb 09 18:57:03 2019 -0800
+++ b/test/javax/swing/LookAndFeel/8145547/DemandGTK.java	Sun Feb 10 09:27:00 2019 -0800
@@ -26,7 +26,7 @@
   @summary  Tests that GTK LaF is supported on solaris
             regardless of jdk.gtk.version flag values.
   @bug 8156121
-  @requires (os.name == "linux" | os.name == "solaris")
+  @requires (os.family == "linux" | os.family == "solaris" | os.family == "bsd")
   @run main/othervm -Djdk.gtk.version=2 DemandGTK
   @run main/othervm -Djdk.gtk.version=3 DemandGTK
 */