diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-01-12 03:42:56 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-01-12 04:44:24 +0100 |
| commit | d9aad55a50c6291a8e2cbde13cd896185ba13861 (patch) | |
| tree | 56a58a929e5bcae3c59c395e1a11f68c45124f3c | |
| parent | Use SPARE instead of PRIVATE_PROCEDURE to reserve unused SYMBOL_VECTOR slots (diff) | |
| download | openssl-d9aad55a50c6291a8e2cbde13cd896185ba13861.tar.xz openssl-d9aad55a50c6291a8e2cbde13cd896185ba13861.zip | |
Make sure to have both upper and mixed case symbols in SYMBOL_VECTOR
It was assumed that the syntax FOO/Foo=PROCEDURE would create both an
upper case and mixed case symbol in the GST. Not so, it requires
having both FOO/Foo=PROCEDURE (to create the upper case alias) and
Foo=PROCEDURE (to create the mixed case slot).
We make sure that any symbol always occupies two slots (even those
that don't exist) by filling up with SPARE when necessary. That will
assure that any changes will still have the same symbols in the same
slots no matter what (save a complete rewrite of the ordinals files).
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rwxr-xr-x | util/mkdef.pl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index a2fdada181..ff018e9bb8 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -1304,7 +1304,7 @@ EOF print OUT " $s2;\n"; } elsif ($VMS) { while(++$prevnum < $n) { - my $symline="SPARE -"; + my $symline="SPARE, SPARE -"; if ($symvtextcount + length($symline) + 1 > 1024) { print OUT ")\nSYMBOL_VECTOR=(-\n"; $symvtextcount = 16; # length of "SYMBOL_VECTOR=(-" @@ -1316,8 +1316,13 @@ EOF $symvtextcount += length($symline); } (my $s_uc = $s) =~ tr/a-z/A-Z/; - my $symline="$s_uc/$s=" - , ($v ? "DATA" : "PROCEDURE"), " -\n"; + my $symtype= + $v ? "DATA" : "PROCEDURE"; + my $symline= + ($s_uc ne $s + ? "$s_uc/$s=$symtype, $s=$symtype" + : "$s=$symtype, SPARE") + ." -"; if ($symvtextcount + length($symline) + 1 > 1024) { print OUT ")\nSYMBOL_VECTOR=(-\n"; $symvtextcount = 16; # length of "SYMBOL_VECTOR=(-" |