Skip to content

Commit 77f20e1

Browse files
committed
Fail when trying to utilize smime without the smime-module on the classpath
1 parent 2545250 commit 77f20e1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/SpecializedMimeMessageProducer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ public String toString() {
8181
2. S/MIME encryption
8282
3. DKIM signing
8383
*/
84-
if (ModuleLoader.smimeModuleAvailable()) {
84+
85+
if (!valueNullOrEmpty(email.getPkcs12ConfigForSmimeSigning()) ||
86+
!valueNullOrEmpty(emailGovernance.getPkcs12ConfigForSmimeSigning()) ||
87+
!valueNullOrEmpty(email.getX509CertificateForSmimeEncryption())) {
8588
message = ModuleLoader.loadSmimeModule().signAndOrEncryptEmail(session, message, email, emailGovernance.getPkcs12ConfigForSmimeSigning());
8689
}
8790

0 commit comments

Comments
 (0)