This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 6063727 [Documentation] Fix missing content-type in upgrade schema
version command
add 9e7728a JAMES-3639 Allow use PEM keys for SSL
new 35cbd6d Merge pull request #626 JAMES-3639 Allow use PEM keys for SSL
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 ++++++++
...erverSslDefaultJKS.xml => imapServerSslPEM.xml} | 4 +-
...BadPassword.xml => imapServerSslPEMBadPass.xml} | 5 +-
...efaultJKS.xml => imapServerSslPEMExtraPass.xml} | 4 +-
...lNoKeys.xml => imapServerSslPEMMissingPass.xml} | 2 +
...verSslNoKeys.xml => imapServerSslPEMNoPass.xml} | 2 +
....xml => imapServerSslPKCS12MissingPassword.xml} | 1 -
.../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, 589 insertions(+), 68 deletions(-)
create mode 100644
server/protocols/protocols-imap4/src/test/resources/certs.csr
create mode 100644
server/protocols/protocols-imap4/src/test/resources/certs.self-signed.csr
copy
server/protocols/protocols-imap4/src/test/resources/{imapServerSslDefaultJKS.xml
=> imapServerSslPEM.xml} (56%)
copy
server/protocols/protocols-imap4/src/test/resources/{imapServerSslJKSBadPassword.xml
=> imapServerSslPEMBadPass.xml} (50%)
copy
server/protocols/protocols-imap4/src/test/resources/{imapServerSslDefaultJKS.xml
=> imapServerSslPEMExtraPass.xml} (56%)
copy
server/protocols/protocols-imap4/src/test/resources/{imapServerSslNoKeys.xml =>
imapServerSslPEMMissingPass.xml} (55%)
copy
server/protocols/protocols-imap4/src/test/resources/{imapServerSslNoKeys.xml =>
imapServerSslPEMNoPass.xml} (53%)
copy
server/protocols/protocols-imap4/src/test/resources/{imapServerSslPKCS12WrongPassword.xml
=> imapServerSslPKCS12MissingPassword.xml} (87%)
create mode 100644
server/protocols/protocols-imap4/src/test/resources/private.key
create mode 100644
server/protocols/protocols-imap4/src/test/resources/private.nopass.key
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
