Merge

loongson · Jul 26, 2024 · adb4c27 · adb4c27
2 parents 30363d7 + 1050982
commit adb4c27
Show file tree

Hide file tree

Showing 9 changed files with 213 additions and 27 deletions.
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -2017,11 +2017,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
     static  Elf32_Half running_arch_code=EM_68K;
   #elif  (defined AARCH64)
     static  Elf32_Half running_arch_code=EM_AARCH64;
-  #elif  (defined LOONGARCH)
+  #elif  (defined LOONGARCH64)
     static  Elf32_Half running_arch_code=EM_LOONGARCH;
   #else
     #error Method os::dll_load requires that one of following is defined:\
-         IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, __mips64, PARISC, M68K, AARCH64, LOONGARCH
+         IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, __mips64, PARISC, M68K, AARCH64, LOONGARCH64
   #endif
 
   // Identify compatability class for VM's architecture and library's architecture

diff --git a/jdk/make/data/cacerts/globalsigne46 b/jdk/make/data/cacerts/globalsigne46
@@ -0,0 +1,20 @@
+Owner: CN=GlobalSign Root E46, O=GlobalSign nv-sa, C=BE
+Issuer: CN=GlobalSign Root E46, O=GlobalSign nv-sa, C=BE
+Serial number: 11d2bbba336ed4bce62468c50d841d98e843
+Valid from: Wed Mar 20 00:00:00 GMT 2019 until: Tue Mar 20 00:00:00 GMT 2046
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYx
+CzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQD
+ExNHbG9iYWxTaWduIFJvb3QgRTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAw
+MDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2Ex
+HDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkBjtjq
+R+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGdd
+yXqBPCCjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
+7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZkvLtoURMMA/cVi4RguYv/Uo7njLwcAjA8
++RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
+-----END CERTIFICATE-----
diff --git a/jdk/make/data/cacerts/globalsignr46 b/jdk/make/data/cacerts/globalsignr46
@@ -0,0 +1,38 @@
+Owner: CN=GlobalSign Root R46, O=GlobalSign nv-sa, C=BE
+Issuer: CN=GlobalSign Root R46, O=GlobalSign nv-sa, C=BE
+Serial number: 11d2bbb9d723189e405f0a9d2dd0df2567d1
+Valid from: Wed Mar 20 00:00:00 GMT 2019 until: Tue Mar 20 00:00:00 GMT 2046
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUA
+MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYD
+VQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMy
+MDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYt
+c2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08EsCVeJ
+OaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQG
+vGIFAha/r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud
+316HCkD7rRlr+/fKYIje2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo
+0q3v84RLHIf8E6M6cqJaESvWJ3En7YEtbWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSE
+y132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvjK8Cd+RTyG/FWaha/LIWF
+zXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD412lPFzYE
++cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCN
+I/onccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzs
+x2sZy/N78CsHpdlseVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqa
+ByFrgY/bxFn63iLABJzjqls2k+g9vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC
+4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEMBQADggIBAHx4
+7PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
+JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti
+2kM3S+LGteWygxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIk
+pnnpHs6i58FZFZ8d4kuaPp92CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRF
+FRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZmOUdkLG5NrmJ7v2B0GbhWrJKsFjLt
+rWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qqJZ4d16GLuc1CLgSk
+ZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwyeqiv5
+u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP
+4vkYxboznxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6
+N3ec592kD3ZDZopD8p/7DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3
+vouXsXgxT7PntgMTzlSdriVZzH81Xwj3QEUxeCp6
+-----END CERTIFICATE-----
diff --git a/jdk/make/data/charsetmapping/IBM943.c2b b/jdk/make/data/charsetmapping/IBM943.c2b
@@ -0,0 +1,49 @@
+#
+#    source: 34B003AF.RPMAP130
+#    c->b only entries
+#
+815C	2015
+8160	FF5E
+8161	2225
+817C	FF0D
+88A0	555E
+898B	7130
+89A8	9DD7
+8A9A	5699
+8BA0	4FE0
+8BEB	8EC0
+8C71	7E6B
+8C74	8346
+8CB2	9E7C
+8D8D	9EB4
+8DF2	6805
+8EC6	5C62
+8F4A	7E61
+8FD3	8523
+8FDD	91AC
+90E4	87EC
+917E	6414
+9189	7626
+91CB	9A52
+925C	7C1E
+92CD	6451
+9355	5861
+935E	985A
+9398	79B1
+93C0	7006
+9458	56CA
+948D	525D
+94AC	6F51
+94AE	91B1
+966A	9830
+96CB	9EB5
+9789	840A
+9858	881F
+9BA0	5C5B
+9DB7	6522
+9E94	688E
+E379	7E48
+E445	8141
+E8F6	9839
+FA55	FFE4
+FA59	F86F
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
@@ -390,9 +390,4 @@ sample/chatserver/ChatTest.java					8178912 generic-all
 
 ############################################################################
 security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#certignarootca         8331883 generic-all
-security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#globalsigneccrootcar4  8328825 generic-all
-security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar1            8328825 generic-all
-security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootcar2            8328825 generic-all
-security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar3         8328825 generic-all
-security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#gtsrootecccar4         8328825 generic-all
 security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java                       8314509 generic-all
diff --git a/jdk/test/java/beans/XMLEncoder/Test4625418.java b/jdk/test/java/beans/XMLEncoder/Test4625418.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, 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,7 +23,7 @@
 
 /*
  * @test
- * @bug 4625418
+ * @bug 4625418 8239965
  * @summary Tests XML <a href="http://download.java.net/jdk6/docs/technotes/guides/intl/encoding.doc.html">encoding</a>
  * @author Sergey Malenkov
  * @run main/timeout=360 Test4625418
@@ -126,7 +126,7 @@ public final class Test4625418 implements ExceptionListener {
         //"Cp939",
         //"Cp942",
         //"Cp942C",
-        "Cp943",
+        //"Cp943",
         //"Cp943C",
         "Cp948",
         "Cp949",
@@ -307,7 +307,7 @@ public final class Test4625418 implements ExceptionListener {
         //"x-IBM939",
         //"x-IBM942",
         //"x-IBM942C",
-        "x-IBM943",
+        //"x-IBM943",
         //"x-IBM943C",
         "x-IBM948",
         "x-IBM949",

diff --git a/jdk/test/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java b/jdk/test/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
@@ -207,8 +207,7 @@
  * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
  * @library /test/lib
  * @build jtreg.SkippedException ValidatePathWithURL CAInterop
- * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsigneccrootcar4 OCSP
- * @run main/othervm -Djava.security.debug=certpath CAInterop globalsigneccrootcar4 CRL
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsigneccrootcar4 DEFAULT
  */
 
 /*
@@ -217,8 +216,7 @@
  * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
  * @library /test/lib
  * @build jtreg.SkippedException ValidatePathWithURL CAInterop
- * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootcar1 OCSP
- * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootcar1 CRL
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootcar1 DEFAULT
  */
 
 /*
@@ -227,8 +225,7 @@
  * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
  * @library /test/lib
  * @build jtreg.SkippedException ValidatePathWithURL CAInterop
- * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootcar2 OCSP
- * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootcar2 CRL
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootcar2 DEFAULT
  */
 
 /*
@@ -237,8 +234,7 @@
  * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
  * @library /test/lib
  * @build jtreg.SkippedException ValidatePathWithURL CAInterop
- * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootecccar3 OCSP
- * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootecccar3 CRL
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootecccar3 DEFAULT
  */
 
 /*
@@ -247,8 +243,7 @@
  * @summary Interoperability tests with Google's GlobalSign R4 and GTS Root certificates
  * @library /test/lib
  * @build jtreg.SkippedException ValidatePathWithURL CAInterop
- * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootecccar4 OCSP
- * @run main/othervm -Djava.security.debug=certpath CAInterop gtsrootecccar4 CRL
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop gtsrootecccar4 DEFAULT
  */
 
 /*
@@ -469,6 +464,26 @@
  * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop certainlyroote1 DEFAULT
  */
 
