From: Richard Levitte <levitte@openssl.org>
Date: Sun, 15 Nov 2020 08:57:00 +0000 (+0100)
Subject: util/mkrc.pl: Make sure FILEVERSION and PRODUCTVERSION have four numbers
X-Git-Tag: openssl-3.0.0-alpha9~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d32b6ba520461103015022d8b4095573ca9691;p=thirdparty%2Fopenssl.git

util/mkrc.pl: Make sure FILEVERSION and PRODUCTVERSION have four numbers

Partially fixes #13414

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13415)
---

diff --git a/util/mkrc.pl b/util/mkrc.pl
index d3617663eb8..6ec1f374707 100755
--- a/util/mkrc.pl
+++ b/util/mkrc.pl
@@ -14,8 +14,10 @@ use configdata;
 my $cversion = "$config{version}";
 my $version = "$config{full_version}";
 
-# RC syntax for versions uses commas as separators, rather than period
-$cversion =~ s|\.|,|g;
+# RC syntax for versions uses commas as separators, rather than period,
+# and it must have exactly 4 numbers (16-bit integers).
+my @vernums = ( split(/\./, $cversion), 0, 0, 0, 0 );
+$cversion = join(',', @vernums[0..3]);
 
 my $filename = $ARGV[0];
 my $description = "OpenSSL library";