[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Pki-devel] [PATCH] pki-cfu-0079-Ticket-1438-pkispawn-SSL_ForceHandshake-issue-for-no.patch



This patch address the issue in:
https://fedorahosted.org/pki/ticket/1438 pkispawn: SSL_ForceHandshake issue for non-CA on HSM on both shared and nonshared tomcat instances

Please review.
thanks,
Christina
>From 0a66a7705be19dde3f33d9c5431d8f6b87f0df7c Mon Sep 17 00:00:00 2001
From: Christina Fu <cfu redhat com>
Date: Mon, 29 Jun 2015 15:34:01 -0700
Subject: [PATCH] Ticket 1438 pkispawn: SSL_ForceHandshake issue for non-CA on
 HSM on both shared and nonshared tomcat instances

---
 .../python/pki/server/deployment/pkiparser.py      | 107 ++++++++++++++-------
 1 file changed, 72 insertions(+), 35 deletions(-)

diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 7e1813c75b891466600117998559c6c1c714ef94..4b3dabb927f138fa7d7e5977951380692a60debc 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -921,41 +921,78 @@ class PKIConfigParser:
                 "tls1_0:tls1_2"
             self.mdict['TOMCAT_SSL_VERSION_RANGE_DATAGRAM_SLOT'] = \
                 "tls1_1:tls1_2"
-            self.mdict['TOMCAT_SSL_RANGE_CIPHERS_SLOT'] = \
-                "-TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA," + \
-                "-TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA," + \
-                "+TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA," + \
-                "+TLS_ECDH_RSA_WITH_AES_128_CBC_SHA," + \
-                "+TLS_ECDH_RSA_WITH_AES_256_CBC_SHA," + \
-                "-TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA," + \
-                "+TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA," + \
-                "+TLS_RSA_WITH_3DES_EDE_CBC_SHA," + \
-                "+TLS_RSA_WITH_AES_128_CBC_SHA," + \
-                "+TLS_RSA_WITH_AES_256_CBC_SHA," + \
-                "+TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA," + \
-                "+TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA," + \
-                "-TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA," + \
-                "-TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA," + \
-                "-TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA," + \
-                "+TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA," + \
-                "+TLS_DHE_DSS_WITH_AES_128_CBC_SHA," + \
-                "+TLS_DHE_DSS_WITH_AES_256_CBC_SHA," + \
-                "+TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA," + \
-                "+TLS_DHE_RSA_WITH_AES_128_CBC_SHA," + \
-                "+TLS_DHE_RSA_WITH_AES_256_CBC_SHA," + \
-                "+TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," + \
-                "+TLS_DHE_RSA_WITH_AES_256_CBC_SHA256," + \
-                "+TLS_RSA_WITH_AES_128_CBC_SHA256," + \
-                "+TLS_RSA_WITH_AES_256_CBC_SHA256," + \
-                "+TLS_RSA_WITH_AES_128_GCM_SHA256," + \
-                "+TLS_DHE_RSA_WITH_AES_128_GCM_SHA256," + \
-                "+TLS_DHE_DSS_WITH_AES_128_GCM_SHA256," + \
-                "+TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256," + \
-                "+TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256," + \
-                "+TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256," + \
-                "+TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256," + \
-                "+TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," + \
-                "+TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
+            if self.mdict['pki_ssl_server_key_type'] == "ecc":
+                self.mdict['TOMCAT_SSL_RANGE_CIPHERS_SLOT'] = \
+                    "+TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA," + \
+                    "+TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "+TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "+TLS_ECDH_RSA_WITH_AES_128_CBC_SHA," + \
+                    "+TLS_ECDH_RSA_WITH_AES_256_CBC_SHA," + \
+                    "+TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA," + \
+                    "+TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_RSA_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_RSA_WITH_AES_256_CBC_SHA," + \
+                    "+TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "+TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA," + \
+                    "+TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "+TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA," + \
+                    "+TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_DHE_DSS_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_DHE_DSS_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_DHE_RSA_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_DHE_RSA_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," + \
+                    "-TLS_DHE_RSA_WITH_AES_256_CBC_SHA256," + \
+                    "-TLS_RSA_WITH_AES_128_CBC_SHA256," + \
+                    "-TLS_RSA_WITH_AES_256_CBC_SHA256," + \
+                    "-TLS_RSA_WITH_AES_128_GCM_SHA256," + \
+                    "-TLS_DHE_RSA_WITH_AES_128_GCM_SHA256," + \
+                    "-TLS_DHE_DSS_WITH_AES_128_GCM_SHA256," + \
+                    "+TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256," + \
+                    "+TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256," + \
+                    "+TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256," + \
+                    "+TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256," + \
+                    "+TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," + \
+                    "+TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
+            else:
+                self.mdict['TOMCAT_SSL_RANGE_CIPHERS_SLOT'] = \
+                    "-TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_ECDH_RSA_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_ECDH_RSA_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA," + \
+                    "+TLS_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "+TLS_RSA_WITH_AES_128_CBC_SHA," + \
+                    "+TLS_RSA_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA," + \
+                    "-TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA," + \
+                    "-TLS_DHE_DSS_WITH_AES_128_CBC_SHA," + \
+                    "-TLS_DHE_DSS_WITH_AES_256_CBC_SHA," + \
+                    "+TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA," + \
+                    "+TLS_DHE_RSA_WITH_AES_128_CBC_SHA," + \
+                    "+TLS_DHE_RSA_WITH_AES_256_CBC_SHA," + \
+                    "+TLS_DHE_RSA_WITH_AES_128_CBC_SHA256," + \
+                    "+TLS_DHE_RSA_WITH_AES_256_CBC_SHA256," + \
+                    "+TLS_RSA_WITH_AES_128_CBC_SHA256," + \
+                    "+TLS_RSA_WITH_AES_256_CBC_SHA256," + \
+                    "+TLS_RSA_WITH_AES_128_GCM_SHA256," + \
+                    "+TLS_DHE_RSA_WITH_AES_128_GCM_SHA256," + \
+                    "-TLS_DHE_DSS_WITH_AES_128_GCM_SHA256," + \
+                    "-TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256," + \
+                    "-TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256," + \
+                    "-TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256," + \
+                    "-TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256," + \
+                    "-TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256," + \
+                    "-TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
             self.mdict['TOMCAT_SSL2_CIPHERS_SLOT'] = \
                 "-SSL2_RC4_128_WITH_MD5," + \
                 "-SSL2_RC4_128_EXPORT40_WITH_MD5," + \
-- 
1.8.4.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]