Ctd

Author: phax

phase2-lib/src/main/java/com/helger/phase2/crypto/ECryptoAlgorithmSign.java

@@ -55,57 +55,73 @@
  */
 public enum ECryptoAlgorithmSign implements ICryptoAlgorithm
 {
-  /** See compatibility note in RFC 5751, section 3.4.3.1 */
+  /**
+   * See compatibility note in RFC 5751, section 3.4.3.1
+   */
   @Deprecated (forRemoval = false)
   @DevelopersNote ("Use DIGEST_MD5 instead")
   DIGEST_RSA_MD5("rsa-md5", "md5", PKCSObjectIdentifiers.md5, "MD5WITHRSA"),
 
-  /** See compatibility note in RFC 5751, section 3.4.3.1 */
+  /**
+   * See compatibility note in RFC 5751, section 3.4.3.1
+   */
   @Deprecated (forRemoval = false)
   @DevelopersNote ("Use DIGEST_SHA1 or DIGEST_SHA_1 instead")
   DIGEST_RSA_SHA1("rsa-sha1", "sha1", OIWObjectIdentifiers.idSHA1, "SHA1WITHRSA"),
 
-  /** Same for RFC 3851 and RFC 5751 */
+  /**
+   * Same for RFC 3851 and RFC 5751
+   */
   DIGEST_MD5 ("md5", "md5", PKCSObjectIdentifiers.md5, "MD5WITHRSA"),
 
   /**
    * Old version as of RFC 3851.
    */
+  @Deprecated (forRemoval = false)
   @DevelopersNote ("Use DIGEST_SHA_1 instead")
   DIGEST_SHA1("sha1", "sha1", OIWObjectIdentifiers.idSHA1, "SHA1WITHRSA"),
 
   /**
    * Old version as of RFC 3851.
    */
+  @Deprecated (forRemoval = false)
   @DevelopersNote ("Use DIGEST_SHA_256 instead")
   DIGEST_SHA256("sha256", "sha256", NISTObjectIdentifiers.id_sha256, "SHA256WITHRSA"),
 
   /**
    * Old version as of RFC 3851.
    */
+  @Deprecated (forRemoval = false)
   @DevelopersNote ("Use DIGEST_SHA_384 instead")
   DIGEST_SHA384("sha384", "sha384", NISTObjectIdentifiers.id_sha384, "SHA384WITHRSA"),
+
   /**
    * Old version as of RFC 3851.
    */
+  @Deprecated (forRemoval = false)
   @DevelopersNote ("Use DIGEST_SHA_512 instead")
   DIGEST_SHA512("sha512", "sha512", NISTObjectIdentifiers.id_sha512, "SHA512WITHRSA"),
+
   /**
    * New version as of RFC 5751.
    */
   DIGEST_SHA_1 ("sha-1", "sha-1", OIWObjectIdentifiers.idSHA1, "SHA1WITHRSA"),
+
   /**
    * New version as of RFC 5751.
    */
   DIGEST_SHA_224 ("sha-224", "sha-224", NISTObjectIdentifiers.id_sha224, "SHA224WITHRSA"),
+
   /**
    * New version as of RFC 5751.
    */
   DIGEST_SHA_256 ("sha-256", "sha-256", NISTObjectIdentifiers.id_sha256, "SHA256WITHRSA"),
+
   /**
    * New version as of RFC 5751.
    */
   DIGEST_SHA_384 ("sha-384", "sha-384", NISTObjectIdentifiers.id_sha384, "SHA384WITHRSA"),
+
   /**
    * New version as of RFC 5751.
    */
@@ -117,18 +133,21 @@ public enum ECryptoAlgorithmSign implements ICryptoAlgorithm
    * @since 5.0.1 and 5.1.1
    */
   DIGEST_SHA2_224 ("sha2_224", "sha-224", NISTObjectIdentifiers.id_sha224, "SHA224WITHRSA"),
+
   /**
    * Non-compliant version of SHA-256 algorithm
    *
    * @since 5.0.1 and 5.1.1
    */
   DIGEST_SHA2_256 ("sha2_256", "sha-256", NISTObjectIdentifiers.id_sha256, "SHA256WITHRSA"),
+
   /**
    * Non-compliant version of SHA-384 algorithm
    *
    * @since 5.0.1 and 5.1.1
    */
   DIGEST_SHA2_384 ("sha2_384", "sha-384", NISTObjectIdentifiers.id_sha384, "SHA384WITHRSA"),
+
   /**
    * Non-compliant version of SHA-512 algorithm
    *

phase2-lib/src/main/java/com/helger/phase2/crypto/MIC.java

@@ -115,22 +115,15 @@ public MIC getClone ()
   @Nonnull
   private static ECryptoAlgorithmSign _getUnified (@Nonnull final ECryptoAlgorithmSign eAlgorithm)
   {
-    switch (eAlgorithm)
+    return switch (eAlgorithm)
     {
-      case DIGEST_RSA_MD5:
-        return ECryptoAlgorithmSign.DIGEST_MD5;
-      case DIGEST_RSA_SHA1:
-      case DIGEST_SHA1:
-        return ECryptoAlgorithmSign.DIGEST_SHA_1;
-      case DIGEST_SHA256:
-        return ECryptoAlgorithmSign.DIGEST_SHA_256;
-      case DIGEST_SHA384:
-        return ECryptoAlgorithmSign.DIGEST_SHA_384;
-      case DIGEST_SHA512:
-        return ECryptoAlgorithmSign.DIGEST_SHA_512;
-      default:
-        return eAlgorithm;
-    }
+      case DIGEST_RSA_MD5 -> ECryptoAlgorithmSign.DIGEST_MD5;
+      case DIGEST_RSA_SHA1, DIGEST_SHA1 -> ECryptoAlgorithmSign.DIGEST_SHA_1;
+      case DIGEST_SHA256 -> ECryptoAlgorithmSign.DIGEST_SHA_256;
+      case DIGEST_SHA384 -> ECryptoAlgorithmSign.DIGEST_SHA_384;
+      case DIGEST_SHA512 -> ECryptoAlgorithmSign.DIGEST_SHA_512;
+      default -> eAlgorithm;
+    };
   }
 
   @Override

phase2-lib/src/main/java/com/helger/phase2/util/AS2Helper.java

@@ -356,10 +356,12 @@ public static IMessageMDN createSyncMDN (@Nonnull final IAS2Session aSession,
     final String sDispositionOptions = aMsg.getHeader (CHttpHeader.DISPOSITION_NOTIFICATION_OPTIONS);
     final DispositionOptions aDispositionOptions = DispositionOptions.createFromString (sDispositionOptions);
 
-    // Calculate MIC
-    final MIC aMIC = createMICOnReception (aMsg);
-    if (aMIC != null)
-      aMDN.attrs ().putIn (AS2MessageMDN.MDNA_MIC, aMIC.getAsAS2String ());
+    {
+      // Calculate MIC
+      final MIC aMIC = createMICOnReception (aMsg);
+      if (aMIC != null)
+        aMDN.attrs ().putIn (AS2MessageMDN.MDNA_MIC, aMIC.getAsAS2String ());
+    }
 
     boolean bSignMDN = false;
     boolean bIncludeCertificateInSignedContent = false;