2 files changed, 12 insertions, 5 deletions

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpClientProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java
index 5ad933ff..3b7a46ab 100644
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpClientProvider.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/CloseableHttpsClientProvider.java
@@ -24,11 +24,15 @@ import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 
-public class CloseableHttpClientProvider {
+import javax.net.ssl.SSLContext;
+
+public class CloseableHttpsClientProvider {
 
     private final int timeout;
+    private final SSLContext sslContext;
 
-    public CloseableHttpClientProvider(int timeout) {
+    public CloseableHttpsClientProvider(SSLContext sslContext, int timeout) {
+        this.sslContext = sslContext;
         this.timeout = timeout;
     }
 
@@ -39,6 +43,9 @@ public class CloseableHttpClientProvider {
                         .setConnectTimeout(timeout)
                         .setSocketTimeout(timeout)
                         .build();
-        return HttpClientBuilder.create().setDefaultRequestConfig(config).build();
+
+        return HttpClientBuilder.create()
+                .setSSLContext(sslContext)
+                .setDefaultRequestConfig(config).build();
     }
 }
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java
index 7512830d..0780afad 100644
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java
@@ -44,10 +44,10 @@ public class HttpClient {
     private static final String CHARSET_UTF_8 = "UTF-8";
 
     private final Gson gson = new Gson();
-    private final CloseableHttpClientProvider httpClientProvider;
+    private final CloseableHttpsClientProvider httpClientProvider;
     private final String certServiceAddress;
 
-    public HttpClient(CloseableHttpClientProvider httpClientProvider, String certServiceAddress) {
+    public HttpClient(CloseableHttpsClientProvider httpClientProvider, String certServiceAddress) {
         this.httpClientProvider = httpClientProvider;
         this.certServiceAddress = certServiceAddress;
     }