equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
382 } |
382 } |
383 } |
383 } |
384 |
384 |
385 static boolean loadNSPR(String libdir) throws Exception { |
385 static boolean loadNSPR(String libdir) throws Exception { |
386 // load NSS softoken dependencies in advance to avoid resolver issues |
386 // load NSS softoken dependencies in advance to avoid resolver issues |
387 safeReload(libdir + System.mapLibraryName("nspr4")); |
387 String dir = libdir.endsWith(File.separator) |
388 safeReload(libdir + System.mapLibraryName("plc4")); |
388 ? libdir |
389 safeReload(libdir + System.mapLibraryName("plds4")); |
389 : libdir + File.separator; |
390 safeReload(libdir + System.mapLibraryName("sqlite3")); |
390 safeReload(dir + System.mapLibraryName("nspr4")); |
391 safeReload(libdir + System.mapLibraryName("nssutil3")); |
391 safeReload(dir + System.mapLibraryName("plc4")); |
|
392 safeReload(dir + System.mapLibraryName("plds4")); |
|
393 safeReload(dir + System.mapLibraryName("sqlite3")); |
|
394 safeReload(dir + System.mapLibraryName("nssutil3")); |
392 return true; |
395 return true; |
393 } |
396 } |
394 |
397 |
395 // Check the provider being used is NSS |
398 // Check the provider being used is NSS |
396 public static boolean isNSS(Provider p) { |
399 public static boolean isNSS(Provider p) { |
901 } |
904 } |
902 |
905 |
903 @Artifact( |
906 @Artifact( |
904 organization = "jpg.tests.jdk.nsslib", |
907 organization = "jpg.tests.jdk.nsslib", |
905 name = "nsslib-windows_x64", |
908 name = "nsslib-windows_x64", |
906 revision = "3.35", |
909 revision = "3.41-VS2017", |
907 extension = "zip") |
910 extension = "zip") |
908 private static class WINDOWS_X64 { } |
911 private static class WINDOWS_X64 { } |
909 |
912 |
910 @Artifact( |
913 @Artifact( |
911 organization = "jpg.tests.jdk.nsslib", |
914 organization = "jpg.tests.jdk.nsslib", |
912 name = "nsslib-windows_x86", |
915 name = "nsslib-windows_x86", |
913 revision = "3.35", |
916 revision = "3.41-VS2017", |
914 extension = "zip") |
917 extension = "zip") |
915 private static class WINDOWS_X86 { } |
918 private static class WINDOWS_X86 { } |
916 |
919 |
917 @Artifact( |
920 @Artifact( |
918 organization = "jpg.tests.jdk.nsslib", |
921 organization = "jpg.tests.jdk.nsslib", |
919 name = "nsslib-macosx_x64", |
922 name = "nsslib-macosx_x64", |
920 revision = "3.35", |
923 revision = "3.41", |
921 extension = "zip") |
924 extension = "zip") |
922 private static class MACOSX_X64 { } |
925 private static class MACOSX_X64 { } |
923 } |
926 } |