summaryrefslogtreecommitdiffstats
path: root/base/server/python
diff options
context:
space:
mode:
authorChristina Fu <cfu@redhat.com>2016-06-30 15:01:42 -0700
committerChristina Fu <cfu@redhat.com>2016-06-30 15:46:19 -0700
commitf0ad71e8a4fbae665a6b4875cce5b82895ad74f0 (patch)
tree988be317c19b0498cafdc82d8d40c8b5b051cc30 /base/server/python
parentd86a514800483edf3310c4bde6c8b5bd56b074bc (diff)
downloadpki-f0ad71e8a4fbae665a6b4875cce5b82895ad74f0.tar.gz
pki-f0ad71e8a4fbae665a6b4875cce5b82895ad74f0.tar.xz
pki-f0ad71e8a4fbae665a6b4875cce5b82895ad74f0.zip
Bugzilla #1203407 tomcatjss: missing ciphers
This patch removes references to the ciphers currently unsupported by NSS: TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
Diffstat (limited to 'base/server/python')
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index dc5d7f636..d940e2c94 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -971,7 +971,6 @@ class PKIConfigParser:
"-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_ECDH_RSA_WITH_AES_128_GCM_SHA256," + \
"+TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA," + \
"-TLS_RSA_WITH_3DES_EDE_CBC_SHA," + \
"-TLS_RSA_WITH_AES_128_CBC_SHA," + \
@@ -1006,8 +1005,6 @@ class PKIConfigParser:
"-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_ECDH_ECDSA_WITH_AES_128_GCM_SHA256," + \
- "-TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256," +\
"-TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA," + \
"-TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA," + \
"-TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA," + \