You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2016/02/16 17:37:38 UTC
mina-sshd git commit: Added specific test to ensure correct behavior
if Bouncycastle registration property is set to 'false'
Repository: mina-sshd
Updated Branches:
refs/heads/master 2e4b9b550 -> 464f1f419
Added specific test to ensure correct behavior if Bouncycastle registration property is set to 'false'
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/464f1f41
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/464f1f41
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/464f1f41
Branch: refs/heads/master
Commit: 464f1f41907467c7daa516ea6c05b7ed92965329
Parents: 2e4b9b5
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Tue Feb 16 18:37:40 2016 +0200
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Tue Feb 16 18:37:40 2016 +0200
----------------------------------------------------------------------
.../apache/sshd/common/util/SecurityUtilsTest.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/464f1f41/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java
index 185569b..017dd30 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java
@@ -21,8 +21,11 @@ package org.apache.sshd.common.util;
import java.io.IOException;
import java.nio.file.Path;
+import java.security.GeneralSecurityException;
import java.security.KeyPair;
+import java.security.KeyPairGenerator;
import java.security.PrivateKey;
+import java.security.Provider;
import java.security.PublicKey;
import java.security.interfaces.DSAPrivateKey;
import java.security.interfaces.DSAPublicKey;
@@ -180,6 +183,18 @@ public class SecurityUtilsTest extends BaseTestSupport {
}
@Test
+ public void testBouncyCastleRegistrationProperty() throws GeneralSecurityException {
+ String propValue = System.getProperty(SecurityUtils.REGISTER_BOUNCY_CASTLE_PROP);
+ Assume.assumeFalse(SecurityUtils.REGISTER_BOUNCY_CASTLE_PROP + " property not set", GenericUtils.isEmpty(propValue));
+ Assume.assumeFalse(SecurityUtils.REGISTER_BOUNCY_CASTLE_PROP + " property is " + propValue, Boolean.parseBoolean(propValue));
+ assertFalse("Unexpected registration of provider", SecurityUtils.isBouncyCastleRegistered());
+
+ KeyPairGenerator kpg = SecurityUtils.getKeyPairGenerator("RSA");
+ Provider provider = kpg.getProvider();
+ assertNotEquals("Unexpected used provider", SecurityUtils.BOUNCY_CASTLE, provider.getName());
+ }
+
+ @Test
public void testSetMaxDHGroupExchangeKeySizeByProperty() {
try {
for (int expected = SecurityUtils.MIN_DHGEX_KEY_SIZE; expected <= SecurityUtils.MAX_DHGEX_KEY_SIZE; expected += 1024) {