+/*
+ * @test id=globalsignr46
+ * @bug 8316138
+ * @summary Interoperability tests with GlobalSign Root R46
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsignr46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsignr46 CRL
+ */
+
+/*
+ * @test id=globalsigne46
+ * @bug 8316138
+ * @summary Interoperability tests with GlobalSign Root E46
+ * @library /test/lib
+ * @build jtreg.SkippedException ValidatePathWithURL CAInterop
+ * @run main/othervm -Djava.security.debug=certpath,ocsp CAInterop globalsigne46 OCSP
+ * @run main/othervm -Djava.security.debug=certpath CAInterop globalsigne46 CRL
+ */
+
 /**
  * Collection of certificate validation tests for interoperability with external CAs
  */
@@ -638,6 +653,13 @@ private CATestURLs getTestURLs(String alias) {
                     return new CATestURLs("https://valid.root-e1.certainly.com",
                             "https://revoked.root-e1.certainly.com");
 
+            case "globalsignr46":
+                    return new CATestURLs("https://valid.r46.roots.globalsign.com",
+                            "https://revoked.r46.roots.globalsign.com");
+            case "globalsigne46":
+                    return new CATestURLs("https://valid.e46.roots.globalsign.com",
+                            "https://revoked.e46.roots.globalsign.com");
+
             default: throw new RuntimeException("No test setup found for: " + alias);
         }
     }

diff --git a/jdk/test/sun/nio/cs/TestIBMBugs.java b/jdk/test/sun/nio/cs/TestIBMBugs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, 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
@@ -22,13 +22,13 @@
  */
 
 /* @test
-   @bug 6371437 6371422 6371416 6371619 5058184 6371431 6639450 6569191 6577466
-   @summary Check if the problems reported in above bugs have been fixed
+   @bug 6371437 6371422 6371416 6371619 5058184 6371431 6639450 6569191 6577466 8235834
  */
 
 import java.io.*;
 import java.nio.*;
 import java.nio.charset.*;
+import java.util.Arrays;
 
 public class TestIBMBugs {
 
@@ -172,6 +172,63 @@ private static void bug6577466 () throws Exception {
         }
     }
 
+    // Following test data is for 8235834
+    private static final byte[] byteIBM943c2b = new byte[] {
+        (byte)0x81, (byte)0x5C, (byte)0x81, (byte)0x60,
+        (byte)0x81, (byte)0x61, (byte)0x81, (byte)0x7C,
+        (byte)0x88, (byte)0xA0, (byte)0x89, (byte)0x8B,
+        (byte)0x89, (byte)0xA8, (byte)0x8A, (byte)0x9A,
+        (byte)0x8B, (byte)0xA0, (byte)0x8B, (byte)0xEB,
+        (byte)0x8C, (byte)0x71, (byte)0x8C, (byte)0x74,
+        (byte)0x8C, (byte)0xB2, (byte)0x8D, (byte)0x8D,
+        (byte)0x8D, (byte)0xF2, (byte)0x8E, (byte)0xC6,
+        (byte)0x8F, (byte)0x4A, (byte)0x8F, (byte)0xD3,
+        (byte)0x8F, (byte)0xDD, (byte)0x90, (byte)0xE4,
+        (byte)0x91, (byte)0x7E, (byte)0x91, (byte)0x89,
+        (byte)0x91, (byte)0xCB, (byte)0x92, (byte)0x5C,
+        (byte)0x92, (byte)0xCD, (byte)0x93, (byte)0x55,
+        (byte)0x93, (byte)0x5E, (byte)0x93, (byte)0x98,
+        (byte)0x93, (byte)0xC0, (byte)0x94, (byte)0x58,
+        (byte)0x94, (byte)0x8D, (byte)0x94, (byte)0xAC,
+        (byte)0x94, (byte)0xAE, (byte)0x96, (byte)0x6A,
+        (byte)0x96, (byte)0xCB, (byte)0x97, (byte)0x89,
+        (byte)0x98, (byte)0x58, (byte)0x9B, (byte)0xA0,
+        (byte)0x9D, (byte)0xB7, (byte)0x9E, (byte)0x94,
+        (byte)0xE3, (byte)0x79, (byte)0xE4, (byte)0x45,
+        (byte)0xE8, (byte)0xF6, (byte)0xFA, (byte)0x55,
+        (byte)0xFA, (byte)0x59,
+    };
+
+    private static final String strIBM943c2b1 =
+        "\u2015\uFF5E\u2225\uFF0D\u555E\u7130\u9DD7\u5699" +
+        "\u4FE0\u8EC0\u7E6B\u8346\u9E7C\u9EB4\u6805\u5C62" +
+        "\u7E61\u8523\u91AC\u87EC\u6414\u7626\u9A52\u7C1E" +
+        "\u6451\u5861\u985A\u79B1\u7006\u56CA\u525D\u6F51" +
+        "\u91B1\u9830\u9EB5\u840A\u881F\u5C5B\u6522\u688E" +
+        "\u7E48\u8141\u9839\uFFE4\uF86F";
+
+    private static final String strIBM943c2b2 =
+        "\u2014\u301C\u2016\u2212\u5516\u7114\u9D0E\u565B" +
+        "\u4FA0\u8EAF\u7E4B\u834A\u9E78\u9EB9\u67F5\u5C61" +
+        "\u7E4D\u848B\u91A4\u8749\u63BB\u75E9\u9A28\u7BAA" +
+        "\u63B4\u586B\u985B\u7977\u6D9C\u56A2\u5265\u6E8C" +
+        "\u9197\u982C\u9EBA\u83B1\u874B\u5C4F\u6505\u688D" +
+        "\u7E66\u80FC\u983D\u00A6\u2116";
+
+    private static void bug8235834 () throws Exception {
+        // 8235834 affects IBM-943 and IBM-943C encoder.
+        // The decoded results of the corresponding characters of IBM-943
+        // and IBM-943C is the same.
+        for (String csName : new String[] {"x-IBM943", "x-IBM943C"}) {
+            Charset cs = Charset.forName(csName);
+            if (!Arrays.equals(byteIBM943c2b, strIBM943c2b1.getBytes(cs))) {
+                throw new Exception(csName+" failed to encode");
+            }
+            if (!strIBM943c2b2.equals(new String(byteIBM943c2b, cs))) {
+                throw new Exception(csName+" failed to round-trip conversion");
+            }
+        }
+    }
     public static void main (String[] args) throws Exception {
         bug6577466();
         // need to be tested before any other IBM949C test case
@@ -182,5 +239,6 @@ public static void main (String[] args) throws Exception {
         bug6371619();
         bug6371431();
         bug6569191();
+        bug8235834();
     }
 }
