From db58e6071f6bb57de006e6499c0a0c6a8c8e67bf Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 3 Nov 2016 02:38:00 +0100 Subject: Replaced deprecated DefaultHttpClient. The deprecated DefaultHttpClient in SubsystemClient, CRMFPopClient, and OCSPProcessor has been replaced with HttpClientBuilder. https://fedorahosted.org/pki/ticket/2531 --- base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'base/java-tools/src') diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index 450f950a9..6044b7aac 100644 --- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -29,8 +29,6 @@ import java.security.KeyPair; import java.security.MessageDigest; import java.security.PublicKey; -import netscape.security.x509.X500Name; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.Option; @@ -40,7 +38,8 @@ import org.apache.commons.io.FileUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.asn1.ASN1Util; @@ -85,6 +84,8 @@ import com.netscape.cmsutil.util.Cert; import com.netscape.cmsutil.util.HMACDigest; import com.netscape.cmsutil.util.Utils; +import netscape.security.x509.X500Name; + /** * A command-line utility used to generate a Certificate Request Message * Format (CRMF) request with proof of possesion (POP). @@ -742,9 +743,8 @@ public class CRMFPopClient { if (verbose) System.out.println("Opening " + url); - DefaultHttpClient client = new DefaultHttpClient(); HttpGet method = new HttpGet(url); - try { + try (CloseableHttpClient client = HttpClientBuilder.create().build()) { HttpResponse response = client.execute(method); if (response.getStatusLine().getStatusCode() != 200) { -- cgit