httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1691419 - in /httpd/test/framework/trunk/t: conf/ssl/ssl.conf.in htdocs/modules/ssl/aes128/ htdocs/modules/ssl/aes256/ htdocs/modules/ssl/md5/ htdocs/modules/ssl/sha/ ssl/pr12355.t ssl/pr43738.t
Date Thu, 16 Jul 2015 16:26:42 GMT
Author: ylavic
Date: Thu Jul 16 16:26:42 2015
New Revision: 1691419

URL: http://svn.apache.org/r1691419
Log:
Move SSL renegotiation tests from 'RC4-SHA vs RC4-MD5' to 'AES128 vs AES256'
since the former may not be available in recent SSL libraries.

Added:
    httpd/test/framework/trunk/t/htdocs/modules/ssl/aes128/
      - copied from r1691418, httpd/test/framework/trunk/t/htdocs/modules/ssl/md5/
    httpd/test/framework/trunk/t/htdocs/modules/ssl/aes256/
      - copied from r1691418, httpd/test/framework/trunk/t/htdocs/modules/ssl/sha/
Removed:
    httpd/test/framework/trunk/t/htdocs/modules/ssl/md5/
    httpd/test/framework/trunk/t/htdocs/modules/ssl/sha/
Modified:
    httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in
    httpd/test/framework/trunk/t/ssl/pr12355.t
    httpd/test/framework/trunk/t/ssl/pr43738.t

Modified: httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in?rev=1691419&r1=1691418&r2=1691419&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in Thu Jul 16 16:26:42 2015
@@ -96,8 +96,8 @@
         Alias /ssl-cgi            @DocumentRoot@/modules/cgi
         Alias /require-ssl-cgi    @DocumentRoot@/modules/cgi
 
-        Alias /require-md5-cgi    @DocumentRoot@/modules/cgi
-        Alias /require-sha-cgi    @DocumentRoot@/modules/cgi
+        Alias /require-aes128-cgi    @DocumentRoot@/modules/cgi
+        Alias /require-aes256-cgi    @DocumentRoot@/modules/cgi
 
         <Location /require/asf>
             SSLVerifyClient require
@@ -149,12 +149,12 @@
             SSLVerifyDepth  10
         </Location>
 
-        <Location /require-sha-cgi>
-            SSLCipherSuite RC4-SHA
+        <Location /require-aes128-cgi>
+            SSLCipherSuite AES128-SHA
         </Location>
 
-        <Location /require-md5-cgi>
-            SSLCipherSuite RC4-MD5
+        <Location /require-aes256-cgi>
+            SSLCipherSuite AES256-SHA
         </Location>
 
         <IfModule @AUTH_MODULE@>
@@ -222,12 +222,12 @@
         AddType application/x-pf-action .pfa
     </IfModule>
 
-    <Location /modules/ssl/sha/>
-         SSLCipherSuite RC4-SHA
+    <Location /modules/ssl/aes128/>
+         SSLCipherSuite AES128-SHA
     </Location>
 
-    <Location /modules/ssl/md5/>
-         SSLCipherSuite RC4-MD5
+    <Location /modules/ssl/aes256/>
+         SSLCipherSuite AES256-SHA
     </Location>
 
 </IfModule>

Modified: httpd/test/framework/trunk/t/ssl/pr12355.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/ssl/pr12355.t?rev=1691419&r1=1691418&r2=1691419&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/ssl/pr12355.t (original)
+++ httpd/test/framework/trunk/t/ssl/pr12355.t Thu Jul 16 16:26:42 2015
@@ -14,27 +14,27 @@ Apache::TestRequest::scheme('https');
 my $r;
 
 # Send a series of POST requests with varying size request bodies.
-# Alternate between the location which requires a RC4-SHA ciphersuite
-# and one which requires RC5-MD5; mod_ssl will attempt to perform the
+# Alternate between the location which requires a AES128-SHA ciphersuite
+# and one which requires AES256-SHA; mod_ssl will attempt to perform the
 # renegotiation between each request, and hence needs to perform the
 # buffering of request body data.
 
-$r = POST "/require-sha-cgi/perl_echo.pl", content => "hello world";
+$r = POST "/require-aes256-cgi/perl_echo.pl", content => "hello world";
 
 ok t_cmp($r->code, 200, "renegotiation on POST works");
 ok t_cmp($r->content, "hello world", "request body matches response");
 
-$r = POST "/require-md5-cgi/perl_echo.pl", content => "hello world";
+$r = POST "/require-aes128-cgi/perl_echo.pl", content => "hello world";
 
 ok t_cmp($r->code, 200, "renegotiation on POST works");
 ok t_cmp($r->content, "hello world", "request body matches response");
 
-$r = POST "/require-sha-cgi/perl_echo.pl", content => 'x'x10000;
+$r = POST "/require-aes256-cgi/perl_echo.pl", content => 'x'x10000;
 
 ok t_cmp($r->code, 200, "renegotiation on POST works");
 ok t_cmp($r->content, $r->request->content, "request body matches response");
 
-$r = POST "/require-md5-cgi/perl_echo.pl", content => 'x'x60000;
+$r = POST "/require-aes128-cgi/perl_echo.pl", content => 'x'x60000;
 
 ok t_cmp($r->code, 200, "renegotiation on POST works");
 ok t_cmp($r->content, $r->request->content, "request body matches response");
@@ -45,7 +45,7 @@ ok t_cmp($r->content, $r->request->conte
 my @filter = ('X-AddInputFilter' => 'CaseFilterIn'); #mod_client_add_filter
 
 if (have_module('case_filter_in')) {
-    $r = POST "/require-sha-cgi/perl_echo.pl", @filter, content => "hello";
+    $r = POST "/require-aes256-cgi/perl_echo.pl", @filter, content => "hello";
     
     ok t_cmp($r->code, 200, "renegotiation on POST works");
     ok t_cmp($r->content, "HELLO", "request body matches response");

Modified: httpd/test/framework/trunk/t/ssl/pr43738.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/ssl/pr43738.t?rev=1691419&r1=1691418&r2=1691419&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/ssl/pr43738.t (original)
+++ httpd/test/framework/trunk/t/ssl/pr43738.t Thu Jul 16 16:26:42 2015
@@ -17,12 +17,12 @@ my $r;
 
 # Variation of the PR 12355 test which breaks per PR 43738.
 
-$r = POST "/modules/ssl/md5/empty.pfa", content => "hello world";
+$r = POST "/modules/ssl/aes128/empty.pfa", content => "hello world";
 
 ok t_cmp($r->code, 200, "renegotiation on POST works");
-ok t_cmp($r->content, "/modules/ssl/md5/empty.pfa\nhello world", "request body matches
response");
+ok t_cmp($r->content, "/modules/ssl/aes128/empty.pfa\nhello world", "request body matches
response");
 
-$r = POST "/modules/ssl/sha/empty.pfa", content => "hello world";
+$r = POST "/modules/ssl/aes256/empty.pfa", content => "hello world";
 
 ok t_cmp($r->code, 200, "renegotiation on POST works");
-ok t_cmp($r->content, "/modules/ssl/sha/empty.pfa\nhello world", "request body matches
response");
+ok t_cmp($r->content, "/modules/ssl/aes256/empty.pfa\nhello world", "request body matches
response");



Mime
View raw message