From bc769ca3af5b59ce0bf621ebecff8fbc60d3a982528a29e06a8b6894919e9a8e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 5 Nov 2021 18:03:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=396 --- fips.patch | 4 +++- java-1_8_0-openjdk.changes | 7 +++++++ java-1_8_0-openjdk.spec | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fips.patch b/fips.patch index 0ba1c5b..54ccd37 100644 --- a/fips.patch +++ b/fips.patch @@ -725,7 +725,7 @@ # When set to 'true', the JKS keystore type supports loading --- openjdk/jdk/src/solaris/native/java/security/systemconf.c 1970-01-01 01:00:00.000000000 +0100 +++ openjdk/jdk/src/solaris/native/java/security/systemconf.c 2021-10-11 13:53:00.397683319 +0200 -@@ -0,0 +1,168 @@ +@@ -0,0 +1,170 @@ +/* + * Copyright (c) 2021, Red Hat, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -859,11 +859,13 @@ + dbgPrint(env, "getSystemFIPSEnabled: reading " FIPS_ENABLED_PATH); + if ((fe = fopen(FIPS_ENABLED_PATH, "r")) == NULL) { + throwIOException(env, "Cannot open " FIPS_ENABLED_PATH); ++ return JNI_FALSE; + } + fips_enabled = fgetc(fe); + fclose(fe); + if (fips_enabled == EOF) { + throwIOException(env, "Cannot read " FIPS_ENABLED_PATH); ++ return JNI_FALSE; + } + msg_bytes = snprintf(msg, MSG_MAX_SIZE, "getSystemFIPSEnabled:" \ + " read character is '%c'", fips_enabled); diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 4100067..3450cab 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 5 18:01:42 UTC 2021 - Fridrich Strba + +- Modified patch: + * fips.patch + + return in native code after generating java.io.IOException + ------------------------------------------------------------------- Tue Nov 2 13:13:44 UTC 2021 - Fridrich Strba diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index 0cb86d1..c87a290 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -456,6 +456,7 @@ sh autogen.sh --with-pkgversion="build %{javaver}_%{updatever}-b%{buildver} suse-%{release}-%{_arch}" \ --with-jdk-home="%{_sysconfdir}/alternatives/java_sdk" \ --enable-nss \ + --enable-sysconf-nss \ --enable-non-nss-curves \ %if %{with bootstrap} --enable-bootstrap \