Mercurial > hg > nginx-tests
changeset 1621:fd440d324700
Tests: simplified get_ssl_socket() functions that use Net::SSLeay.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Tue, 24 Nov 2020 00:43:56 +0000 |
parents | 166461f0bd4b |
children | 5b3d33b5556c |
files | mail_ssl.t ssl_certificate.t ssl_certificate_perl.t ssl_sni_reneg.t ssl_verify_client.t stream_ssl.t stream_ssl_certificate.t stream_ssl_variables.t stream_ssl_verify_client.t |
diffstat | 9 files changed, 13 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/mail_ssl.t Mon Nov 23 22:46:07 2020 +0000 +++ b/mail_ssl.t Tue Nov 24 00:43:56 2020 +0000 @@ -12,8 +12,6 @@ use Test::More; -use Socket qw/ :DEFAULT $CRLF /; - BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; @@ -294,14 +292,8 @@ sub get_ssl_socket { my ($port, $ses) = @_; - my $s; - my $dest_ip = inet_aton('127.0.0.1'); - my $dest_serv_params = sockaddr_in(port($port), $dest_ip); - - socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); my $ssl = Net::SSLeay::new($ctx) or die("Failed to create SSL $!"); Net::SSLeay::set_session($ssl, $ses) if defined $ses; Net::SSLeay::set_fd($ssl, fileno($s));
--- a/ssl_certificate.t Mon Nov 23 22:46:07 2020 +0000 +++ b/ssl_certificate.t Tue Nov 24 00:43:56 2020 +0000 @@ -12,7 +12,7 @@ use Test::More; -use Socket qw/ :DEFAULT CRLF /; +use Socket qw/ CRLF /; BEGIN { use FindBin; chdir($FindBin::Bin); } @@ -214,15 +214,8 @@ sub get_ssl_socket { my ($host, $port, $ses) = @_; - my $s; - my $dest_ip = inet_aton('127.0.0.1'); - $port = port($port); - my $dest_serv_params = sockaddr_in($port, $dest_ip); - - socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); my $ctx = Net::SSLeay::CTX_new() or die("Failed to create SSL_CTX $!"); my $ssl = Net::SSLeay::new($ctx) or die("Failed to create SSL $!"); Net::SSLeay::set_tlsext_host_name($ssl, $host);
--- a/ssl_certificate_perl.t Mon Nov 23 22:46:07 2020 +0000 +++ b/ssl_certificate_perl.t Tue Nov 24 00:43:56 2020 +0000 @@ -12,8 +12,6 @@ use Test::More; -use Socket; - BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; @@ -114,15 +112,8 @@ sub get_ssl_socket { my ($host, $port) = @_; - my $s; - my $dest_ip = inet_aton('127.0.0.1'); - $port = port($port); - my $dest_serv_params = sockaddr_in($port, $dest_ip); - - socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); my $ctx = Net::SSLeay::CTX_new() or die("Failed to create SSL_CTX $!"); my $ssl = Net::SSLeay::new($ctx) or die("Failed to create SSL $!"); Net::SSLeay::set_tlsext_host_name($ssl, $host);
--- a/ssl_sni_reneg.t Mon Nov 23 22:46:07 2020 +0000 +++ b/ssl_sni_reneg.t Tue Nov 24 00:43:56 2020 +0000 @@ -12,7 +12,7 @@ use Test::More; -use Socket qw/ :DEFAULT CRLF /; +use Socket qw/ CRLF /; BEGIN { use FindBin; chdir($FindBin::Bin); } @@ -150,15 +150,11 @@ my ($port) = @_; my $s; - my $dest_ip = inet_aton('127.0.0.1'); - my $dest_serv_params = sockaddr_in(port($port), $dest_ip); - eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; alarm(8); - socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; + $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); alarm(0); }; alarm(0);
--- a/ssl_verify_client.t Mon Nov 23 22:46:07 2020 +0000 +++ b/ssl_verify_client.t Tue Nov 24 00:43:56 2020 +0000 @@ -12,7 +12,7 @@ use Test::More; -use Socket qw/ :DEFAULT CRLF /; +use Socket qw/ CRLF /; BEGIN { use FindBin; chdir($FindBin::Bin); } @@ -185,12 +185,7 @@ $host = $sni if !defined $host; - my $dest_ip = inet_aton('127.0.0.1'); - my $dest_serv_params = sockaddr_in(port(8081), $dest_ip); - - socket(my $s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . port(8081)); my $ctx = Net::SSLeay::CTX_new() or die("Failed to create SSL_CTX $!"); Net::SSLeay::set_cert_and_key($ctx, "$d/$cert.crt", "$d/$cert.key") or die if $cert;
--- a/stream_ssl.t Mon Nov 23 22:46:07 2020 +0000 +++ b/stream_ssl.t Tue Nov 24 00:43:56 2020 +0000 @@ -13,7 +13,7 @@ use Test::More; use POSIX qw/ mkfifo /; -use Socket qw/ :DEFAULT $CRLF /; +use Socket qw/ $CRLF /; BEGIN { use FindBin; chdir($FindBin::Bin); } @@ -182,14 +182,8 @@ sub get_ssl_socket { my ($port, $ses) = @_; - my $s; - my $dest_ip = inet_aton('127.0.0.1'); - my $dest_serv_params = sockaddr_in($port, $dest_ip); - - socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . $port); my $ssl = Net::SSLeay::new($ctx) or die("Failed to create SSL $!"); Net::SSLeay::set_session($ssl, $ses) if defined $ses; Net::SSLeay::set_fd($ssl, fileno($s));
--- a/stream_ssl_certificate.t Mon Nov 23 22:46:07 2020 +0000 +++ b/stream_ssl_certificate.t Tue Nov 24 00:43:56 2020 +0000 @@ -12,8 +12,6 @@ use Test::More; -use Socket qw/ :DEFAULT CRLF /; - BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; @@ -192,15 +190,8 @@ sub get_ssl_socket { my ($host, $port, $ses) = @_; - my $s; - my $dest_ip = inet_aton('127.0.0.1'); - $port = port($port); - my $dest_serv_params = sockaddr_in($port, $dest_ip); - - socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); my $ctx = Net::SSLeay::CTX_new() or die("Failed to create SSL_CTX $!"); my $ssl = Net::SSLeay::new($ctx) or die("Failed to create SSL $!"); Net::SSLeay::set_tlsext_host_name($ssl, $host);
--- a/stream_ssl_variables.t Mon Nov 23 22:46:07 2020 +0000 +++ b/stream_ssl_variables.t Tue Nov 24 00:43:56 2020 +0000 @@ -12,8 +12,6 @@ use Test::More; -use Socket; - BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; @@ -127,14 +125,8 @@ sub get_ssl_socket { my ($port, $ses, $name) = @_; - my $s; - my $dest_ip = inet_aton('127.0.0.1'); - my $dest_serv_params = sockaddr_in($port, $dest_ip); - - socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . $port); my $ctx = Net::SSLeay::CTX_new() or die("Failed to create SSL_CTX $!"); my $ssl = Net::SSLeay::new($ctx) or die("Failed to create SSL $!"); Net::SSLeay::set_tlsext_host_name($ssl, $name) if defined $name;
--- a/stream_ssl_verify_client.t Mon Nov 23 22:46:07 2020 +0000 +++ b/stream_ssl_verify_client.t Tue Nov 24 00:43:56 2020 +0000 @@ -13,8 +13,6 @@ use Test::More; -use Socket; - BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; @@ -142,12 +140,7 @@ sub get { my ($port, $cert) = @_; - my $dest_ip = inet_aton('127.0.0.1'); - my $dest_serv_params = sockaddr_in(port($port), $dest_ip); - - socket(my $s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; - connect($s, $dest_serv_params) or die "connect: $!"; - + my $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); my $ctx = Net::SSLeay::CTX_new() or die("Failed to create SSL_CTX $!"); Net::SSLeay::set_cert_and_key($ctx, "$d/$cert.crt", "$d/$cert.key") or die if $cert;