48dbe4bbff
* Add new slave jwebserver and corresponding manpage - Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch - Support JVM variant zero following JDK-8273494 no longer installing Zero's libjvm.so in the server directory - Disable HotSpot-only pre-build which is incompatible with the boot JDK being a different major version to that being built - Rebase FIPS patches from fips-18u branch and simplify by using a single patch from that repository - Detect NSS at runtime for FIPS detection - Turn off build-time NSS linking and go back to an explicit Requires on NSS - Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode - Rebase RH1648249 nss.cfg patch so it applies after the FIPS patch
16 lines
958 B
Diff
16 lines
958 B
Diff
diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
|
index bacff32efbc..ff7b3dcc81c 100644
|
|
--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
|
+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
|
@@ -46,8 +46,8 @@ class PlatformPCSC {
|
|
|
|
private static final String PROP_NAME = "sun.security.smartcardio.library";
|
|
|
|
- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
|
- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
|
+ private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
|
|
+ private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
|
|
private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
|
|
|
PlatformPCSC() {
|