# HG changeset patch # User Maxim Dounin # Date 1714942900 -10800 # Node ID 84f4d4930835e5e788ee9f69d575cad4648f8fc6 # Parent 3cae7b54841e4756333523333b815b746da57b65 Tests: relaxed mail_imap_ssl.t cipher matching. Previously, exact match between cipher name in the log and the one from IO::Socket:SSL was needed, which might not be the case if nginx and Net::SSLeay are compiled with different SSL libraries, notably LibreSSL (which uses names like AEAD-AES256-GCM-SHA384 till 3.5.0), and OpenSSL or BoringSSL (which use TLS_AES_256_GCM_SHA384). In particular, this affects macOS, where Net::SSLeay compiled with LibreSSL 3.3.6 is shipped with the OS, while nginx is likely to be compiled with OpenSSL. Fix is to not require exact match but instead accept properly looking names as checked by a regular expression, similarly to how it is already tested in ssl.t and stream_ssl_variables.t. diff --git a/mail_imap_ssl.t b/mail_imap_ssl.t --- a/mail_imap_ssl.t +++ b/mail_imap_ssl.t @@ -29,7 +29,7 @@ select STDOUT; $| = 1; local $SIG{PIPE} = 'IGNORE'; my $t = Test::Nginx->new() - ->has(qw/mail mail_ssl imap http rewrite socket_ssl_sslversion/) + ->has(qw/mail mail_ssl imap http rewrite socket_ssl/) ->has_daemon('openssl')->plan(13) ->write_file_expand('nginx.conf', <<'EOF'); @@ -202,15 +202,6 @@ my $s = Test::Nginx::IMAP->new(); $s->send('1 AUTHENTICATE PLAIN ' . $cred->("s5")); $s->read(); -# Auth-SSL-Protocol and Auth-SSL-Cipher headers - -my ($cipher, $sslversion); - -$s = Test::Nginx::IMAP->new(SSL => 1); -$cipher = $s->socket()->get_cipher(); -$sslversion = $s->socket()->get_sslversion(); -$sslversion =~ s/_/./; - undef $s; # test auth_http request header fields with access_log @@ -229,6 +220,6 @@ like($f, qr!^on:SUCCESS:(/?CN=3.example. 'log - trusted cert'); $f = $t->read_file('auth2.log'); -like($f, qr|^$cipher:$sslversion$|m, 'log - cipher sslversion'); +like($f, qr/^[\w-]+:(TLS|SSL)v[\d.]+$/m, 'log - cipher sslversion'); ###############################################################################