NotificationsYou must be signed in to change notification settings
Fork5.3k
Star19.2k

Commit399a9e0

committed

Fix thinko in commit7d129ba.

The revised logic in 001_ssltests.pl would fail if openssldoesn't work or if Perl is a 32-bit build, because it hadalready overwritten $serialno with something inappropriateto use in the eventual match. We could go back to theprevious code layout, but it seems best to introduce aseparate variable for the output of openssl.Per failure on buildfarm member mamba, which has a 32-bit Perl.

1 parentaa1fcd0 commit399a9e0Copy full SHA for 399a9e0

File tree

1 file changed

-4

lines changed

src/test/ssl/t
- 001_ssltests.pl

1 file changed

-4

lines changed

`‎src/test/ssl/t/001_ssltests.pl‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ sub switch_server_cert`
`754`	`754`
`755`	`755`	`if ($ENV{OPENSSL}ne'')`
`756`	`756`	`{`
`757`		-$serialno =`$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
	`757`	+my$serialstr =`$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
`758`	`758`	`if ($? == 0)`
`759`	`759`	`{`
`760`	`760`	`# OpenSSL prints serial numbers in hexadecimal and converting the serial`
`@@ -765,9 +765,9 @@ sub switch_server_cert`
`765`	`765`	`{`
`766`	`766`	`no warningsqw(portable);`
`767`	`767`
`768`		`-$serialno =~s/^serial=//;`
`769`		`-$serialno =~s/\s+//g;`
`770`		`-$serialno =hex($serialno);`
	`768`	`+$serialstr =~s/^serial=//;`
	`769`	`+$serialstr =~s/\s+//g;`
	`770`	`+$serialno =hex($serialstr);`
`771`	`771`	`}`
`772`	`772`	`}`
`773`	`773`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit399a9e0

File tree

1 file changed

1 file changed

`‎src/test/ssl/t/001_ssltests.pl‎`

0 commit comments