From 29e9cba970fdbbd2192c8d2de1e93a03b1b0d1e1 Mon Sep 17 00:00:00 2001
From: Martin Balao <mbalao@redhat.com>
Date: Fri, 29 Nov 2024 09:16:46 -0500
Subject: [PATCH] Undo SunNativeProvider provider changes. They will be
 implemented in JDK-8345221.

---
 .../sun/security/action/PutAllAction.java     | 56 +++++++++++++++++++
 .../jgss/wrapper/SunNativeProvider.java       | 24 ++++----
 2 files changed, 68 insertions(+), 12 deletions(-)
 create mode 100644 src/java.base/share/classes/sun/security/action/PutAllAction.java

diff --git a/src/java.base/share/classes/sun/security/action/PutAllAction.java b/src/java.base/share/classes/sun/security/action/PutAllAction.java
new file mode 100644
index 0000000000000..d8b17993213e7
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/action/PutAllAction.java
@@ -0,0 +1,56 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.action;
+
+import java.util.Map;
+
+import java.security.Provider;
+import java.security.PrivilegedAction;
+
+/**
+ * A convenience PrivilegedAction class for setting the properties of
+ * a provider. See the SunRsaSign provider for a usage example.
+ *
+ * @see sun.security.rsa.SunRsaSign
+ * @author  Andreas Sterbenz
+ * @since   1.5
+ */
+public class PutAllAction implements PrivilegedAction<Void> {
+
+    private final Provider provider;
+    private final Map<?, ?> map;
+
+    public PutAllAction(Provider provider, Map<?, ?> map) {
+        this.provider = provider;
+        this.map = map;
+    }
+
+    public Void run() {
+        provider.putAll(map);
+        return null;
+    }
+
+}
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
index a7a3fe11ed917..00ba08f102843 100644
--- a/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
+++ b/src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
@@ -26,6 +26,7 @@
 package sun.security.jgss.wrapper;
 
 import java.io.Serial;
+import java.util.HashMap;
 import java.security.Provider;
 
 import jdk.internal.util.OperatingSystem;
@@ -63,10 +64,10 @@ static void debug(String message) {
         System.err.println(NAME + ": " + message);
     }
 
-    private static final Oid[] MECH_OIDS = constructMechMap();
+    private static final HashMap<String, String> MECH_MAP = constructMechMap();
 
     @SuppressWarnings("restricted")
-    private static Oid[] constructMechMap() {
+    private static HashMap<String, String> constructMechMap() {
         try {
             // Ensure the InetAddress class is loaded before
             // loading j2gss. The library will access this class
@@ -111,29 +112,28 @@ private static Oid[] constructMechMap() {
                      debug("Loaded GSS library: " + libName);
                  }
                  Oid[] mechs = GSSLibStub.indicateMechs();
-                 if (DEBUG) {
-                     for (Oid mech : mechs) {
-                         debug("Native MF for " + mech);
+                 HashMap<String, String> map = new HashMap<>();
+                 for (int i = 0; i < mechs.length; i++) {
+                     if (DEBUG) {
+                         debug("Native MF for " + mechs[i]);
                      }
+                     map.put("GssApiMechanism." + mechs[i], MF_CLASS);
                  }
-                 return mechs;
+                 return map;
              }
          }
          return null;
      }
 
-    // initialize INSTANCE after MECH_OIDS is constructed
+    // initialize INSTANCE after MECH_MAP is constructed
     static final Provider INSTANCE = new SunNativeProvider();
 
     public SunNativeProvider() {
         /* We are the Sun NativeGSS provider */
         super(NAME, PROVIDER_VER, INFO);
 
-        if (MECH_OIDS != null) {
-            for (Oid mech : MECH_OIDS) {
-                putService(new Service(this, "GssApiMechanism",
-                        mech.toString(), MF_CLASS, null, null));
-            }
+        if (MECH_MAP != null) {
+            putAll(MECH_MAP);
         }
     }
 }