You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/06/27 15:47:49 UTC
[tomcat] branch 8.5.x updated (513e54c -> 756cce5)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 513e54c Obtain PEM files via ConfigFileLoader
new a5b3215 Fix typo. Add comment on GOST ciphers
new 756cce5 Get tests passing with latest 1.0.2 code
The 2 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:
java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java | 5 +++--
.../org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 8 ++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix typo. Add comment on GOST ciphers
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a5b3215ddb873e4e8de6d0b1edfd28ee950ef283
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 27 16:44:57 2019 +0100
Fix typo. Add comment on GOST ciphers
---
java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java b/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
index 2a1fefc..e34fb61 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
@@ -1500,8 +1500,9 @@ public enum Cipher {
null,
null
),
- /* GOST Ciphersuites. Unsupported by Java. OpenSSl lists them with IDs
- * 0x3000080 to 0x3000083 */
+ /* GOST Ciphersuites. Unsupported by Java. OpenSSL lists them with IDs
+ * 0x3000080 to 0x3000083
+ * The ciphers are not listed in the IANA registry. */
/*
// Cipher 80
TLS_GOSTR341094_WITH_28147_CNT_IMIT(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Get tests passing with latest 1.0.2 code
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 756cce5d3898bed56ffc5c9fec5d08339560e5a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 27 16:45:16 2019 +0100
Get tests passing with latest 1.0.2 code
---
.../org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index 91ac42e..95ab187 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -367,6 +367,14 @@ public class TesterOpenSSL {
// Standard command to list the ciphers
args.add("ciphers");
args.add("-v");
+ if (VERSION < 10100) {
+ // Need to exclude the GOST ciphers
+ if (specification == null) {
+ specification = "DEFAULT:!aGOST";
+ } else {
+ specification = "!aGOST:" + specification;
+ }
+ }
if (VERSION >= 10101) {
// Need to exclude the TLSv1.3 ciphers
args.add("-ciphersuites");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org