|
 |
a2f18f |
From 5dda81412db1609f67035957ab65a6c726228e00 Mon Sep 17 00:00:00 2001
|
|
|
a2f18f |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
a2f18f |
Date: Tue, 14 Jul 2015 11:12:56 -0700
|
|
|
a2f18f |
Subject: [PATCH 20/20] Ticket #48194 - CI test: fixing test cases for ticket
|
|
|
a2f18f |
48194
|
|
|
a2f18f |
|
|
|
a2f18f |
Description: nsSSL3Ciphers preference not enforced server side
|
|
|
a2f18f |
. Test Case 6 - wrong expectation for RC4-SHA
|
|
|
a2f18f |
. Test Case 7 - removing a extra space in nsSSL3Ciphers
|
|
|
a2f18f |
|
|
|
a2f18f |
(cherry picked from commit f69ce333052f7f33350fd4038b8f598f650a743f)
|
|
|
a2f18f |
(cherry picked from commit ca9e6f9292289a7b6b7f57602555bf9aeb9ba9de)
|
|
|
a2f18f |
---
|
|
|
a2f18f |
dirsrvtests/tickets/ticket48194_test.py | 6 +++---
|
|
|
a2f18f |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
a2f18f |
|
|
|
a2f18f |
diff --git a/dirsrvtests/tickets/ticket48194_test.py b/dirsrvtests/tickets/ticket48194_test.py
|
|
|
a2f18f |
index 18739ca..17e179a 100644
|
|
|
a2f18f |
--- a/dirsrvtests/tickets/ticket48194_test.py
|
|
|
a2f18f |
+++ b/dirsrvtests/tickets/ticket48194_test.py
|
|
|
a2f18f |
@@ -295,7 +295,7 @@ def test_ticket48194_run_4(topology):
|
|
|
a2f18f |
Default ciphers are enabled.
|
|
|
a2f18f |
default allowWeakCipher
|
|
|
a2f18f |
"""
|
|
|
a2f18f |
- _header(topology, 'Test Case 5 - Check no nsSSL3Ciphers (default setting) with default allowWeakCipher')
|
|
|
a2f18f |
+ _header(topology, 'Test Case 5 - Check no nsSSL3Ciphers (-all) with default allowWeakCipher')
|
|
|
a2f18f |
|
|
|
a2f18f |
topology.standalone.simple_bind_s(DN_DM, PASSWORD)
|
|
|
a2f18f |
topology.standalone.modify_s(ENCRYPTION_DN, [(ldap.MOD_DELETE, 'nsSSL3Ciphers', '-all')])
|
|
|
a2f18f |
@@ -326,7 +326,7 @@ def test_ticket48194_run_5(topology):
|
|
|
a2f18f |
os.system('touch %s' % (topology.standalone.errlog))
|
|
|
a2f18f |
topology.standalone.start(timeout=120)
|
|
|
a2f18f |
|
|
|
a2f18f |
- connectWithOpenssl(topology, 'RC4-SHA', True)
|
|
|
a2f18f |
+ connectWithOpenssl(topology, 'RC4-SHA', False)
|
|
|
a2f18f |
connectWithOpenssl(topology, 'AES256-SHA256', True)
|
|
|
a2f18f |
|
|
|
a2f18f |
def test_ticket48194_run_6(topology):
|
|
|
a2f18f |
@@ -338,7 +338,7 @@ def test_ticket48194_run_6(topology):
|
|
|
a2f18f |
_header(topology, 'Test Case 7 - Check nsSSL3Ciphers: +all,-TLS_RSA_WITH_AES_256_CBC_SHA256 with default allowWeakCipher')
|
|
|
a2f18f |
|
|
|
a2f18f |
topology.standalone.simple_bind_s(DN_DM, PASSWORD)
|
|
|
a2f18f |
- topology.standalone.modify_s(ENCRYPTION_DN, [(ldap.MOD_REPLACE, 'nsSSL3Ciphers', '+all,-TLS_RSA_WITH_AES_256_CBC_SHA256 ')])
|
|
|
a2f18f |
+ topology.standalone.modify_s(ENCRYPTION_DN, [(ldap.MOD_REPLACE, 'nsSSL3Ciphers', '+all,-TLS_RSA_WITH_AES_256_CBC_SHA256')])
|
|
|
a2f18f |
|
|
|
a2f18f |
log.info("\n######################### Restarting the server ######################\n")
|
|
|
a2f18f |
topology.standalone.stop(timeout=10)
|
|
|
a2f18f |
--
|
|
|
a2f18f |
1.9.3
|
|
|
a2f18f |
|