Skip to content

Commit a6103e7

Browse files
author
Igonin
committed
downgrade bc versions
Signed-off-by: Igonin <iigonin@sap.de>
1 parent 2c96d7d commit a6103e7

File tree

50 files changed

+111
-150
lines changed

Some content is hidden

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

50 files changed

+111
-150
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/AddFileKeyStoreCommandTests.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,13 @@ public void testIncorrectPassword() throws Exception {
211211
terminal.addSecretInput("thewrongkeystorepassword");
212212
UserException e = expectThrows(UserException.class, () -> execute("foo", file.toString()));
213213
assertEquals(e.getMessage(), ExitCodes.DATA_ERROR, e.exitCode);
214-
if (inFipsJvm()) {
215-
assertThat(
216-
e.getMessage(),
217-
anyOf(
218-
containsString("Provided keystore password was incorrect"),
219-
containsString("Keystore has been corrupted or tampered with")
220-
)
221-
);
222-
} else {
223-
assertThat(e.getMessage(), containsString("Provided keystore password was incorrect"));
224-
}
214+
assertThat(
215+
e.getMessage(),
216+
anyOf(
217+
containsString("Provided keystore password was incorrect"),
218+
containsString("Keystore has been corrupted or tampered with")
219+
)
220+
);
225221
}
226222

227223
public void testAddToUnprotectedKeystore() throws Exception {

0 commit comments

Comments
 (0)