equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2018, 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. |
45 System.out.println("Using NSS lib at " + libPath); |
45 System.out.println("Using NSS lib at " + libPath); |
46 |
46 |
47 copyFiles(); |
47 copyFiles(); |
48 System.setProperty("nss", ""); |
48 System.setProperty("nss", ""); |
49 System.setProperty("nss.lib", String.valueOf(libPath)); |
49 System.setProperty("nss.lib", String.valueOf(libPath)); |
|
50 |
|
51 PKCS11Test.loadNSPR(libPath.getParent().toString()); |
50 KeyToolTest.main(args); |
52 KeyToolTest.main(args); |
51 } |
53 } |
52 |
54 |
53 private static void copyFiles() throws IOException { |
55 private static void copyFiles() throws IOException { |
54 Path srcPath = Paths.get(System.getProperty("test.src")); |
56 Path srcPath = Paths.get(System.getProperty("test.src")); |