-
Notifications
You must be signed in to change notification settings - Fork 602
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added DefaultSecurityProviderConfig with Bouncy Castle disabled
- Loading branch information
1 parent
233c0dc
commit 85e64a0
Showing
7 changed files
with
149 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
src/main/java/net/schmizz/sshj/DefaultSecurityProviderConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright (C)2009 - SSHJ Contributors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package net.schmizz.sshj; | ||
|
|
||
| import net.schmizz.sshj.common.SecurityUtils; | ||
|
|
||
| /** | ||
| * SSHJ Configuration that uses the default Security Provider configuration from java.security and disables Bouncy Castle registration | ||
| */ | ||
| public class DefaultSecurityProviderConfig extends DefaultConfig { | ||
| static { | ||
| // Disable Bouncy Castle Provider registration prior to invoking constructors | ||
| SecurityUtils.setRegisterBouncyCastle(false); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
src/test/java/net/schmizz/sshj/DefaultSecurityProviderConfigTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright (C)2009 - SSHJ Contributors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package net.schmizz.sshj; | ||
|
|
||
| import net.schmizz.sshj.common.SecurityUtils; | ||
| import org.junit.AfterClass; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
|
|
||
| import java.security.Provider; | ||
| import java.security.Security; | ||
| import java.util.Arrays; | ||
| import java.util.Optional; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
|
|
||
| public class DefaultSecurityProviderConfigTest { | ||
|
|
||
| private static Provider bouncyCastleProvider; | ||
|
|
||
| @BeforeClass | ||
| public static void removeProviders() { | ||
| bouncyCastleProvider = Security.getProvider(SecurityUtils.BOUNCY_CASTLE); | ||
| if (bouncyCastleProvider != null) { | ||
| Security.removeProvider(SecurityUtils.BOUNCY_CASTLE); | ||
| } | ||
| } | ||
|
|
||
| @AfterClass | ||
| public static void addProviders() { | ||
| if (bouncyCastleProvider != null) { | ||
| Security.addProvider(bouncyCastleProvider); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testBouncyCastleNotRegistered() { | ||
| new DefaultSecurityProviderConfig(); | ||
|
|
||
| assertBouncyCastleNotRegistered(); | ||
| } | ||
|
|
||
| private void assertBouncyCastleNotRegistered() { | ||
| final Optional<String> bouncyCastleFound = Arrays.stream(Security.getProviders()) | ||
| .map(Provider::getName) | ||
| .filter(SecurityUtils.BOUNCY_CASTLE::contentEquals) | ||
| .findFirst(); | ||
|
|
||
| assertFalse(bouncyCastleFound.isPresent()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters