8293412: Remove unnecessary java.security.egd overrides

Reviewed-by: mdoerr Backport-of: 79d163d
SAP · Jan 8, 2025 · 96100ad · 96100ad
1 parent 34fd121
commit 96100ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/test/jdk/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java b/test/jdk/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, 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
@@ -26,7 +26,7 @@
  * @bug 6998583 8141039
  * @summary NativeSeedGenerator is making 8192 byte read requests from
  *             entropy pool on each init.
- * @run main/othervm -Djava.security.egd=file:/dev/random SeedGeneratorChoice
+ * @run main/othervm -Djava.security.egd=file:/dev/urandom SeedGeneratorChoice
  * @run main/othervm -Djava.security.egd=file:filename  SeedGeneratorChoice
  */
 

diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
@@ -1036,15 +1036,9 @@ private static OutputAnalyzer execTool(String toolPath, String... args)
         long start = System.currentTimeMillis();
         try {
             String[] cmd;
-            if (Platform.isWindows()) {
-                cmd = new String[args.length + 3];
-                System.arraycopy(args, 0, cmd, 3, args.length);
-            } else {
-                cmd = new String[args.length + 4];
-                cmd[3] = "-J-Djava.security.egd=file:/dev/./urandom";
-                System.arraycopy(args, 0, cmd, 4, args.length);
-            }
 
+            cmd = new String[args.length + 3];
+            System.arraycopy(args, 0, cmd, 3, args.length);
             cmd[0] = toolPath;
             cmd[1] = "-J-Duser.language=en";
             cmd[2] = "-J-Duser.country=US";

diff --git a/test/lib/jdk/test/lib/SecurityTools.java b/test/lib/jdk/test/lib/SecurityTools.java
@@ -40,8 +40,7 @@
 /**
  * Run security tools (including jarsigner and keytool) in a new process.
  * The en_US locale is always used so a test can always match output to
- * English text. {@code /dev/urandom} is used as entropy source so tool will
- * not block because of entropy scarcity. An argument can be a normal string,
+ * English text.  An argument can be a normal string,
  * {@code -Jvm-options}, {@code $sysProp} or {@code -J$sysProp}.
  */
 public class SecurityTools {
@@ -58,9 +57,6 @@ public static ProcessBuilder getProcessBuilder(String tool, List<String> args) {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(tool)
                 .addVMArg("-Duser.language=en")
                 .addVMArg("-Duser.country=US");
-        if (!Platform.isWindows()) {
-            launcher.addVMArg("-Djava.security.egd=file:/dev/./urandom");
-        }
         for (String arg : args) {
             if (arg.startsWith("-J")) {
                 String jarg = arg.substring(2);