You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/09/13 01:18:02 UTC
[james-project] 01/01: Merge pull request #626 JAMES-3639 Allow use
PEM keys for SSL
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 35cbd6dd89a7d85d1c8a7ea5a1c70900c351408f
Merge: 6063727 9e7728a
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Mon Sep 13 08:17:57 2021 +0700
Merge pull request #626 JAMES-3639 Allow use PEM keys for SSL
.../servers/pages/distributed/configure/ssl.adoc | 50 +++++++++++++++++++-
pom.xml | 5 ++
.../sample-configuration/imapserver.xml | 12 +++++
.../sample-configuration/jmap.properties | 6 +++
.../sample-configuration/pop3server.xml | 6 +++
.../sample-configuration/smtpserver.xml | 18 +++++++
.../sample-configuration/imapserver.xml | 12 +++++
.../sample-configuration/jmap.properties | 6 +++
.../sample-configuration/pop3server.xml | 6 +++
.../sample-configuration/smtpserver.xml | 18 +++++++
.../jpa-app/sample-configuration/imapserver.xml | 12 +++++
.../jpa-app/sample-configuration/pop3server.xml | 6 +++
.../jpa-app/sample-configuration/smtpserver.xml | 18 +++++++
.../sample-configuration/smtpserver.xml | 18 +++++++
.../memory-app/sample-configuration/imapserver.xml | 12 +++++
.../sample-configuration/jmap.properties | 6 +++
.../memory-app/sample-configuration/pop3server.xml | 6 +++
.../memory-app/sample-configuration/smtpserver.xml | 18 +++++++
.../spring-app/src/main/resources/imapserver.xml | 10 +++-
.../spring-app/src/main/resources/pop3server.xml | 6 +++
.../spring-app/src/main/resources/smtpserver.xml | 6 +++
.../org/apache/james/jmap/draft/JMAPModule.java | 6 ++-
server/protocols/jmap-draft/pom.xml | 4 ++
.../james/jmap/draft/JMAPDraftConfiguration.java | 55 +++++++++++++++++-----
.../james/jmap/draft/crypto/SecurityKeyLoader.java | 42 +++++++++++++----
.../jmap/draft/JMAPDraftConfigurationTest.java | 18 ++++---
.../jmap/draft/crypto/SecurityKeyLoaderTest.java | 6 ++-
.../james/imapserver/netty/IMAPServerTest.java | 51 ++++++++++++++++++--
.../protocols-imap4/src/test/resources/certs.csr | 16 +++++++
.../src/test/resources/certs.self-signed.csr | 19 ++++++++
.../src/test/resources/imapServerSslPEM.xml | 10 ++++
.../src/test/resources/imapServerSslPEMBadPass.xml | 10 ++++
.../test/resources/imapServerSslPEMExtraPass.xml | 10 ++++
.../test/resources/imapServerSslPEMMissingPass.xml | 9 ++++
.../src/test/resources/imapServerSslPEMNoPass.xml | 9 ++++
.../imapServerSslPKCS12MissingPassword.xml | 9 ++++
.../protocols-imap4/src/test/resources/private.key | 30 ++++++++++++
.../src/test/resources/private.nopass.key | 27 +++++++++++
server/protocols/protocols-library/pom.xml | 4 ++
.../lib/netty/AbstractConfigurableAsyncServer.java | 49 +++++++++++++------
src/site/xdoc/server/config-ssl-tls.xml | 55 ++++++++++++++++++++--
41 files changed, 636 insertions(+), 60 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org