Calculate MIC only if MDN is requested; #58

phax · Aug 27, 2018 · cb13085 · cb13085
1 parent 973ed99
commit cb13085
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/as2-lib/src/main/java/com/helger/as2lib/processor/sender/AS2SenderModule.java b/as2-lib/src/main/java/com/helger/as2lib/processor/sender/AS2SenderModule.java
@@ -669,7 +669,7 @@ protected void onReceivedMDNError (@Nonnull final AS2Message aMsg,
 
   private void _sendViaHTTP (@Nonnull final AS2Message aMsg,
                              @Nonnull final MimeBodyPart aSecuredMimePart,
-                             @Nonnull final String sMIC) throws OpenAS2Exception, IOException, MessagingException
+                             @Nullable final String sMIC) throws OpenAS2Exception, IOException, MessagingException
   {
     final Partnership aPartnership = aMsg.partnership ();
 
@@ -793,6 +793,8 @@ public final void write (final byte [] aBytes, final int nOfs, final int nLen) t
           if (aPartnership.getAS2ReceiptDeliveryOption () == null)
           {
             // go ahead to receive sync MDN
+            // Note: If an MDN is requested, a MIC is present
+            assert sMIC != null;
             receiveSyncMDN (aMsg, aConn, sMIC);
 
             if (LOGGER.isInfoEnabled ())
@@ -840,7 +842,11 @@ public void handle (@Nonnull final String sAction,
 
       // Calculate MIC after compress/sign/crypt was handled, because the
       // message data might change if compression before signing is active.
-      final String sMIC = calculateAndStoreMIC (aMsg);
+      final String sMIC;
+      if (aMsg.isRequestingMDN ())
+        sMIC = calculateAndStoreMIC (aMsg);
+      else
+        sMIC = null;
 
       if (LOGGER.isDebugEnabled ())
         LOGGER.debug ("Setting message content type to '" + aSecuredData.getContentType () + "'");