You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2018/09/12 15:10:34 UTC

svn commit: r1840701 - /httpd/test/framework/trunk/t/ssl/varlookup.t

Author: jorton
Date: Wed Sep 12 15:10:34 2018
New Revision: 1840701

URL: http://svn.apache.org/viewvc?rev=1840701&view=rev
Log:
Fix matching SSL_CIPHER for TLSv1.3 ciphers which OpenSSL
weirdly names with underscore separators rather than hyphens.
No obvious guarantees are made about how these are presented 
by mod_ssl.

TLS_AES_256_GCM_SHA384 (TLSv1.3)
vs
AES256-GCM-SHA384 (pre-TLSv1.3)

Modified:
    httpd/test/framework/trunk/t/ssl/varlookup.t

Modified: httpd/test/framework/trunk/t/ssl/varlookup.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/ssl/varlookup.t?rev=1840701&r1=1840700&r2=1840701&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/ssl/varlookup.t (original)
+++ httpd/test/framework/trunk/t/ssl/varlookup.t Wed Sep 12 15:10:34 2018
@@ -179,7 +179,7 @@ SSL_SERVER_V_START           qr($cert_da
 SSL_SESSION_ID
 SSL_CLIENT_V_END             qr($cert_datefmt);
 SSL_SERVER_V_END             qr($cert_datefmt);
-SSL_CIPHER                   qr(^[A-Z0-9-]+$)
+SSL_CIPHER                   qr(^[A-Z0-9_-]+$)
 SSL_CIPHER_EXPORT            'false'
 SSL_CIPHER_ALGKEYSIZE        qr(^\d+$)
 SSL_CIPHER_USEKEYSIZE        qr(^\d+$)