Verifying certchain and returning certchain and TrustStore

Issue-ID: AAF-1037
Signed-off-by: EmmettCox <emmett.cox@est.tech>
Change-Id: Iaab754ff5f568b2f2e1aeac8dbed279e20b09b3b

1 files changed, 12 insertions, 9 deletions

diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java
index 8c470c7f..48b2336f 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageHelper.java
@@ -1,6 +1,7 @@
-/*
- * Copyright (C) 2020 Ericsson Software Technology AB. All rights reserved.
- *
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2020 Nordix Foundation.
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -11,7 +12,10 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
  */
 
 package org.onap.aaf.certservice.cmpv2client.impl;
@@ -30,7 +34,6 @@ import java.security.SignatureException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
@@ -120,8 +123,8 @@ public final class CmpMessageHelper {
     } catch (IOException ioe) {
       CmpClientException cmpClientException =
           new CmpClientException(
-              "Exception occurred while creating proof of possession for PKIMessage", ioe);
-      LOG.error("Exception occurred while creating proof of possession for PKIMessage");
+              "Exception occurred while creating extensions for PKIMessage", ioe);
+      LOG.error("Exception occurred while creating extensions for PKIMessage");
       throw cmpClientException;
     }
     return extGenerator.generate();
@@ -173,7 +176,7 @@ public final class CmpMessageHelper {
         | SignatureException ex) {
       CmpClientException cmpClientException =
           new CmpClientException(
-              "Exception occurred while creating proof " + "of possession for PKIMessage", ex);
+              "Exception occurred while creating proof of possession for PKIMessage", ex);
       LOG.error("Exception occurred while creating proof of possession for PKIMessage");
       throw cmpClientException;
     }
@@ -230,7 +233,7 @@ public final class CmpMessageHelper {
     } catch (NoSuchAlgorithmException | NoSuchProviderException | InvalidKeyException ex) {
       CmpClientException cmpClientException =
           new CmpClientException(
-              "Exception occurred while generating " + "proof of possession for PKIMessage", ex);
+              "Exception occurred while generating proof of possession for PKIMessage", ex);
       LOG.error("Exception occured while generating the proof of possession for PKIMessage");
       throw cmpClientException;
     }