8028127: Regtest java/security/Security/SynchronizedAccess.java is incorrect

Reviewed-by: wetmore, mdonovan, rhalade

test/jdk/java/security/Security/SynchronizedAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -23,13 +23,15 @@
 
 /*
  * @test
- * @bug 4162583 7054918 8130181
- * @library ../testlibrary
+ * @bug 4162583 7054918 8130181 8028127
+ * @library /test/lib ../testlibrary
  * @summary Make sure Provider api implementations are synchronized properly
  */
 
 import java.security.*;
 
+import jdk.test.lib.Asserts;
+
 public class SynchronizedAccess {
 
     public static void main(String[] args) throws Exception {
@@ -42,52 +44,105 @@ public class SynchronizedAccess {
     }
 
     public static void main0(String[] args) throws Exception {
+        var providersCountBefore = Security.getProviders().length;
         AccessorThread[] acc = new AccessorThread[200];
-        for (int i=0; i < acc.length; i++)
-            acc[i] = new AccessorThread("thread"+i);
-        for (int i=0; i < acc.length; i++)
+        for (int i = 0; i < acc.length; i++) {
+            acc[i] = new AccessorThread("thread" + i);
+        }
+        for (int i = 0; i < acc.length; i++) {
             acc[i].start();
-        for (int i=0; i < acc.length; i++)
+        }
+        for (int i = 0; i < acc.length; i++) {
             acc[i].join();
-    }
-}
-
-class AccessorThread extends Thread {
-
-    public AccessorThread(String str) {
-        super(str);
+        }
+        var providersCountAfter = Security.getProviders().length;
+        Asserts.assertEquals(providersCountBefore, providersCountAfter);
     }
 
-    public void run() {
-        Provider[] provs = new Provider[10];
-        for (int i=0; i < provs.length; i++)
-            provs[i] = new MyProvider("name"+i, "1", "test");
+    static class AccessorThread extends Thread {
 
-        int rounds = 20;
-        while (rounds-- > 0) {
-            try {
-                for (int i=0; i<provs.length; i++) {
+        public AccessorThread(String str) {
+            super(str);
+        }
+
+        public void run() {
+            Provider[] provs = new Provider[10];
+            for (int i = 0; i < provs.length; i++) {
+                provs[i] = new MyProvider("name" + i, "1", "test");
+            }
+
+            int rounds = 20;
+            while (rounds-- > 0) {
+                for (int i = 0; i < provs.length; i++) {
+                    // Might install (>=0) or not (-1) if already installed
                     Security.addProvider(provs[i]);
+                    Thread.yield();
                 }
-                Signature sig = Signature.getInstance("sigalg");
-                for (int i=0; i<provs.length; i++) {
-                    Security.removeProvider("name"+i);
+
+                try {
+                    Signature.getInstance("sigalg");
+                    Thread.yield();
+                } catch (NoSuchAlgorithmException nsae) {
+                    // All providers may have been deregistered.  Ok.
                 }
-                provs = Security.getProviders();
-            } catch (NoSuchAlgorithmException nsae) {
+
+                for (int i = 0; i < provs.length; i++) {
+                    // Might or might not remove (silent return)
+                    Security.removeProvider("name" + i);
+                    Thread.yield();
+                }
+            } // while
+        }
+
+        public static final class MyProvider extends Provider {
+            public MyProvider(String name, String version, String info) {
+                super(name, version, info);
+                put("Signature.sigalg", SigImpl.class.getName());
+            }
+        }
+
+        public static final class SigImpl extends Signature {
+
+            public SigImpl() {
+                super(null);
             }
 
-            try {
-                Thread.sleep(5);
-            } catch (InterruptedException ie) {
+            @Override
+            protected void engineInitVerify(PublicKey publicKey) {
             }
-        } // while
-    }
-}
 
-class MyProvider extends Provider {
-    public MyProvider(String name, String version, String info) {
-        super(name, version, info);
-        put("Signature.sigalg", "sigimpl");
+            @Override
+            protected void engineInitSign(PrivateKey privateKey) {
+            }
+
+            @Override
+            protected void engineUpdate(byte b) {
+            }
+
+            @Override
+            protected void engineUpdate(byte[] b, int off, int len) {
+            }
+
+            @Override
+            protected byte[] engineSign() {
+                return new byte[0];
+            }
+
+            @Override
+            protected boolean engineVerify(byte[] sigBytes) {
+                return false;
+            }
+
+            @Override
+            protected void engineSetParameter(String param, Object value)
+                    throws InvalidParameterException {
+            }
+
+            @Override
+            protected Object engineGetParameter(String param)
+                    throws InvalidParameterException {
+                return null;
+            }
+        }
     }
-}
+}