# HG changeset patch
# User vinnie
# Date 1412610297 -3600
# Node ID cb5cbde6e7a430ecb251cdd80d7e4331d438c738
# Parent  663b14c9b66fed6bb854430563e070fd1ec8a1b6
8059627: Enable PKCS11 tests on Mac
Reviewed-by: mullan

diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/PKCS11Test.java
--- a/jdk/test/sun/security/pkcs11/PKCS11Test.java	Sun Oct 05 14:24:44 2014 +0100
+++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java	Mon Oct 06 16:44:57 2014 +0100
@@ -189,6 +189,8 @@
         if (osName.startsWith("Win")) {
             osName = "Windows";
             NSPR_PREFIX = "lib";
+        } else if (osName.equals("Mac OS X")) {
+            osName = "MacOSX";
         }
         String osid = osName + "-"
                 + props.getProperty("os.arch") + "-" + props.getProperty("sun.arch.data.model");
@@ -507,6 +509,8 @@
             PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP)});
         osMap.put("Windows-amd64-64", new String[]{
             PKCS11_BASE + "/nss/lib/windows-amd64/".replace('/', SEP)});
+        osMap.put("MacOSX-x86_64-64", new String[]{
+            PKCS11_BASE + "/nss/lib/macosx-x86_64/"});
     }
 
     private final static char[] hexDigits = "0123456789abcdef".toCharArray();
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java
--- a/jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java	Sun Oct 05 14:24:44 2014 +0100
+++ b/jdk/test/sun/security/pkcs11/Secmod/TrustAnchors.java	Mon Oct 06 16:44:57 2014 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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 6298106 6275523 6420252
+ * @bug 6298106 6275523 6420252 8059627
  * @summary make sure we can access the NSS trust anchor module
  * @author Andreas Sterbenz
  * @library ..
@@ -43,10 +43,12 @@
             return;
         }
 
-        if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
-            // our secmod.db file says nssckbi.*so*, so NSS does not find the
-            // *DLL* on windows.
-            System.out.println("Test currently does not work on Windows, skipping");
+        // our secmod.db file says nssckbi.*so*, so NSS does not find the
+        // *DLL* on Windows nor the *DYLIB* on Mac OSX.
+        String osName = System.getProperty("os.name").toLowerCase();
+        if (osName.startsWith("win") || osName.startsWith("mac")) {
+            System.out.println("Test currently does not work on " + osName +
+                ", skipping");
             return;
         }
 
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libfreebl3.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libfreebl3.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnspr4.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnspr4.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnss3.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnss3.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssckbi.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssckbi.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssdbm3.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssdbm3.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssutil3.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libnssutil3.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplc4.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplc4.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplds4.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libplds4.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsoftokn3.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsqlite3.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libsqlite3.dylib has changed
diff -r 663b14c9b66f -r cb5cbde6e7a4 jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libssl3.dylib
Binary file jdk/test/sun/security/pkcs11/nss/lib/macosx-x86_64/libssl3.dylib has changed