summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-09-30 08:08:35 -0400
committerJames Moger <james.moger@gitblit.com>2014-09-30 08:08:35 -0400
commit5397b426061e87bf25179f965002424515eaacd0 (patch)
tree9c52b7c2e7997da96697e03384069a150f62c016
parent794034351714877b71838aec5c51dc015b55d848 (diff)
parent5604f334ee9461cfaf7d89189a6ddcc931ca39f4 (diff)
downloadgitblit-5397b426061e87bf25179f965002424515eaacd0.tar.gz
gitblit-5397b426061e87bf25179f965002424515eaacd0.zip
Merge branch 'ticket/194' into develop
-rw-r--r--src/main/java/com/gitblit/transport/ssh/SshDaemon.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
index d0b7490e..9667154f 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java
@@ -86,6 +86,9 @@ public class SshDaemon {
// Ensure that Bouncy Castle is our JCE provider
SecurityUtils.setRegisterBouncyCastle(true);
+ if (SecurityUtils.isBouncyCastleRegistered()) {
+ log.debug("BouncyCastle is registered as a JCE provider");
+ }
// Generate host RSA and DSA keypairs and create the host keypair provider
File rsaKeyStore = new File(gitblit.getBaseFolder(), "ssh-rsa-hostkey.pem");