From 69a6b5dbb026f1bc35ae3aeeeacc9cef92da2851 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Wed, 10 Feb 2016 09:40:19 +0100
Subject: Basic test case for DHE cipher negotiation

---
 test/createinstance.sh |  1 +
 test/suite1.tmpl       |  4 ++++
 test/test.py           | 11 +++++++++++
 3 files changed, 16 insertions(+)

diff --git a/test/createinstance.sh b/test/createinstance.sh
index e32c628..0538090 100755
--- a/test/createinstance.sh
+++ b/test/createinstance.sh
@@ -11,6 +11,7 @@ function create_content_dirs {
     mkdir $dir/rc4_cipher
     mkdir $dir/openssl_rc4_cipher
     mkdir $dir/openssl_aes_cipher
+    mkdir $dir/dhe_cipher
     mkdir $dir/acl
     mkdir $dir/protocolssl2
     mkdir $dir/protocolssl3
diff --git a/test/suite1.tmpl b/test/suite1.tmpl
index 38ea2b0..2c09a89 100644
--- a/test/suite1.tmpl
+++ b/test/suite1.tmpl
@@ -51,6 +51,10 @@ CoreDumpDirectory $SERVER_ROOT
         NSSCipherSuite AES+RSA
     </Location>
 
+    <Location "/dhe_cipher">
+        NSSCipherSuite +dhe_rsa_aes_128_sha
+    </Location>
+
     <Location "/acl/aclS01.html">
         NSSOptions +StdEnvVars +CompatEnvVars +ExportCertData
         NSSVerifyClient require
diff --git a/test/test.py b/test/test.py
index fadc5d0..866e388 100644
--- a/test/test.py
+++ b/test/test.py
@@ -1,5 +1,6 @@
 from test_config import Declarative, write_template_file, restart_apache
 from test_config import stop_apache
+from variable import ENABLE_SERVER_DHE
 import ssl
 import requests.exceptions
 import os
@@ -292,3 +293,13 @@ class test_suite1(Declarative):
         ),
 
     ]
+
+    if ENABLE_SERVER_DHE:
+        tests.append(
+            dict(
+                desc='server-side DHE cipher check',
+                request=('/dhe_cipher/', {'ciphers': 'ALL'}),
+                expected=200,
+                cipher='DHE-RSA-AES128-SHA',
+            )
+        )
-- 
cgit