You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2024/08/19 03:16:07 UTC
(james-project) 02/02: JAMES-4056 Update resource set for SMIMECheckSignatureIntegrationTest
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 8862748d8a05f99cfdadc2fee3710e96224e4a31
Author: hung phan <hp...@linagora.com>
AuthorDate: Thu Aug 15 17:29:55 2024 +0700
JAMES-4056 Update resource set for SMIMECheckSignatureIntegrationTest
---
.../apache/james/mailets/TemporaryJamesServer.java | 2 +-
.../smime-test-resource-set/certificate.crt | 38 +++++-----
.../smime-test-resource-set/instruction.md | 17 +++--
.../mail_with_signature.eml | 78 ++++++++++-----------
...mail_with_signature_and_content_type_xpkcs7mime | 49 -------------
..._with_signature_and_content_type_xpkcs7mime.eml | 49 +++++++++++++
.../resources/smime-test-resource-set/private.key | 55 +++++++--------
.../resources/smime-test-resource-set/request.csr | 32 ++++-----
.../resources/smime-test-resource-set/rootCA.crt | 23 ++++++
.../smime-test-resource-set/rootCA.private.key | 27 +++++++
.../resources/smime-test-resource-set/rootCA.srl | 1 +
.../src/main/resources/smime_cert_keystore | Bin 1286 -> 0 bytes
.../src/main/resources/trusted_cert_keystore | Bin 0 -> 1382 bytes
.../src/main/resources/trusted_certificate.pem | 42 +++++------
.../crypto/SMIMECheckSignatureIntegrationTest.java | 2 +-
...ckSignatureWithKeyStoreFileIntegrationTest.java | 2 +-
16 files changed, 239 insertions(+), 178 deletions(-)
diff --git a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/TemporaryJamesServer.java
index aab4a24538..81139fae44 100644
--- a/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/main/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -140,7 +140,7 @@ public class TemporaryJamesServer {
"recipientrewritetable.xml",
"usersrepository.xml",
"smime.p12",
- "smime_cert_keystore",
+ "trusted_cert_keystore",
"trusted_certificate.pem");
private final GuiceJamesServer jamesServer;
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/certificate.crt b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/certificate.crt
index 9921e532ff..0083c66cc3 100644
--- a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/certificate.crt
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/certificate.crt
@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIDhzCCAm8CFCV37M3Jd25yesXwGVMeQfDo2JSMMA0GCSqGSIb3DQEBCwUAMH8x
-CzAJBgNVBAYTAkFVMQ8wDQYDVQQIDAZTeWRuZXkxDzANBgNVBAcMBlN5ZG5leTER
-MA8GA1UECgwITGluYWdvcmExDTALBgNVBAsMBEphdmExDTALBgNVBAMMBHVzZXIx
-HTAbBgkqhkiG9w0BCQEWDnVzZXJAamFtZXMub3JnMCAXDTI0MDcyNjEzMjUyM1oY
-DzIyOTgwNTExMTMyNTIzWjB/MQswCQYDVQQGEwJBVTEPMA0GA1UECAwGU3lkbmV5
-MQ8wDQYDVQQHDAZTeWRuZXkxETAPBgNVBAoMCExpbmFnb3JhMQ0wCwYDVQQLDARK
-YXZhMQ0wCwYDVQQDDAR1c2VyMR0wGwYJKoZIhvcNAQkBFg51c2VyQGphbWVzLm9y
-ZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDeX8KG/yipwSyTVAQ1
-5D4KVOgjHzmoGPAA4pO8wJezo5rOt8f1nvqlx4MuqX2r2H4foMiyKGlQrPTTNnmw
-gLLBAlHbSiN0l7TxXx0nZB2s/EJ8ljHbcM/YI2Jr5FldxrsUoN1QKzZhX6m/Ip+E
-5eG0iTOMt5DwkQszHFXeGOUfcmp0vnze+VVghFNq+ZEDBUKhjjp/KdWoVhX1YaH0
-Uru1+UHhbDJ+4p8FxaBm1uhDU4+8k9nHGTr1rxD7R3AbXkr3fcPBCuwLa6wyWIyG
-EUOWCMCrkICx2yACtS0MOykR+58bq19snPL88WuO3gVZYqiGF6T/s7BlPBpHgRFJ
-1FMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAoK7bBXNX3OPCxtnmQnNgq5O0ZSl4
-3j/5y/8woBOq1F1aIRoBHaWgcJ+oMfTEzNBk6N1oLCPne+Yvh3cUjgskvdC8Ea97
-jjX9Wm5DJQyENPjoXxGrSJ5/VkCFVVpOLNWEZIp8dUCAdNW6FL59GhPChn6rgZw0
-b9pceknEjwv3K6/q8eR5zU+wygOIQ7iG6YK74I0Fh7HNLxXjgbalqr1Zls8DVTCq
-dgbqwLmUaDS6yQxQEr2M1VdUYt6He7ewlvJn9moSKmiJoNCtjqDiInm1798KbLSM
-hi3WlRxFheaOmBnWYqrolNEhc5p0RWQmn2apbx3Uz17m4QBenWaUEFP1ug==
+MIIDiDCCAnACFA13culxEf5FhyuNZUycVScFz2UOMA0GCSqGSIb3DQEBCwUAMIGA
+MQswCQYDVQQGEwJWTjEOMAwGA1UECAwFSGFub2kxDjAMBgNVBAcMBUhhbm9pMREw
+DwYDVQQKDAhMaW5hZ29yYTEOMAwGA1UECwwFSmFtZXMxDjAMBgNVBAMMBWFkbWlu
+MR4wHAYJKoZIhvcNAQkBFg9hZG1pbkBqYW1lcy5vcmcwIBcNMjQwODE1MDkyNjQw
+WhgPMjI5ODA1MzEwOTI2NDBaMH4xCzAJBgNVBAYTAlZOMQ4wDAYDVQQIDAVIYW5v
+aTEOMAwGA1UEBwwFSGFub2kxETAPBgNVBAoMCExpbmFnb3JhMQ4wDAYDVQQLDAVK
+YW1lczENMAsGA1UEAwwEdXNlcjEdMBsGCSqGSIb3DQEJARYOdXNlckBqYW1lcy5v
+cmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDC3GcBrtVznej/7/hq
+pTp3n5h9mNRdBntYUXpt/nO//xm0bcV5mMhsVuqCjFu7nTj3dGxhwly5N1R/JdPL
+60re+8oeOCUr6472HTJIaqE6SetxWS+/mqNYhCmlHZGK2yCvH1bpgGGIc66Bjhu+
+vbAMDDAfVnz/4R0MklzacG3KtJb0j+kauBKnAe1JcIv+WJ95BbFyEmY992/PGJMU
+IeSPFMEKCa6rOkKYMDQUV+brlls3ha1qHH+eI61s6EZVcEtsPTOVK+RGTzrbIOzR
+isPRr50KK8c/+y3dGFMW6FEYDHk5E7p4/I0ojbX7gZVSMGAWXh58ME7+7UMaGEtn
+QriHAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACDnWoIqpUCxUdYzbu6MABXliudg
+yCHRvzRkc8l1h0J7QsLnimhfmV9ujZw+u0dBy722ueToecqMRo3CQhVz/KdGOsXK
+mRF5uOk4A6fWEJcpxwVNfHmMz99JUOQFryZlirAAmJVKWQYHBizQX2PSRG8bBA9p
+S3GpLgaA9b2ltxE0B/E5GSivIEeA2CwwUjhPBFTxpgdTbEYCDwhLhQ3d68i2jL8/
+NuUA+6RlYESJiJuJa6VXinbl3LEjNCGoaw8S+Jln6XMtF+KNpLfiZcY4fA92k18n
+YxEYYBYHDk2B457LlknIHHYlAvwVA85a2PfaRuIuEzJtfdui1QHv9JZIKL4=
-----END CERTIFICATE-----
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/instruction.md b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/instruction.md
index 6eabaf2393..a136c9aca1 100644
--- a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/instruction.md
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/instruction.md
@@ -1,22 +1,31 @@
These resources were created by openssl tool:
```
-openssl genpkey -algorithm RSA -out private.key
+openssl genrsa -out rootCA.private.key
+
+openssl req -x509 -key rootCA.private.key -days 100000 -out rootCA.crt
+
+openssl genrsa -out private.key
openssl req -new -key private.key -out request.csr
-openssl x509 -req -days 100000 -in request.csr -signkey private.key -out certificate.crt
+openssl x509 -req -in request.csr -CA rootCA.crt -CAkey rootCA.private.key -CAcreateserial -out certificate.crt -days 100000
-keytool -import -alias testalias -file certificate.crt -keystore smime_cert_keystore -deststoretype PKCS12
+keytool -import -alias testalias -file rootCA.crt -keystore trusted_cert_keystore -deststoretype PKCS12
```
-smime_cert_keystore file is located in the parent directory
+trusted_cert_keystore file is located in the parent directory
mail_with_signature.eml was based on the result of the following command:
```
openssl smime -sign -in message -out signed-message -signer certificate.crt -inkey private.key -text
```
+mail_with_signaturemail_with_signature_and_content_type_xpkcs7mime.eml was based on the result of the following command:
+```
+openssl smime -sign -in message -out signed-message -signer certificate.crt -inkey private.key -text -nodetach
+```
+
For more detail: https://certificate.nikhef.nl/info/smime-manual.html
password for everything: secret
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature.eml b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature.eml
index 3132b6f654..23ea26b5c8 100644
--- a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature.eml
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature.eml
@@ -4,11 +4,11 @@ Subject: test
Message-ID: <df...@open-paas.org>
Date: Fri, 1 Nov 2019 10:21:39 +0700
MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha-256"; boundary="----D7BE5BC017D8AA46CAD456402C09CEA5"
+Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha-256"; boundary="----B1F607CD791E8C470233D073A0704182"
This is an S/MIME signed message
-------D7BE5BC017D8AA46CAD456402C09CEA5
+------B1F607CD791E8C470233D073A0704182
Content-Type: text/plain
From: user@james.org
@@ -19,45 +19,45 @@ Date: Fri, 1 Nov 2019 10:21:39 +0700
test SMIME
-------D7BE5BC017D8AA46CAD456402C09CEA5
+------B1F607CD791E8C470233D073A0704182
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
-MIIGcQYJKoZIhvcNAQcCoIIGYjCCBl4CAQExDzANBglghkgBZQMEAgEFADALBgkq
-hkiG9w0BBwGgggOLMIIDhzCCAm8CFCV37M3Jd25yesXwGVMeQfDo2JSMMA0GCSqG
-SIb3DQEBCwUAMH8xCzAJBgNVBAYTAkFVMQ8wDQYDVQQIDAZTeWRuZXkxDzANBgNV
-BAcMBlN5ZG5leTERMA8GA1UECgwITGluYWdvcmExDTALBgNVBAsMBEphdmExDTAL
-BgNVBAMMBHVzZXIxHTAbBgkqhkiG9w0BCQEWDnVzZXJAamFtZXMub3JnMCAXDTI0
-MDcyNjEzMjUyM1oYDzIyOTgwNTExMTMyNTIzWjB/MQswCQYDVQQGEwJBVTEPMA0G
-A1UECAwGU3lkbmV5MQ8wDQYDVQQHDAZTeWRuZXkxETAPBgNVBAoMCExpbmFnb3Jh
-MQ0wCwYDVQQLDARKYXZhMQ0wCwYDVQQDDAR1c2VyMR0wGwYJKoZIhvcNAQkBFg51
-c2VyQGphbWVzLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDe
-X8KG/yipwSyTVAQ15D4KVOgjHzmoGPAA4pO8wJezo5rOt8f1nvqlx4MuqX2r2H4f
-oMiyKGlQrPTTNnmwgLLBAlHbSiN0l7TxXx0nZB2s/EJ8ljHbcM/YI2Jr5FldxrsU
-oN1QKzZhX6m/Ip+E5eG0iTOMt5DwkQszHFXeGOUfcmp0vnze+VVghFNq+ZEDBUKh
-jjp/KdWoVhX1YaH0Uru1+UHhbDJ+4p8FxaBm1uhDU4+8k9nHGTr1rxD7R3AbXkr3
-fcPBCuwLa6wyWIyGEUOWCMCrkICx2yACtS0MOykR+58bq19snPL88WuO3gVZYqiG
-F6T/s7BlPBpHgRFJ1FMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAoK7bBXNX3OPC
-xtnmQnNgq5O0ZSl43j/5y/8woBOq1F1aIRoBHaWgcJ+oMfTEzNBk6N1oLCPne+Yv
-h3cUjgskvdC8Ea97jjX9Wm5DJQyENPjoXxGrSJ5/VkCFVVpOLNWEZIp8dUCAdNW6
-FL59GhPChn6rgZw0b9pceknEjwv3K6/q8eR5zU+wygOIQ7iG6YK74I0Fh7HNLxXj
-gbalqr1Zls8DVTCqdgbqwLmUaDS6yQxQEr2M1VdUYt6He7ewlvJn9moSKmiJoNCt
-jqDiInm1798KbLSMhi3WlRxFheaOmBnWYqrolNEhc5p0RWQmn2apbx3Uz17m4QBe
-nWaUEFP1ujGCAqowggKmAgEBMIGXMH8xCzAJBgNVBAYTAkFVMQ8wDQYDVQQIDAZT
-eWRuZXkxDzANBgNVBAcMBlN5ZG5leTERMA8GA1UECgwITGluYWdvcmExDTALBgNV
-BAsMBEphdmExDTALBgNVBAMMBHVzZXIxHTAbBgkqhkiG9w0BCQEWDnVzZXJAamFt
-ZXMub3JnAhQld+zNyXducnrF8BlTHkHw6NiUjDANBglghkgBZQMEAgEFAKCB5DAY
-BgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yNDA4MDUx
-MDA0MDFaMC8GCSqGSIb3DQEJBDEiBCA/3rCbBiH5l8Nk1YXaYV7W07uN/3u0NCZD
-nCA1wahwOjB5BgkqhkiG9w0BCQ8xbDBqMAsGCWCGSAFlAwQBKjALBglghkgBZQME
-ARYwCwYJYIZIAWUDBAECMAoGCCqGSIb3DQMHMA4GCCqGSIb3DQMCAgIAgDANBggq
-hkiG9w0DAgIBQDAHBgUrDgMCBzANBggqhkiG9w0DAgIBKDANBgkqhkiG9w0BAQEF
-AASCAQAUgClg//Lmrquakv9svhKThrgL1m6N+gENvcFC2pImR9Nuq8cj4UCyNfjA
-rImCFbpY2lh6tOCh1gy2blCfomQ7ydsfuA9ygBSFK/b7W1u93q9OCp6Tqt/4Urb5
-an+MXqjE89dDCt8Ppnfwxt7XQ+MmJ2xr36iLn/jKf6K9NhtkPXohbxH51UXNPPGx
-NMGQxcQDZVy6O9w+HErYuO8fKak8qtuAc5gp13huhvFKVZDstGSiqLc+DOSlFnj5
-GxST3iQw9kqSFqkMoFXVm0PhgsPQcIepxqO+fVSDUrqg7/aqjI9aqGmJN4KdEqvw
-Nj9Fa4yXpTg4jr6gvEgpf/Nv43Dg
+MIIGdAYJKoZIhvcNAQcCoIIGZTCCBmECAQExDzANBglghkgBZQMEAgEFADALBgkq
+hkiG9w0BBwGgggOMMIIDiDCCAnACFA13culxEf5FhyuNZUycVScFz2UOMA0GCSqG
+SIb3DQEBCwUAMIGAMQswCQYDVQQGEwJWTjEOMAwGA1UECAwFSGFub2kxDjAMBgNV
+BAcMBUhhbm9pMREwDwYDVQQKDAhMaW5hZ29yYTEOMAwGA1UECwwFSmFtZXMxDjAM
+BgNVBAMMBWFkbWluMR4wHAYJKoZIhvcNAQkBFg9hZG1pbkBqYW1lcy5vcmcwIBcN
+MjQwODE1MDkyNjQwWhgPMjI5ODA1MzEwOTI2NDBaMH4xCzAJBgNVBAYTAlZOMQ4w
+DAYDVQQIDAVIYW5vaTEOMAwGA1UEBwwFSGFub2kxETAPBgNVBAoMCExpbmFnb3Jh
+MQ4wDAYDVQQLDAVKYW1lczENMAsGA1UEAwwEdXNlcjEdMBsGCSqGSIb3DQEJARYO
+dXNlckBqYW1lcy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDC
+3GcBrtVznej/7/hqpTp3n5h9mNRdBntYUXpt/nO//xm0bcV5mMhsVuqCjFu7nTj3
+dGxhwly5N1R/JdPL60re+8oeOCUr6472HTJIaqE6SetxWS+/mqNYhCmlHZGK2yCv
+H1bpgGGIc66Bjhu+vbAMDDAfVnz/4R0MklzacG3KtJb0j+kauBKnAe1JcIv+WJ95
+BbFyEmY992/PGJMUIeSPFMEKCa6rOkKYMDQUV+brlls3ha1qHH+eI61s6EZVcEts
+PTOVK+RGTzrbIOzRisPRr50KK8c/+y3dGFMW6FEYDHk5E7p4/I0ojbX7gZVSMGAW
+Xh58ME7+7UMaGEtnQriHAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACDnWoIqpUCx
+UdYzbu6MABXliudgyCHRvzRkc8l1h0J7QsLnimhfmV9ujZw+u0dBy722ueToecqM
+Ro3CQhVz/KdGOsXKmRF5uOk4A6fWEJcpxwVNfHmMz99JUOQFryZlirAAmJVKWQYH
+BizQX2PSRG8bBA9pS3GpLgaA9b2ltxE0B/E5GSivIEeA2CwwUjhPBFTxpgdTbEYC
+DwhLhQ3d68i2jL8/NuUA+6RlYESJiJuJa6VXinbl3LEjNCGoaw8S+Jln6XMtF+KN
+pLfiZcY4fA92k18nYxEYYBYHDk2B457LlknIHHYlAvwVA85a2PfaRuIuEzJtfdui
+1QHv9JZIKL4xggKsMIICqAIBATCBmTCBgDELMAkGA1UEBhMCVk4xDjAMBgNVBAgM
+BUhhbm9pMQ4wDAYDVQQHDAVIYW5vaTERMA8GA1UECgwITGluYWdvcmExDjAMBgNV
+BAsMBUphbWVzMQ4wDAYDVQQDDAVhZG1pbjEeMBwGCSqGSIb3DQEJARYPYWRtaW5A
+amFtZXMub3JnAhQNd3LpcRH+RYcrjWVMnFUnBc9lDjANBglghkgBZQMEAgEFAKCB
+5DAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yNDA4
+MTUwOTQ2MzRaMC8GCSqGSIb3DQEJBDEiBCA/3rCbBiH5l8Nk1YXaYV7W07uN/3u0
+NCZDnCA1wahwOjB5BgkqhkiG9w0BCQ8xbDBqMAsGCWCGSAFlAwQBKjALBglghkgB
+ZQMEARYwCwYJYIZIAWUDBAECMAoGCCqGSIb3DQMHMA4GCCqGSIb3DQMCAgIAgDAN
+BggqhkiG9w0DAgIBQDAHBgUrDgMCBzANBggqhkiG9w0DAgIBKDANBgkqhkiG9w0B
+AQEFAASCAQCp2WVc04fFLgqTbnDkLI4P/7TDFX3mv3H0jWYACCBn7XH2p/o/FTf4
+Haqt3vZaXnOlNJzzDfOM14dlvyIKOtrsajeSdIgkPcHY8PAKZNGvQ/b9y8e69Xci
+hFO+r3r2gEkldu6uL52I92Aqs4YXGUnmSDlfFWsg7T7RIXNqC1ZmkZggzmgymJWt
+T3cq7+UdG39cz34whrTQsnHx5ugsuB/TJVoena1cofGcM/N+KZsLVVGByX1Rj463
+HFMCiK3+S/XvRloT9W3AwIZlWNJZ1KZZCirQaBzXkgRA7J6OuuP5qvuBOYIUUasO
+sl/+tJdXQGhWzz1WVqTcHlK7/NFGKRgn
-------D7BE5BC017D8AA46CAD456402C09CEA5--
+------B1F607CD791E8C470233D073A0704182--
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime
deleted file mode 100644
index 5dcbbdffe4..0000000000
--- a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime
+++ /dev/null
@@ -1,49 +0,0 @@
-From: user@james.org
-To: user2@james.org
-Subject: test
-Message-ID: <df...@open-paas.org>
-Date: Fri, 1 Nov 2019 10:21:39 +070
-MIME-Version: 1.0
-Content-Disposition: attachment; filename="smime.p7m"
-Content-Type: application/x-pkcs7-mime; smime-type=signed-data; name="smime.p7m"
-Content-Transfer-Encoding: base64
-
-MIIHRAYJKoZIhvcNAQcCoIIHNTCCBzECAQExDzANBglghkgBZQMEAgEFADCB3QYJ
-KoZIhvcNAQcBoIHPBIHMQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluDQoNCkZyb206
-IHVzZXJAamFtZXMub3JnDQpUbzogdXNlcjJAamFtZXMub3JnDQpTdWJqZWN0OiB0
-ZXN0DQpNZXNzYWdlLUlEOiA8ZGY3M2MwNWEtMmUxOC0zZTIyLTA0MGMtOWVkYTZh
-YmUwMmFlQG9wZW4tcGFhcy5vcmc+DQpEYXRlOiBGcmksIDEgTm92IDIwMTkgMTA6
-MjE6MzkgKzA3MDANCg0KdGVzdCBTTUlNRQ0KoIIDizCCA4cwggJvAhQld+zNyXdu
-cnrF8BlTHkHw6NiUjDANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJBVTEPMA0G
-A1UECAwGU3lkbmV5MQ8wDQYDVQQHDAZTeWRuZXkxETAPBgNVBAoMCExpbmFnb3Jh
-MQ0wCwYDVQQLDARKYXZhMQ0wCwYDVQQDDAR1c2VyMR0wGwYJKoZIhvcNAQkBFg51
-c2VyQGphbWVzLm9yZzAgFw0yNDA3MjYxMzI1MjNaGA8yMjk4MDUxMTEzMjUyM1ow
-fzELMAkGA1UEBhMCQVUxDzANBgNVBAgMBlN5ZG5leTEPMA0GA1UEBwwGU3lkbmV5
-MREwDwYDVQQKDAhMaW5hZ29yYTENMAsGA1UECwwESmF2YTENMAsGA1UEAwwEdXNl
-cjEdMBsGCSqGSIb3DQEJARYOdXNlckBqYW1lcy5vcmcwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDA3l/Chv8oqcEsk1QENeQ+ClToIx85qBjwAOKTvMCX
-s6OazrfH9Z76pceDLql9q9h+H6DIsihpUKz00zZ5sICywQJR20ojdJe08V8dJ2Qd
-rPxCfJYx23DP2CNia+RZXca7FKDdUCs2YV+pvyKfhOXhtIkzjLeQ8JELMxxV3hjl
-H3JqdL583vlVYIRTavmRAwVCoY46fynVqFYV9WGh9FK7tflB4WwyfuKfBcWgZtbo
-Q1OPvJPZxxk69a8Q+0dwG15K933DwQrsC2usMliMhhFDlgjAq5CAsdsgArUtDDsp
-EfufG6tfbJzy/PFrjt4FWWKohhek/7OwZTwaR4ERSdRTAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAKCu2wVzV9zjwsbZ5kJzYKuTtGUpeN4/+cv/MKATqtRdWiEaAR2l
-oHCfqDH0xMzQZOjdaCwj53vmL4d3FI4LJL3QvBGve441/VpuQyUMhDT46F8Rq0ie
-f1ZAhVVaTizVhGSKfHVAgHTVuhS+fRoTwoZ+q4GcNG/aXHpJxI8L9yuv6vHkec1P
-sMoDiEO4humCu+CNBYexzS8V44G2paq9WZbPA1UwqnYG6sC5lGg0uskMUBK9jNVX
-VGLeh3u3sJbyZ/ZqEipoiaDQrY6g4iJ5te/fCmy0jIYt1pUcRYXmjpgZ1mKq6JTR
-IXOadEVkJp9mqW8d1M9e5uEAXp1mlBBT9boxggKqMIICpgIBATCBlzB/MQswCQYD
-VQQGEwJBVTEPMA0GA1UECAwGU3lkbmV5MQ8wDQYDVQQHDAZTeWRuZXkxETAPBgNV
-BAoMCExpbmFnb3JhMQ0wCwYDVQQLDARKYXZhMQ0wCwYDVQQDDAR1c2VyMR0wGwYJ
-KoZIhvcNAQkBFg51c2VyQGphbWVzLm9yZwIUJXfszcl3bnJ6xfAZUx5B8OjYlIww
-DQYJYIZIAWUDBAIBBQCggeQwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkq
-hkiG9w0BCQUxDxcNMjQwODEyMDY1OTM3WjAvBgkqhkiG9w0BCQQxIgQgP96wmwYh
-+ZfDZNWF2mFe1tO7jf97tDQmQ5wgNcGocDoweQYJKoZIhvcNAQkPMWwwajALBglg
-hkgBZQMEASowCwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAO
-BggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN
-AwICASgwDQYJKoZIhvcNAQEBBQAEggEAtUSwTikYiMRVUvWIW+Lf0zx6GqDPISkv
-UCWYFnyjM/t8/aE1YjmtJV7c81yplMzjsgq/phEFn/ZDGwz7O+C28Ag6c/w0WdUt
-dxL46S1Oo+DRAJlNvQGr/IuzRbdz4WPn1tVtw2FE4cHwvVrR36BG1e9qvXwaoaF8
-AzZ223962pxeLB5wWlHh3jVn8etgbzkBDqmJoUnFvJorME1trHd1/m40mT4Mxij6
-PLah7eI02Q6RpR2s5aRqJwDA9oSWem8IcQnNREcwV1Ir+XNYbiG15cjxSG3YJGzx
-reFFVXr31I8491Ykl7og7a863FvsKVCPsHIuBCFWheVEGoClcHDtXw==
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime.eml b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime.eml
new file mode 100644
index 0000000000..6b6560c708
--- /dev/null
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime.eml
@@ -0,0 +1,49 @@
+From: user@james.org
+To: user2@james.org
+Subject: test
+Message-ID: <df...@open-paas.org>
+Date: Fri, 1 Nov 2019 10:21:39 +070
+MIME-Version: 1.0
+Content-Disposition: attachment; filename="smime.p7m"
+Content-Type: application/x-pkcs7-mime; smime-type=signed-data; name="smime.p7m"
+Content-Transfer-Encoding: base64
+
+MIIHRwYJKoZIhvcNAQcCoIIHODCCBzQCAQExDzANBglghkgBZQMEAgEFADCB3QYJ
+KoZIhvcNAQcBoIHPBIHMQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluDQoNCkZyb206
+IHVzZXJAamFtZXMub3JnDQpUbzogdXNlcjJAamFtZXMub3JnDQpTdWJqZWN0OiB0
+ZXN0DQpNZXNzYWdlLUlEOiA8ZGY3M2MwNWEtMmUxOC0zZTIyLTA0MGMtOWVkYTZh
+YmUwMmFlQG9wZW4tcGFhcy5vcmc+DQpEYXRlOiBGcmksIDEgTm92IDIwMTkgMTA6
+MjE6MzkgKzA3MDANCg0KdGVzdCBTTUlNRQ0KoIIDjDCCA4gwggJwAhQNd3LpcRH+
+RYcrjWVMnFUnBc9lDjANBgkqhkiG9w0BAQsFADCBgDELMAkGA1UEBhMCVk4xDjAM
+BgNVBAgMBUhhbm9pMQ4wDAYDVQQHDAVIYW5vaTERMA8GA1UECgwITGluYWdvcmEx
+DjAMBgNVBAsMBUphbWVzMQ4wDAYDVQQDDAVhZG1pbjEeMBwGCSqGSIb3DQEJARYP
+YWRtaW5AamFtZXMub3JnMCAXDTI0MDgxNTA5MjY0MFoYDzIyOTgwNTMxMDkyNjQw
+WjB+MQswCQYDVQQGEwJWTjEOMAwGA1UECAwFSGFub2kxDjAMBgNVBAcMBUhhbm9p
+MREwDwYDVQQKDAhMaW5hZ29yYTEOMAwGA1UECwwFSmFtZXMxDTALBgNVBAMMBHVz
+ZXIxHTAbBgkqhkiG9w0BCQEWDnVzZXJAamFtZXMub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAwtxnAa7Vc53o/+/4aqU6d5+YfZjUXQZ7WFF6bf5z
+v/8ZtG3FeZjIbFbqgoxbu50493RsYcJcuTdUfyXTy+tK3vvKHjglK+uO9h0ySGqh
+OknrcVkvv5qjWIQppR2Ritsgrx9W6YBhiHOugY4bvr2wDAwwH1Z8/+EdDJJc2nBt
+yrSW9I/pGrgSpwHtSXCL/lifeQWxchJmPfdvzxiTFCHkjxTBCgmuqzpCmDA0FFfm
+65ZbN4Wtahx/niOtbOhGVXBLbD0zlSvkRk862yDs0YrD0a+dCivHP/st3RhTFuhR
+GAx5ORO6ePyNKI21+4GVUjBgFl4efDBO/u1DGhhLZ0K4hwIDAQABMA0GCSqGSIb3
+DQEBCwUAA4IBAQAg51qCKqVAsVHWM27ujAAV5YrnYMgh0b80ZHPJdYdCe0LC54po
+X5lfbo2cPrtHQcu9trnk6HnKjEaNwkIVc/ynRjrFypkRebjpOAOn1hCXKccFTXx5
+jM/fSVDkBa8mZYqwAJiVSlkGBwYs0F9j0kRvGwQPaUtxqS4GgPW9pbcRNAfxORko
+ryBHgNgsMFI4TwRU8aYHU2xGAg8IS4UN3evItoy/PzblAPukZWBEiYibiWulV4p2
+5dyxIzQhqGsPEviZZ+lzLRfijaS34mXGOHwPdpNfJ2MRGGAWBw5NgeOey5ZJyBx2
+JQL8FQPOWtj32kbiLhMybX3botUB7/SWSCi+MYICrDCCAqgCAQEwgZkwgYAxCzAJ
+BgNVBAYTAlZOMQ4wDAYDVQQIDAVIYW5vaTEOMAwGA1UEBwwFSGFub2kxETAPBgNV
+BAoMCExpbmFnb3JhMQ4wDAYDVQQLDAVKYW1lczEOMAwGA1UEAwwFYWRtaW4xHjAc
+BgkqhkiG9w0BCQEWD2FkbWluQGphbWVzLm9yZwIUDXdy6XER/kWHK41lTJxVJwXP
+ZQ4wDQYJYIZIAWUDBAIBBQCggeQwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
+BgkqhkiG9w0BCQUxDxcNMjQwODE1MTAwMDE0WjAvBgkqhkiG9w0BCQQxIgQgP96w
+mwYh+ZfDZNWF2mFe1tO7jf97tDQmQ5wgNcGocDoweQYJKoZIhvcNAQkPMWwwajAL
+BglghkgBZQMEASowCwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0D
+BzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZI
+hvcNAwICASgwDQYJKoZIhvcNAQEBBQAEggEAMBaNPzd7aIcPN3zmB/FXv+aKqPhA
+qXJVa4QEuX01ngQ3ac7/ncDSHHJVBqGuIQziO/331bkJgY6qE3tYY/kJVjzcJOHm
+m6wLoFFBmUm1kUkjJD6Li+jK11Ws+/V8XCDlrxxwIyjeSF6TIDnmEVxJsQfnD1fx
+ed0xtBg9UFg7bKTdvC0UXDzmUCoRZb3zf5xuW4NhAHYGklhyuaiUlaJu/PMGomY5
+20KfS+xY+knHM/7VLzjc3PZxppITIGX0exDaJuaOede8oseZ9zIAD0DOQYG/y8+h
+3UfXrmbUCSEl9+HfLDW7sV9ZTndFiPRvFTawNjBNjhdhxJ1fZRpbxSNspQ==
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/private.key b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/private.key
index b3854fb0b7..5c6afc8d9a 100644
--- a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/private.key
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/private.key
@@ -1,28 +1,27 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDA3l/Chv8oqcEs
-k1QENeQ+ClToIx85qBjwAOKTvMCXs6OazrfH9Z76pceDLql9q9h+H6DIsihpUKz0
-0zZ5sICywQJR20ojdJe08V8dJ2QdrPxCfJYx23DP2CNia+RZXca7FKDdUCs2YV+p
-vyKfhOXhtIkzjLeQ8JELMxxV3hjlH3JqdL583vlVYIRTavmRAwVCoY46fynVqFYV
-9WGh9FK7tflB4WwyfuKfBcWgZtboQ1OPvJPZxxk69a8Q+0dwG15K933DwQrsC2us
-MliMhhFDlgjAq5CAsdsgArUtDDspEfufG6tfbJzy/PFrjt4FWWKohhek/7OwZTwa
-R4ERSdRTAgMBAAECggEAUbcmDW5S93CM9wzo4OvQa3THKp+O4EfXYQCO/xdO5jdn
-TvTcquznUb0hffQsPaGslStjXQUW2CAlV4mRoBdnP9VE3Vey3rjMeg52RQzmfyhG
-rQjKPg+CiZ1CyLV7x11TEPqZeYs4885n0Ky5x6pwF6P9KYkqUU+LtJoQHFWAaLqg
-W4VBXP6GJfPyshFGeOYzMcaMiNEQ6sZaSyGA0Q/okhynOyvXNfGO4DpkXsbnhU0L
-vN3+nbYJIKI+hqM3qz8kC/gqNGrgTuVDrgrhG1NrqW2LHiGv7h/SsM37iTqIMbKj
-zOifZ4hEgohxIF4Mq5OyydCLNP6cmQ/36QkScRlRSQKBgQDvKWQgoGhUrvJJTwV7
-eOsK4N6ZRYqI2Bvn3bYWhlU0bmNAy8s9tO4i4aN7RW2X+RFyXka2ockW2wH3J7ux
-wdubP1npyR5lrndx+SsJaj/iUdmYO0xHs50cSyuqLgd7JiEEdp2mQzrh/YEnPwK6
-VFaB2TFUvZiBgNsBYJ3wQH0uhwKBgQDOcprywLRPxTIHqfr27vo1CXyI7X3M2XOQ
-kUFB9PUJ+15E/zVxESnsuVybDYIZNxV5ShRC4GG9Kp9gUSfG4/bN/0l5t2C1p0ss
-G/Ey/mxvfe+yArkvFIj4GP5/5gFVvDzkr7GG388eCMov28XosImjKb6TANUWgvQW
-vb8uYsZy1QKBgQCisBBZlWSDPqK4NZXwIRgaRU+HCeQsJH4PIyWreuPZD8JaoIb3
-ye04My+HOnpLp/UzTGhj8fgdoQtcOl4WlF2z5MtgGhygZKcCE9IvzGP6q10Ojj/c
-gpU8WvIwCLG0FwLcy2eAYzlZ452Iufc8EwTpvXouP+7PIX1ZGYU2mlfNXwKBgGh6
-qZ43FknUo4grZz43HVtgDK2De4oDdq/wQxVtMeG2XDQQ8GvjYtNRz+MMiA3Yyb5T
-VkOuKOjCPFxTVg0a65m/G+FEg+YK30lYbs3+4sPd+UOeizefbd4ZUBtMPNq15B9c
-Jzz54Wjyy9hCojsrtMxlYPQmlLDK31ru9mU0SfhtAoGBAOSbq5kK7uyIhzC6kK3W
-sqZ4UuSklF3eLlhcUlPqMyZzwCJ7x77j7fSRGPhyl8utk3Aygtef0NmrIUHPgolS
-GrJ1oGYA4ONcC0J3ASTs2EpenHEaHmeyYA0TkK7MNxYA6tydIoWj0D7B+FsUx02v
-fkTlMOCp77ogdb5QX0+T7dbQ
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAwtxnAa7Vc53o/+/4aqU6d5+YfZjUXQZ7WFF6bf5zv/8ZtG3F
+eZjIbFbqgoxbu50493RsYcJcuTdUfyXTy+tK3vvKHjglK+uO9h0ySGqhOknrcVkv
+v5qjWIQppR2Ritsgrx9W6YBhiHOugY4bvr2wDAwwH1Z8/+EdDJJc2nBtyrSW9I/p
+GrgSpwHtSXCL/lifeQWxchJmPfdvzxiTFCHkjxTBCgmuqzpCmDA0FFfm65ZbN4Wt
+ahx/niOtbOhGVXBLbD0zlSvkRk862yDs0YrD0a+dCivHP/st3RhTFuhRGAx5ORO6
+ePyNKI21+4GVUjBgFl4efDBO/u1DGhhLZ0K4hwIDAQABAoIBAQCCyVGttH35qswf
+NB6E3b9fWNQNwI0QnvAcuBs3RmjEPeEv09mOIriq1q9xzekoBH+evxqbhsubWQKy
+kF4WaSeIgHEJVV/FmcYLdE8ygbcTG1gWbOj6bj0ihRo6g50TGL5YK+22rX9JCXPf
+6tS+cix9+ZQ3BGLDj4Fi1b3Ss1FNkjnjHycnEvhIhEunJ+DGYRj18SycZL7OyDRU
+khksMVuimcW8jx8kxvH38sj+MDbTvaFc/ukoS46tBKz9ZDJ553I0PTSHZfMw77+a
+x346j1gvkQCejjlVD2J7kRlEMYdPn52wzXmJyzAE/UpragSL1mxDaE0Yhl1qkGDG
+asAZZh2pAoGBAOs7zTF48b+NDbgQlDR57yaIiyDaMX2o9N0t+ob+y5HQr6F9LHE/
+Bjs83X7IMqFQsc25Ytd8jsYzX7qfjVuhMs+wMhRyTO8+nYAYHBTKL8UvCU+xzA5z
+xzcNLHOOyx2G4ZAb5aSgrX8/BZpZPxLictf8H/IPh42FNZv4b6YNezrTAoGBANQQ
+MVih4nM68BGncQpuX25dR/InoMchzJktlYILlHgYmeJu/FTiHqdaLZDgbIBnXdVB
+GGlMXIjesiC7gSGM23s8Yau047Pn8PQsC1a9Q8fS9CXmhqJmqjE3Fl793Q6vemQj
+cPc1Glg2wQ8iZ9mpAiRSQBRcNCMNZgnVFs7MllL9AoGBAN6NcZEA0BdeKECgztbn
+Fe/q91ZZmME+fIxV19Soc4i9W6z5dHagHhElgJlWZzBf3Bi68FzXJ201Zbh3A5JR
+bHU6Sec2TLt9Dh4GsWqp75Aq9DBGEr0JpMzc1dVun5SL7BQfkKC0s/DTe0WQcjA3
+tlfJ3Z9yOdkW0qWB4n/D+XapAoGBAI3gP4Ny2xQIzHCjO6ek7EfkNKw4AwL3A/E/
+ZBVbNfubSekKI9uOZL/GP1H8M9s8TLTOFkzsf8Q6aaYojF4r5PNwFFBSdzz34mcZ
+yIRBn8Vix2FL96tTUG4Y0ui+o1Sd5h5077EUYAnAqC098YjX38z5ElIM1fzVi/zs
+CZRVoATpAoGAP2UyFMYfXBAc4KmWsr8qLRegVHSsdWtuKDNxffM3kLS4AVYUF0Sl
+yGvit2PZG/z1FfjQTVuVjuTK/01xw7fWaVU16oqictneIQT7RS2Q5q0dNRxca9G5
+f2+Cbztk8Hkqak4SEpMclq0FoIjwIiX586x0DuA2V37ApL21l1He+no=
+-----END RSA PRIVATE KEY-----
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/request.csr b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/request.csr
index e62c7a1942..3adc2f9cfb 100644
--- a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/request.csr
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/request.csr
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE REQUEST-----
-MIIC2zCCAcMCAQAwfzELMAkGA1UEBhMCQVUxDzANBgNVBAgMBlN5ZG5leTEPMA0G
-A1UEBwwGU3lkbmV5MREwDwYDVQQKDAhMaW5hZ29yYTENMAsGA1UECwwESmF2YTEN
-MAsGA1UEAwwEdXNlcjEdMBsGCSqGSIb3DQEJARYOdXNlckBqYW1lcy5vcmcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA3l/Chv8oqcEsk1QENeQ+ClTo
-Ix85qBjwAOKTvMCXs6OazrfH9Z76pceDLql9q9h+H6DIsihpUKz00zZ5sICywQJR
-20ojdJe08V8dJ2QdrPxCfJYx23DP2CNia+RZXca7FKDdUCs2YV+pvyKfhOXhtIkz
-jLeQ8JELMxxV3hjlH3JqdL583vlVYIRTavmRAwVCoY46fynVqFYV9WGh9FK7tflB
-4WwyfuKfBcWgZtboQ1OPvJPZxxk69a8Q+0dwG15K933DwQrsC2usMliMhhFDlgjA
-q5CAsdsgArUtDDspEfufG6tfbJzy/PFrjt4FWWKohhek/7OwZTwaR4ERSdRTAgMB
-AAGgFzAVBgkqhkiG9w0BCQcxCAwGc2VjcmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBq
-PBrEU3uZnbms9MHmVGxI64hMKx4gJmq8Nmww2ON+lHTncsayFlj6DkV72+kcJ3MB
-IUMSRZs4HtLxe2fDOAitL/uuo/h6hJaACVlqZhxQO4B9VTPJLhTtvmSzs3HQVyW+
-qHvQRGVve4LXLfdmU9rPg5Sxo5ri6Hz1CWR2WNhtOfks7z19UQt6WVj035hcQmnt
-XwqeVC7FcP4MzQYhTCFYdoU1ZEuQPhmm+wyN9YpQ7WBOmAkrLHT1lvDgq2omqH/4
-CJP6zEkaDxKNbukaCGp1t3sJuWT16nBci/rxShqnKr0rGS+QqZir7uUnAdSUUERS
-Y5OIBQi6T/wWduaIayJV
+MIIC2jCCAcICAQAwfjELMAkGA1UEBhMCVk4xDjAMBgNVBAgMBUhhbm9pMQ4wDAYD
+VQQHDAVIYW5vaTERMA8GA1UECgwITGluYWdvcmExDjAMBgNVBAsMBUphbWVzMQ0w
+CwYDVQQDDAR1c2VyMR0wGwYJKoZIhvcNAQkBFg51c2VyQGphbWVzLm9yZzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLcZwGu1XOd6P/v+GqlOnefmH2Y
+1F0Ge1hRem3+c7//GbRtxXmYyGxW6oKMW7udOPd0bGHCXLk3VH8l08vrSt77yh44
+JSvrjvYdMkhqoTpJ63FZL7+ao1iEKaUdkYrbIK8fVumAYYhzroGOG769sAwMMB9W
+fP/hHQySXNpwbcq0lvSP6Rq4EqcB7Ulwi/5Yn3kFsXISZj33b88YkxQh5I8UwQoJ
+rqs6QpgwNBRX5uuWWzeFrWocf54jrWzoRlVwS2w9M5Ur5EZPOtsg7NGKw9GvnQor
+xz/7Ld0YUxboURgMeTkTunj8jSiNtfuBlVIwYBZeHnwwTv7tQxoYS2dCuIcCAwEA
+AaAXMBUGCSqGSIb3DQEJBzEIDAZzZWNyZXQwDQYJKoZIhvcNAQELBQADggEBAIdD
+YsObgyH00x9ZFM8R8i2ILlcbx8G1yAnJMvSLM0twQBGLbKjgUMsjK48qMog9WuD9
+Ze85z/7T9xPXbybvCxqEYUo+qKXL//dFl5Bigw4f6yNYhw2R0EjdTHolGJ3EqkKv
+1XhwtOYXGLQugld1yLBVhsBRLHZUzGc77mbHSlmbD4KiwEhsxkue+Zwl46nrZHlu
+G887kQyQVs+Kd0s8onrL1VLn5/qOqVTo2oh17YjbWcvjk/Tz+jb6qe0f8iMnrJxs
+LToYPYL4OEhLE1SyND2x9j5gfZHw1pi/JxR7z+E+iVErYgWYcX4Ruqrcnf4klG3y
+XAF2nsLLDrCoe9GxKsQ=
-----END CERTIFICATE REQUEST-----
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.crt b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.crt
new file mode 100644
index 0000000000..e7b0b65125
--- /dev/null
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.crt
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID5TCCAs2gAwIBAgIUASoDQ2Wf0Mef+y9bfCqSMy6hFfMwDQYJKoZIhvcNAQEL
+BQAwgYAxCzAJBgNVBAYTAlZOMQ4wDAYDVQQIDAVIYW5vaTEOMAwGA1UEBwwFSGFu
+b2kxETAPBgNVBAoMCExpbmFnb3JhMQ4wDAYDVQQLDAVKYW1lczEOMAwGA1UEAwwF
+YWRtaW4xHjAcBgkqhkiG9w0BCQEWD2FkbWluQGphbWVzLm9yZzAgFw0yNDA4MTUw
+ODQzNDBaGA8yMjk4MDUzMTA4NDM0MFowgYAxCzAJBgNVBAYTAlZOMQ4wDAYDVQQI
+DAVIYW5vaTEOMAwGA1UEBwwFSGFub2kxETAPBgNVBAoMCExpbmFnb3JhMQ4wDAYD
+VQQLDAVKYW1lczEOMAwGA1UEAwwFYWRtaW4xHjAcBgkqhkiG9w0BCQEWD2FkbWlu
+QGphbWVzLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMShojs1
+MXL0IAAjmuLTYoNzXGTjfsmdIi+M9n/I5+QGpixcQzaX5uniP6b+AgsIhRlQPN+W
+ixwWmpnDhZu+bV7bgJKXv0YmoKaGQGDb5N/PfuDpfGuVzQphjjtQP7jmW3wpqzNa
+MBT03z5nK/WBxeMJXE9bYNT5rP28YCDg0f8sSKSZkMUdlYfoUm+vYH9+bmIwzaTF
+6kRc6M+n/ELzDvDS+KevtJ3q4P710qTukH7uXEVEzs/lUSVtHXg/HrJ7tld3bnrq
+ASDB0EmPljqjsHJB/f3n4PoT/Ansc4r4vjASQCPzr2yq6e7jHnU+QN4pXGUQv5Rd
+zGqThOSRnyvQSgcCAwEAAaNTMFEwHQYDVR0OBBYEFJLv8+NebeBDDJWLpb3cD+kF
+aIjeMB8GA1UdIwQYMBaAFJLv8+NebeBDDJWLpb3cD+kFaIjeMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFal8TpKaOBESJC9Nhb71Ivw8fV+kGdq
+YySdseOnuXgAorXfs6MK0ko/rbrTJjS9JImbFcxTqHim+kTTsiy3wvYBUi77DKoS
+XVhl5EuNkdkMG1EhR1kC7SUJv5C4o7i1OZIJwf7ATWyo/KbEezIIlvS7Jz9q7EOG
+9zm57k+noY/BvbcRCh0CmOyD5MuyFGw+PitPiWzsWTK0PCBKRKwzRi0hbw/w4PHk
+ur+/0bhMVU4kuE7SquRn3pjoxtQqYGy55xEAl/Rkzd5a9PD7vTnf3o2RcA5/K/5N
+HJL1vvH3jMNLXBy/t3Uek5H/6BM8qxtAqNoJcnCfbm7zYz2GFGXThr0=
+-----END CERTIFICATE-----
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.private.key b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.private.key
new file mode 100644
index 0000000000..69e04ff630
--- /dev/null
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.private.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAxKGiOzUxcvQgACOa4tNig3NcZON+yZ0iL4z2f8jn5AamLFxD
+Npfm6eI/pv4CCwiFGVA835aLHBaamcOFm75tXtuAkpe/RiagpoZAYNvk389+4Ol8
+a5XNCmGOO1A/uOZbfCmrM1owFPTfPmcr9YHF4wlcT1tg1Pms/bxgIODR/yxIpJmQ
+xR2Vh+hSb69gf35uYjDNpMXqRFzoz6f8QvMO8NL4p6+0nerg/vXSpO6Qfu5cRUTO
+z+VRJW0deD8esnu2V3dueuoBIMHQSY+WOqOwckH9/efg+hP8Cexzivi+MBJAI/Ov
+bKrp7uMedT5A3ilcZRC/lF3MapOE5JGfK9BKBwIDAQABAoIBAQCV54/RyaTQOXMo
+B/ztzi+9fTZEJ/eh5uyICdRm6Rh4i+UlzpTjSv0c84KJYf7WwIEQIk62OoQFPupQ
+LXJvoMaq2Xb0y0FkTtCNA66S6TFcu0jEWNyk/Ihb0LHpYC2kXeIDD5VYSfp8D48e
+ePNXcL8Xbix0x3pUA6CxtGooxpzyBkzrBmH9g2Ep/SL6DU3UVPbcpgRv4AYJsofs
+66ENkGD26Zat19SSlyCzqfLDTrVVY28JZsYwxWPrg7oyo0rKyjEI5ZUiLLz1foCI
++r7JsxQ9g5i5RuB0Cb3+8Rjv0PVO2DS5HzB6Y34zxFvE2AITeOWoIJFMf1CT2Hc7
+jWhel7bpAoGBAP6Vmn4AGVPnAnXuVbtU3U/aJTEhTaJ2QyY8y0mafuHv3tcHYG2T
+i6CX/1HxuBRVFRLptxRBB57sSepnLbK8Ik51BhWwESRdUzaGQCOjnfH7IinDvX77
+0KtXnSBT7OE4N2rNcEes4A2Uu1qTEpzVfIYJPzZ1SWoUjvXtadjANahTAoGBAMW5
+iP2G4jXeFa0/YUJ+kYGOSWizy4rkbqxn5XG/tA/H//bbD8QW8TjGIP39phvQsNzf
+V/jVwCyqu9gFKGj0R4ERSVMjDxjVY3i7hU9jH83NjFRGyumdg7dKtNFXvJZT1aE6
+MH5+8NSEPUG5Bw6q821Z/5dZjzdl1wCfDbnjNVD9AoGBAOU+xd1MLYJ19KtJMH39
+z0PGhdMV0BjJMXJPMCdZLYQ6QYmTpOtG/2ZfOJQLe90jOFTNjAR7AmfDElQ3ENlv
+u9y2WAJThzwdpX7lqP/up51srLi6//pGuwJvZJflutqbiptr3v1L2H2iPoszAIGl
+Y/o2fWuGddNGK+2cGcIKYsbtAoGAPhJW3TBhB4QmzfKdt+BAEan3hbUb6wh3bgxX
+zXPfNS0WQArZUjfZlncsmE/uu8CyJUTAO0/vOpaGzfQgkYJOiEhC+qSA8szao2ZL
+HXcC3vruWO64eMqINRxw0191xsOexzSbULrNJAo3qNBLVOF59hRQ1tS4zy1bZ8iG
+6JpZfIkCgYAb5ZA4Pr9JuzJDGCMsytZUvcuSjceCidJL1Ls///FJiLboSPSacLpn
+TjIEdZ9+GAUb5zsKMezt6sWA98G7GY4KKcwS0hn0Op0piihkIf0AII97BiVmqhqI
+yc6WSpCGTy5PgnL22UcAnZZcVa8hS4V2v11Qblw46UGLHEn9nyIguQ==
+-----END RSA PRIVATE KEY-----
diff --git a/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.srl b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.srl
new file mode 100644
index 0000000000..36685cc302
--- /dev/null
+++ b/server/mailet/integration-testing/src/main/resources/smime-test-resource-set/rootCA.srl
@@ -0,0 +1 @@
+0D7772E97111FE45872B8D654C9C552705CF650E
diff --git a/server/mailet/integration-testing/src/main/resources/smime_cert_keystore b/server/mailet/integration-testing/src/main/resources/smime_cert_keystore
deleted file mode 100644
index c63faedce6..0000000000
Binary files a/server/mailet/integration-testing/src/main/resources/smime_cert_keystore and /dev/null differ
diff --git a/server/mailet/integration-testing/src/main/resources/trusted_cert_keystore b/server/mailet/integration-testing/src/main/resources/trusted_cert_keystore
new file mode 100644
index 0000000000..3d164e6125
Binary files /dev/null and b/server/mailet/integration-testing/src/main/resources/trusted_cert_keystore differ
diff --git a/server/mailet/integration-testing/src/main/resources/trusted_certificate.pem b/server/mailet/integration-testing/src/main/resources/trusted_certificate.pem
index 9921e532ff..f668e5659a 100644
--- a/server/mailet/integration-testing/src/main/resources/trusted_certificate.pem
+++ b/server/mailet/integration-testing/src/main/resources/trusted_certificate.pem
@@ -1,21 +1,23 @@
-----BEGIN CERTIFICATE-----
-MIIDhzCCAm8CFCV37M3Jd25yesXwGVMeQfDo2JSMMA0GCSqGSIb3DQEBCwUAMH8x
-CzAJBgNVBAYTAkFVMQ8wDQYDVQQIDAZTeWRuZXkxDzANBgNVBAcMBlN5ZG5leTER
-MA8GA1UECgwITGluYWdvcmExDTALBgNVBAsMBEphdmExDTALBgNVBAMMBHVzZXIx
-HTAbBgkqhkiG9w0BCQEWDnVzZXJAamFtZXMub3JnMCAXDTI0MDcyNjEzMjUyM1oY
-DzIyOTgwNTExMTMyNTIzWjB/MQswCQYDVQQGEwJBVTEPMA0GA1UECAwGU3lkbmV5
-MQ8wDQYDVQQHDAZTeWRuZXkxETAPBgNVBAoMCExpbmFnb3JhMQ0wCwYDVQQLDARK
-YXZhMQ0wCwYDVQQDDAR1c2VyMR0wGwYJKoZIhvcNAQkBFg51c2VyQGphbWVzLm9y
-ZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDeX8KG/yipwSyTVAQ1
-5D4KVOgjHzmoGPAA4pO8wJezo5rOt8f1nvqlx4MuqX2r2H4foMiyKGlQrPTTNnmw
-gLLBAlHbSiN0l7TxXx0nZB2s/EJ8ljHbcM/YI2Jr5FldxrsUoN1QKzZhX6m/Ip+E
-5eG0iTOMt5DwkQszHFXeGOUfcmp0vnze+VVghFNq+ZEDBUKhjjp/KdWoVhX1YaH0
-Uru1+UHhbDJ+4p8FxaBm1uhDU4+8k9nHGTr1rxD7R3AbXkr3fcPBCuwLa6wyWIyG
-EUOWCMCrkICx2yACtS0MOykR+58bq19snPL88WuO3gVZYqiGF6T/s7BlPBpHgRFJ
-1FMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAoK7bBXNX3OPCxtnmQnNgq5O0ZSl4
-3j/5y/8woBOq1F1aIRoBHaWgcJ+oMfTEzNBk6N1oLCPne+Yvh3cUjgskvdC8Ea97
-jjX9Wm5DJQyENPjoXxGrSJ5/VkCFVVpOLNWEZIp8dUCAdNW6FL59GhPChn6rgZw0
-b9pceknEjwv3K6/q8eR5zU+wygOIQ7iG6YK74I0Fh7HNLxXjgbalqr1Zls8DVTCq
-dgbqwLmUaDS6yQxQEr2M1VdUYt6He7ewlvJn9moSKmiJoNCtjqDiInm1798KbLSM
-hi3WlRxFheaOmBnWYqrolNEhc5p0RWQmn2apbx3Uz17m4QBenWaUEFP1ug==
------END CERTIFICATE-----
+MIID5TCCAs2gAwIBAgIUASoDQ2Wf0Mef+y9bfCqSMy6hFfMwDQYJKoZIhvcNAQEL
+BQAwgYAxCzAJBgNVBAYTAlZOMQ4wDAYDVQQIDAVIYW5vaTEOMAwGA1UEBwwFSGFu
+b2kxETAPBgNVBAoMCExpbmFnb3JhMQ4wDAYDVQQLDAVKYW1lczEOMAwGA1UEAwwF
+YWRtaW4xHjAcBgkqhkiG9w0BCQEWD2FkbWluQGphbWVzLm9yZzAgFw0yNDA4MTUw
+ODQzNDBaGA8yMjk4MDUzMTA4NDM0MFowgYAxCzAJBgNVBAYTAlZOMQ4wDAYDVQQI
+DAVIYW5vaTEOMAwGA1UEBwwFSGFub2kxETAPBgNVBAoMCExpbmFnb3JhMQ4wDAYD
+VQQLDAVKYW1lczEOMAwGA1UEAwwFYWRtaW4xHjAcBgkqhkiG9w0BCQEWD2FkbWlu
+QGphbWVzLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMShojs1
+MXL0IAAjmuLTYoNzXGTjfsmdIi+M9n/I5+QGpixcQzaX5uniP6b+AgsIhRlQPN+W
+ixwWmpnDhZu+bV7bgJKXv0YmoKaGQGDb5N/PfuDpfGuVzQphjjtQP7jmW3wpqzNa
+MBT03z5nK/WBxeMJXE9bYNT5rP28YCDg0f8sSKSZkMUdlYfoUm+vYH9+bmIwzaTF
+6kRc6M+n/ELzDvDS+KevtJ3q4P710qTukH7uXEVEzs/lUSVtHXg/HrJ7tld3bnrq
+ASDB0EmPljqjsHJB/f3n4PoT/Ansc4r4vjASQCPzr2yq6e7jHnU+QN4pXGUQv5Rd
+zGqThOSRnyvQSgcCAwEAAaNTMFEwHQYDVR0OBBYEFJLv8+NebeBDDJWLpb3cD+kF
+aIjeMB8GA1UdIwQYMBaAFJLv8+NebeBDDJWLpb3cD+kFaIjeMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFal8TpKaOBESJC9Nhb71Ivw8fV+kGdq
+YySdseOnuXgAorXfs6MK0ko/rbrTJjS9JImbFcxTqHim+kTTsiy3wvYBUi77DKoS
+XVhl5EuNkdkMG1EhR1kC7SUJv5C4o7i1OZIJwf7ATWyo/KbEezIIlvS7Jz9q7EOG
+9zm57k+noY/BvbcRCh0CmOyD5MuyFGw+PitPiWzsWTK0PCBKRKwzRi0hbw/w4PHk
+ur+/0bhMVU4kuE7SquRn3pjoxtQqYGy55xEAl/Rkzd5a9PD7vTnf3o2RcA5/K/5N
+HJL1vvH3jMNLXBy/t3Uek5H/6BM8qxtAqNoJcnCfbm7zYz2GFGXThr0=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureIntegrationTest.java
index 312629f27a..6576d81207 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureIntegrationTest.java
@@ -65,7 +65,7 @@ public abstract class SMIMECheckSignatureIntegrationTest {
messageSender().connect(LOCALHOST_IP, jamesServer().getProbe(SmtpGuiceProbe.class).getSmtpAuthRequiredPort())
.authenticate(FROM, PASSWORD)
.sendMessageWithHeaders(FROM, RECIPIENT,
- ClassLoaderUtils.getSystemResourceAsString("smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime"));
+ ClassLoaderUtils.getSystemResourceAsString("smime-test-resource-set/mail_with_signature_and_content_type_xpkcs7mime.eml"));
testIMAPClient().connect(LOCALHOST_IP, jamesServer().getProbe(ImapGuiceProbe.class).getImapPort())
.login(RECIPIENT, PASSWORD)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureWithKeyStoreFileIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureWithKeyStoreFileIntegrationTest.java
index 4182fbff2a..d730acd0b1 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureWithKeyStoreFileIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMECheckSignatureWithKeyStoreFileIntegrationTest.java
@@ -59,7 +59,7 @@ public class SMIMECheckSignatureWithKeyStoreFileIntegrationTest extends SMIMEChe
.mailet(SMIMECheckSignature.class)
.matcher(All.class)
.addProperty("fileType", "keystore")
- .addProperty("keyStoreFileName", temporaryFolder.toPath().resolve("conf").resolve("smime_cert_keystore").toAbsolutePath().toString())
+ .addProperty("keyStoreFileName", temporaryFolder.toPath().resolve("conf").resolve("trusted_cert_keystore").toAbsolutePath().toString())
.addProperty("keyStorePassword", "secret")
.addProperty("keyStoreType", "PKCS12")
.addProperty("debug", "true"))
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org