diff --git a/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java b/jdk/test/sun/security/lib/cacerts/VerifyCACerts.java
@@ -29,7 +29,7 @@
  *      8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
  *      8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083 8245654
  *      8305975 8304760 8307134 8295894 8314960 8317373 8317374 8318759 8319187
- *      8321408
+ *      8321408 8316138
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -55,12 +55,12 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 108;
+    private static final int COUNT = 110;
 
     // SHA-256 of cacerts, can be generated with
     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
     private static final String CHECKSUM
-            = "81:D4:84:F6:92:78:A4:82:25:06:DC:42:25:C9:5D:6C:63:E4:99:CE:BC:ED:66:B3:8C:BA:E6:BA:6B:34:0F:01";
+            = "C1:68:B4:AC:51:BF:B5:C6:FD:20:69:17:E1:AF:E4:5B:01:9B:AA:3F:C3:9A:80:A8:51:53:74:2C:A2:04:B0:FF";
 
     // map of cert alias to SHA-256 fingerprint
     @SuppressWarnings("serial")
@@ -283,6 +283,10 @@ public class VerifyCACerts {
                     "77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0");
             put("certainlyroote1 [jdk]",
                     "B4:58:5F:22:E4:AC:75:6A:4E:86:12:A1:36:1C:5D:9D:03:1A:93:FD:84:FE:BB:77:8F:A3:06:8B:0F:C4:2D:C2");
+            put("globalsignr46 [jdk]",
+                    "4F:A3:12:6D:8D:3A:11:D1:C4:85:5A:4F:80:7C:BA:D6:CF:91:9D:3A:5A:88:B0:3B:EA:2C:63:72:D9:3C:40:C9");
+            put("globalsigne46 [jdk]",
+                    "CB:B9:C4:4D:84:B8:04:3E:10:50:EA:31:A6:9F:51:49:55:D7:BF:D2:E2:C6:B4:93:01:01:9A:D6:1D:9F:50:58");
         }
     };