From: Rich Salz <rsalz@akamai.com>
Date: Thu, 15 Aug 2019 16:09:08 +0000 (-0400)
Subject: Ignore function code collisions
X-Git-Tag: openssl-3.0.0-alpha1~1585
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=356461fbbb8f4070f57ac4d13b34e0e0bbfee92b;p=oweals%2Fopenssl.git

Ignore function code collisions

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9600)
---

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 51e034703d..7fd34d277f 100755
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -220,8 +220,6 @@ if ( ! $reindex && $statefile ) {
             }
             $rcodes{$name} = $code;
         } elsif ( $name =~ /^(?:OSSL_|OPENSSL_)?[A-Z0-9]{2,}_F_/ ) {
-            die "$lib function code $code collision at $name\n"
-                if $fassigned{$lib} =~ /:$code:/;
             $fassigned{$lib} .= "$code:";
             $fmax{$lib} = $code if $code > $fmax{$lib};
             $fcodes{$name} = $code;