Skip to content

Commit 0f0ae5d

Browse files
author
Igonin
committed
downgrade bc versions
Signed-off-by: Igonin <iigonin@sap.de>
1 parent 64bf6c5 commit 0f0ae5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+83
-133
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ee9ac432cf08f9a9ebee35d7cf8a45f94959a7ab

client/rest/licenses/bc-fips-2.1.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9cc33650ede63bc1a8281ed5c8e1da314d50bc76

client/rest/licenses/bctls-fips-2.1.20.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a1857cd639295b10cc90e6d31ecbc523cdafcc19

client/rest/licenses/bcutil-fips-2.1.4.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

client/rest/src/test/java/org/opensearch/client/BCDisposalDaemonFilter.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

client/rest/src/test/java/org/opensearch/client/RestClientBuilderIntegTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.client;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
36-
3735
import com.sun.net.httpserver.HttpExchange;
3836
import com.sun.net.httpserver.HttpHandler;
3937
import com.sun.net.httpserver.HttpsConfigurator;
@@ -66,7 +64,6 @@
6664
/**
6765
* Integration test to validate the builder builds a client with the correct configuration
6866
*/
69-
@ThreadLeakFilters(filters = { BCDisposalDaemonFilter.class })
7067
public class RestClientBuilderIntegTests extends RestClientTestCase {
7168

7269
private static HttpsServer httpsServer;

distribution/src/config/java.security

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Security properties for non-approved mode 'org.bouncycastle.fips.approved_only=false'. Intended to be used complementary e.g.
1+
# Security properties for non-approved mode 'org.bouncycastle.fips.approved_only=false'.
2+
# Intended to be used complementary with a single equal sign e.g. 'java.security.properties=java.security'
23

34
security.provider.1=org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider
45
security.provider.2=org.bouncycastle.jsse.provider.BouncyCastleJsseProvider

distribution/tools/keystore-cli/src/test/java/org/opensearch/tools/cli/keystore/AddStringKeyStoreCommandTests.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,13 @@ public void testInvalidPassphrease() throws Exception {
7272
terminal.addSecretInput("thewrongpassword");
7373
UserException e = expectThrows(UserException.class, () -> execute("foo2"));
7474
assertEquals(e.getMessage(), ExitCodes.DATA_ERROR, e.exitCode);
75-
if (inFipsJvm()) {
76-
assertThat(
77-
e.getMessage(),
78-
anyOf(
79-
containsString("Provided keystore password was incorrect"),
80-
containsString("Keystore has been corrupted or tampered with")
81-
)
82-
);
83-
} else {
84-
assertThat(e.getMessage(), containsString("Provided keystore password was incorrect"));
85-
}
86-
75+
assertThat(
76+
e.getMessage(),
77+
anyOf(
78+
containsString("Provided keystore password was incorrect"),
79+
containsString("Keystore has been corrupted or tampered with")
80+
)
81+
);
8782
}
8883

8984
public void testMissingPromptCreateWithoutPasswordWhenPrompted() throws Exception {

0 commit comments

Comments
 (0)