test/java/lang/SecurityManager/CheckSecurityProvider.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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.

@@ -60,11 +60,11 @@
 
         // NOTE: the ordering must match what's defined inside java.security
         if (os.equals("SunOS")) {
             layer.findModule("jdk.crypto.ucrypto")
                 .ifPresent(m -> expected.add("com.oracle.security.ucrypto.UcryptoProvider"));
-            layer.findModule("jdk.crypto.token")
+            layer.findModule("jdk.crypto.cryptoki")
                 .ifPresent(m -> expected.add("sun.security.pkcs11.SunPKCS11"));
         }
         expected.add("sun.security.provider.Sun");
         expected.add("sun.security.rsa.SunRsaSign");
         layer.findModule("jdk.crypto.ec")

@@ -89,11 +89,11 @@
         }
         if (os.contains("OS X")) {
             expected.add("apple.security.AppleProvider");
         }
         if (!os.equals("SunOS")) {
-            layer.findModule("jdk.crypto.token")
+            layer.findModule("jdk.crypto.cryptoki")
                 .ifPresent(m -> expected.add("sun.security.pkcs11.SunPKCS11"));
         }
 
         List<String> actual = Stream.of(Security.getProviders())
             .map(p -> p.getClass().getName())