--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 1998 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4162868
+ * @summary Algorithm Name-to-OID mapping needs to be made extensible.
+ */
+
+import java.security.*;
+import sun.security.x509.AlgorithmId;
+
+public class ExtensibleAlgorithmId {
+
+    public static void main(String[] args) throws Exception {
+        TestProvider p = new TestProvider();
+        Security.addProvider(p);
+        AlgorithmId algid = AlgorithmId.getAlgorithmId("XYZ");
+        String alias = "Alg.Alias.Signature.OID." + algid.toString();
+        String stdAlgName = p.getProperty(alias);
+        if (stdAlgName == null || !stdAlgName.equalsIgnoreCase("XYZ")) {
+            throw new Exception("Wrong OID");
+        }
+    }
+}
+
+class TestProvider extends Provider {
+
+    public TestProvider() {
+        super("Dummy", 1.0, "XYZ algorithm");
+
+        AccessController.doPrivileged(new PrivilegedAction() {
+            public Object run() {
+
+                put("Signature.XYZ", "test.xyz");
+                // preferred OID
+                put("Alg.Alias.Signature.OID.1.2.3.4.5.6.7.8.9.0",
+                    "XYZ");
+                put("Alg.Alias.Signature.9.8.7.6.5.4.3.2.1.0",
+                    "XYZ");
+                return null;
+            }
+        });
+    }
+}