rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SSL tests on 32-bit Perl 

The certificate serial number generation was changed in b4c4a00ea to
use the current timestamp. The testharness must thus interrogate the
cert for the serialnumber using "openssl x509" which emits the serial
in hex format. Converting the serial to integer format to match whats
in pg_stat_ssl requires a 64-bit capable Perl. This adds a fallback
to checking for an integer when the tests with a 32-bit Perl.

Per failure on buildfarm member prairiedog.

Discussion: https://postgr.es/m/0D295F43-806D-4B3F-AB98-F941A19E0271@yesql.se
This commit is contained in:
Daniel Gustafsson 2021-10-21 10:28:50 +02:00
parent 1607cd0b6c
commit 0c04342b1d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/ssl/t/001_ssltests.pl
View File

@ -3,6 +3,7 @@
use strict;
use warnings;
use Config qw ( %Config );
use PostgresNode;
use TestLib;
use Test::More;
@ -489,8 +490,19 @@ TODO:
my $serialno = `openssl x509 -serial -noout -in ssl/client.crt`;
if ($? == 0)
{
$serialno =~ s/^serial=//;
$serialno = hex($serialno); # OpenSSL prints serial numbers in hexadecimal
# OpenSSL prints serial numbers in hexadecimal and converting the serial
# from hex requires a 64-bit capable Perl as the serialnumber is based on
# the current timestamp. On 32-bit fall back to checking for it being an
# integer like how we do when grabbing the serial fails.
if ($Config{ivsize} == 8)
{
$serialno =~ s/^serial=//;
$serialno = hex($serialno);
}
else
{
$serialno = '\d+';
}
}
else
{