The branch master has been updated via 356461fbbb8f4070f57ac4d13b34e0e0bbfee92b (commit) from 467b8e56753e53ed2b9a9f1ad35970a5ceb837d9 (commit)
- Log ----------------------------------------------------------------- commit 356461fbbb8f4070f57ac4d13b34e0e0bbfee92b Author: Rich Salz <rs...@akamai.com> Date: Thu Aug 15 12:09:08 2019 -0400 Ignore function code collisions Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9600) ----------------------------------------------------------------------- Summary of changes: util/mkerr.pl | 2 -- 1 file changed, 2 deletions(-) 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;