From 8635730333af792fae75394bb593afe4054da238 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 4 Nov 2019 10:34:10 +0100 Subject: [PATCH] util/mknum.pl: Call OpenSSL::Ordinals::renumber() for real releases When the source isn't in development any more (the version number doesn't the tags 'dev' or 'alpha'), we renumber the unassigned symbols to ensure that we have fixed numbers on all. Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/10348) --- util/mknum.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/util/mknum.pl b/util/mknum.pl index 1fa1b958dc..bf73797c3f 100644 --- a/util/mknum.pl +++ b/util/mknum.pl @@ -88,6 +88,13 @@ foreach my $f (($symhacks_file // (), @ARGV)) { close IN; } +# As long as we're running in development or alpha releases, we can have +# symbols without specific numbers assigned. When in beta or final release, +# all symbols MUST have an assigned number. +if ($version !~ m/^\d+\.\d+\.\d+(?:[a-z]+)?-(?:dev|alpha)/) { + $ordinals->renumber(); +} + if ($checkexist) { my %new_names = map { $_->name() => 1 } $ordinals->items(comparator => sub { $_[0] cmp $_[1] }, -- 2.25.1