3 files changed, 24 insertions, 11 deletions

diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java
index bc3be52f..b3936e5d 100644
--- a/src/main/java/com/gitblit/manager/PluginManager.java
+++ b/src/main/java/com/gitblit/manager/PluginManager.java
@@ -15,12 +15,13 @@
  */
 package com.gitblit.manager;
 
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
@@ -61,8 +62,7 @@ import com.gitblit.utils.Base64;
 import com.gitblit.utils.FileUtils;
 import com.gitblit.utils.JsonUtils;
 import com.gitblit.utils.StringUtils;
-import com.google.common.io.Files;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteStreams;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -533,12 +533,9 @@ public class PluginManager implements IPluginManager, PluginStateListener {
 		// try to get the server-specified last-modified date of this artifact
 		long lastModified = conn.getHeaderFieldDate("Last-Modified", System.currentTimeMillis());
 
-		Files.copy(new InputSupplier<InputStream>() {
-			@Override
-			public InputStream getInput() throws IOException {
-				return new BufferedInputStream(conn.getInputStream());
-			}
-		}, tmpFile);
+		try (InputStream is = conn.getInputStream(); OutputStream os = new FileOutputStream(tmpFile);) {
+			ByteStreams.copy(is, os);
+		}
 
 		File destFile = new File(pFolder, StringUtils.getLastPathElement(u.getPath()));
 		if (destFile.exists()) {
diff --git a/src/main/java/com/gitblit/utils/X509Utils.java b/src/main/java/com/gitblit/utils/X509Utils.java
index f0c1b9df..fc0b797d 100644
--- a/src/main/java/com/gitblit/utils/X509Utils.java
+++ b/src/main/java/com/gitblit/utils/X509Utils.java
@@ -80,7 +80,10 @@ import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
 import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;

 import org.bouncycastle.jce.PrincipalUtil;

 import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;

+import org.bouncycastle.openssl.PEMEncryptor;

 import org.bouncycastle.openssl.PEMWriter;

+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;

+import org.bouncycastle.openssl.jcajce.JcePEMEncryptorBuilder;

 import org.bouncycastle.operator.ContentSigner;

 import org.bouncycastle.operator.OperatorCreationException;

 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;

@@ -883,8 +886,11 @@ public class X509Utils {
 	        if (pemFile.exists()) {

 	        	pemFile.delete();

 	        }

-	        PEMWriter pemWriter = new PEMWriter(new FileWriter(pemFile));

-	        pemWriter.writeObject(pair.getPrivate(), "DES-EDE3-CBC", clientMetadata.password.toCharArray(), new SecureRandom());

+	        JcePEMEncryptorBuilder builder = new JcePEMEncryptorBuilder("DES-EDE3-CBC");

+	        builder.setSecureRandom(new SecureRandom());

+	        PEMEncryptor pemEncryptor = builder.build(clientMetadata.password.toCharArray());

+	        JcaPEMWriter pemWriter = new JcaPEMWriter(new FileWriter(pemFile));

+	        pemWriter.writeObject(pair.getPrivate(), pemEncryptor);

 	        pemWriter.writeObject(userCert);

 	        pemWriter.writeObject(caCert);

 	        pemWriter.flush();

diff --git a/src/main/java/com/gitblit/utils/cli/CmdLineParser.java b/src/main/java/com/gitblit/utils/cli/CmdLineParser.java
index e698eb54..09ae8366 100644
--- a/src/main/java/com/gitblit/utils/cli/CmdLineParser.java
+++ b/src/main/java/com/gitblit/utils/cli/CmdLineParser.java
@@ -429,5 +429,15 @@ public class CmdLineParser {
 		public boolean isMultiValued() {
 			return false;
 		}
+
+		@Override
+		public boolean help() {
+			return true;
+		}
+
+		@Override
+		public String[] forbids() {
+			return new String [0];
+		}
 	}
 }