|
 |
88aca9 |
From 6bf887340626e35e0497deaf246a9f034d8fe8ee Mon Sep 17 00:00:00 2001
|
|
|
88aca9 |
From: Rob Crittenden <rcritten@redhat.com>
|
|
|
88aca9 |
Date: Mon, 23 May 2016 17:21:11 -0400
|
|
|
88aca9 |
Subject: [PATCH] Add back export and low-security ciphers
|
|
|
88aca9 |
|
|
|
88aca9 |
These are disabled in OpenSSL 1.02g but are still enabled in
|
|
|
88aca9 |
the version in RHEL 7.
|
|
|
88aca9 |
---
|
|
|
88aca9 |
test/test_cipher.py | 5 ++---
|
|
|
88aca9 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
88aca9 |
|
|
|
88aca9 |
diff --git a/test/test_cipher.py b/test/test_cipher.py
|
|
|
88aca9 |
index 1cce9e4..8b12f26 100644
|
|
|
88aca9 |
--- a/test/test_cipher.py
|
|
|
88aca9 |
+++ b/test/test_cipher.py
|
|
|
88aca9 |
@@ -40,7 +40,7 @@ if ENABLE_SERVER_DHE == 0:
|
|
|
88aca9 |
OPENSSL_CIPHERS_IGNORE += ':-DH'
|
|
|
88aca9 |
|
|
|
88aca9 |
def assert_equal_openssl(ciphers):
|
|
|
88aca9 |
- nss_ciphers = ciphers + ":-EXP:-LOW"
|
|
|
88aca9 |
+ nss_ciphers = ciphers
|
|
|
88aca9 |
ossl_ciphers = ciphers + OPENSSL_CIPHERS_IGNORE
|
|
|
88aca9 |
(nss, err, rc) = run([exe, "--o", nss_ciphers])
|
|
|
88aca9 |
assert rc == 0
|
|
|
88aca9 |
@@ -270,8 +270,7 @@ class test_ciphers(object):
|
|
|
88aca9 |
assert_no_NULL("DEFAULT:aRSA")
|
|
|
88aca9 |
|
|
|
88aca9 |
def test_SYSTEM_DEFAULT(self):
|
|
|
88aca9 |
- # I've added in !DHE here which differs from F-23 default
|
|
|
88aca9 |
- assert_equal_openssl("!SSLv2:kEECDH:kRSA:kEDH:kPSK:+3DES:!aNULL:!eNULL:!MD5:!EXP:!RC4:!SEED:!IDEA:!DES:!DHE")
|
|
|
88aca9 |
+ assert_equal_openssl("!SSLv2:kEECDH:kRSA:kEDH:kPSK:DH:+3DES:!aNULL:!eNULL:!MD5:!EXP:!RC4:!SEED:!IDEA:!DES")
|
|
|
88aca9 |
|
|
|
88aca9 |
def test_cipher_reorder(self):
|
|
|
88aca9 |
# re-ordering now allowed but shouldn't blow up either
|
|
|
88aca9 |
--
|
|
|
88aca9 |
2.5.5
|
|
|
88aca9 |
|