#498: Then switch to the more explicit S/MIME API, manually passing i…

…n the defaults from smime-util itself, so we can start replacing it with our own values
bbottema · Mar 22, 2024 · bc4f294 · bc4f294
1 parent e2ec9a7
commit bc4f294
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/smime-module/pom.xml b/modules/smime-module/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>utils-mail-smime</artifactId>
-			<version>2.3.0</version>
+			<version>2.3.1</version>
 		</dependency>
     </dependencies>
 </project>
diff --git a/...les/smime-module/src/main/java/org/simplejavamail/internal/smimesupport/SMIMESupport.java b/...les/smime-module/src/main/java/org/simplejavamail/internal/smimesupport/SMIMESupport.java
@@ -448,13 +448,16 @@ private static SignerInformationVerifier getVerifier(X509Certificate certificate
 	@NotNull
 	@Override
 	public MimeMessage signMessageWithSmime(@Nullable final Session session, @NotNull final Email email, @NotNull final MimeMessage messageToProtect, @NotNull final Pkcs12Config pkcs12Config) {
-		return SmimeUtil.sign(session, email.getId(), messageToProtect, retrieveSmimeKeyFromPkcs12Keystore(pkcs12Config));
+		return SmimeUtil.sign(session, email.getId(), messageToProtect, retrieveSmimeKeyFromPkcs12Keystore(pkcs12Config),
+				SmimeUtil.DEFAULT_SIGNATURE_ALGORITHM_NAME);
 	}
 
 	@NotNull
 	@Override
 	public MimeMessage encryptMessageWithSmime(@Nullable final Session session, @NotNull final Email email, @NotNull final MimeMessage messageToProtect, @NotNull final X509Certificate x509Certificate) {
-		return SmimeUtil.encrypt(session, email.getId(), messageToProtect, x509Certificate);
+        return SmimeUtil.encrypt(session, messageToProtect, email.getId(), x509Certificate,
+				SmimeUtil.DEFAULT_KEY_ENCAPSULATION_ALGORITHM,
+				SmimeUtil.DEFAULT_CIPHER);
 	}
 
 	@Override