[PATCH] Tests: allow to run ssl_curve.t on BoringSSL

Maxim Dounin mdounin at mdounin.ru
Wed Aug 23 17:13:12 UTC 2023


Hello!

On Wed, Aug 23, 2023 at 04:26:15PM +0400, Sergey Kandaurov wrote:

> # HG changeset patch
> # User Sergey Kandaurov <pluknet at nginx.com>
> # Date 1692793549 -14400
> #      Wed Aug 23 16:25:49 2023 +0400
> # Node ID fae298d5f8d649af8006707b2f2856cc07f220b9
> # Parent  4d13c9e74d04bb6cdd83923ded045d665adc5226
> Tests: allow to run ssl_curve.t on BoringSSL.

allowed ssl_curve.t to run ...
?

> 
> Recently BoringSSL has got SSL_get_negotiated_group(),
> which makes $ssl_curve to return the expected value.
> 
> While here, moved SSL library check to runtime.

You probably mean "converted ... into TODO"?

(Also, it might be the time to drop try_run() here, as well as 
other 1.21.x version checks in the test suite.  It should be a 
separate patch though.)

> 
> diff --git a/ssl_curve.t b/ssl_curve.t
> --- a/ssl_curve.t
> +++ b/ssl_curve.t
> @@ -23,7 +23,7 @@ select STDERR; $| = 1;
>  select STDOUT; $| = 1;
>  
>  my $t = Test::Nginx->new()
> -	->has(qw/http http_ssl rewrite socket_ssl openssl:3.0.0/)
> +	->has(qw/http http_ssl rewrite socket_ssl/)
>  	->has_daemon('openssl');
>  
>  $t->write_file_expand('nginx.conf', <<'EOF');
> @@ -75,6 +75,10 @@ foreach my $name ('localhost') {
>  
>  ###############################################################################
>  
> +local $TODO = 'OpenSSL too old'
> +	unless $t->has_feature('openssl:3.0.0')
> +	or $t->has_module('BoringSSL');
> +
>  like(http_get('/curve', SSL => 1), qr/^prime256v1 /m, 'ssl curve');
>  
>  ###############################################################################

Otherwise looks good.

-- 
Maxim Dounin
http://mdounin.ru/


More information about the nginx-devel mailing list