From: Matt Caswell <matt@openssl.org>
Date: Sat, 15 Oct 2016 22:13:29 +0000 (+0100)
Subject: Allow older versions in the *.num files
X-Git-Tag: OpenSSL_1_1_1-pre1~3369
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=455cba54f8078897edcee7bc56dc2689c20fc383;p=oweals%2Fopenssl.git

Allow older versions in the *.num files

In 1.1.0 we only allowed a strictly increasing version number in the *.num
files, i.e. you could never introduce a symbol at the end of the *.num file
with a lower version number than the one preceding it. This made sense for
1.1.0. However in master we may be introducing symbols for backport to
1.1.0. Therefore it is ok in master to have a symbol for version 1.1.0c
coming after a symbol for version 1.1.1.

This commit fixes the check in mkdef.pl to be a bit looser to allow this.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 764029334f..c5884d3b92 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1630,8 +1630,7 @@ sub check_version_lte()
 	if ($cvnums ne $tvnums) {
 		die "Invalid version number: $testversion "
 			."for current version $currversion\n"
-			if (substr($cvnums, -1) < substr($tvnums, -1)
-				|| substr($cvnums, 0, 4) ne substr($tvnums, 0, 4));
+			if (substr($cvnums, 0, 4) ne substr($tvnums, 0, 4));
 		return;
 	}
 	#If we get here then the base version (i.e. the numbers) are the same - they