1 files changed, 10 insertions, 2 deletions
diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java
index 25943321..b185c92a 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CreateCertRequest.java
@@ -55,6 +55,7 @@ class CreateCertRequest {
   private Date notBefore;
   private Date notAfter;
   private String initAuthPassword;
+  private String senderKid;
 
   private static final int ITERATIONS = createRandomInt(5000);
   private static final byte[] SALT = createRandomBytes();
@@ -88,6 +89,10 @@ class CreateCertRequest {
     this.initAuthPassword = initAuthPassword;
   }
 
+  public void setSenderKid(String senderKid) {
+    this.senderKid = senderKid;
+  }
+
   /**
    * Method to create {@link PKIMessage} from {@link CertRequest},{@link ProofOfPossession}, {@link
    * CertReqMsg}, {@link CertReqMessages}, {@link PKIHeader} and {@link PKIBody}.
@@ -118,8 +123,11 @@ class CreateCertRequest {
 
     final PKIHeader pkiHeader =
         generatePkiHeader(
-            subjectDn, issuerDn, CmpMessageHelper.protectionAlgoIdentifier(ITERATIONS, SALT));
-    final PKIBody pkiBody = new PKIBody(PKIBody.TYPE_CERT_REQ, certReqMessages);
+            subjectDn,
+            issuerDn,
+            CmpMessageHelper.protectionAlgoIdentifier(ITERATIONS, SALT),
+            senderKid);
+    final PKIBody pkiBody = new PKIBody(PKIBody.TYPE_INIT_REQ, certReqMessages);
 
     return CmpMessageHelper.protectPkiMessage(
         pkiHeader, pkiBody, initAuthPassword, ITERATIONS, SALT);