Merge pull request #871 from mt-johan/feature/no-senderkid-req-for-pbmac1

Make PKIMessage.PKIHeader.senderKID optional for PBE/PBMAC1

Author: primetomas

modules/ejbca-common-web/src/org/ejbca/core/protocol/cmp/CmpResponseMessage.java

@@ -455,8 +455,8 @@ public boolean create() throws InvalidKeyException, NoSuchAlgorithmException, No
                 myPKIBody = new PKIBody(23, myErrorContent); // 23 = error
             }
 
-            final boolean pbeProtected = (pbeKeyId != null) && (pbeKey != null) && (pbeDigestAlg != null) && (pbeMacAlg != null);
-            final boolean pbmac1Protected = (pbmac1KeyId != null) && (pbmac1Key != null) && (pbmac1PrfAlg != null) && (pbmac1MacAlg != null);
+            final boolean pbeProtected = (pbeKey != null) && (pbeDigestAlg != null) && (pbeMacAlg != null);
+            final boolean pbmac1Protected = (pbmac1Key != null) && (pbmac1PrfAlg != null) && (pbmac1MacAlg != null);
             if (pbeProtected) {
                 myPKIHeader.setProtectionAlg(new AlgorithmIdentifier(CMPObjectIdentifiers.passwordBasedMac));
                 PKIHeader header = myPKIHeader.build();