diff options
Diffstat (limited to 'src/lib/libcrypto/util/mkdef.pl')
-rw-r--r-- | src/lib/libcrypto/util/mkdef.pl | 1396 |
1 files changed, 1221 insertions, 175 deletions
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl index 8124f11292..071036a6d2 100644 --- a/src/lib/libcrypto/util/mkdef.pl +++ b/src/lib/libcrypto/util/mkdef.pl | |||
@@ -1,244 +1,1115 @@ | |||
1 | #!/usr/bin/perl | 1 | #!/usr/local/bin/perl -w |
2 | # | 2 | # |
3 | # generate a .def file | 3 | # generate a .def file |
4 | # | 4 | # |
5 | # It does this by parsing the header files and looking for the | 5 | # It does this by parsing the header files and looking for the |
6 | # non-prototyped functions. | 6 | # prototyped functions: it then prunes the output. |
7 | # | 7 | # |
8 | # Intermediary files are created, call libeay.num and ssleay.num,... | ||
9 | # Previously, they had the following format: | ||
10 | # | ||
11 | # routine-name nnnn | ||
12 | # | ||
13 | # But that isn't enough for a number of reasons, the first on being that | ||
14 | # this format is (needlessly) very Win32-centric, and even then... | ||
15 | # One of the biggest problems is that there's no information about what | ||
16 | # routines should actually be used, which varies with what crypto algorithms | ||
17 | # are disabled. Also, some operating systems (for example VMS with VAX C) | ||
18 | # need to keep track of the global variables as well as the functions. | ||
19 | # | ||
20 | # So, a remake of this script is done so as to include information on the | ||
21 | # kind of symbol it is (function or variable) and what algorithms they're | ||
22 | # part of. This will allow easy translating to .def files or the corresponding | ||
23 | # file in other operating systems (a .opt file for VMS, possibly with a .mar | ||
24 | # file). | ||
25 | # | ||
26 | # The format now becomes: | ||
27 | # | ||
28 | # routine-name nnnn info | ||
29 | # | ||
30 | # and the "info" part is actually a colon-separated string of fields with | ||
31 | # the following meaning: | ||
32 | # | ||
33 | # existence:platform:kind:algorithms | ||
34 | # | ||
35 | # - "existence" can be "EXIST" or "NOEXIST" depending on if the symbol is | ||
36 | # found somewhere in the source, | ||
37 | # - "platforms" is empty if it exists on all platforms, otherwise it contains | ||
38 | # comma-separated list of the platform, just as they are if the symbol exists | ||
39 | # for those platforms, or prepended with a "!" if not. This helps resolve | ||
40 | # symbol name variants for platforms where the names are too long for the | ||
41 | # compiler or linker, or if the systems is case insensitive and there is a | ||
42 | # clash, or the symbol is implemented differently (see | ||
43 | # EXPORT_VAR_AS_FUNCTION). This script assumes renaming of symbols is found | ||
44 | # in the file crypto/symhacks.h. | ||
45 | # The semantics for the platforms is that every item is checked against the | ||
46 | # enviroment. For the negative items ("!FOO"), if any of them is false | ||
47 | # (i.e. "FOO" is true) in the enviroment, the corresponding symbol can't be | ||
48 | # used. For the positive itms, if all of them are false in the environment, | ||
49 | # the corresponding symbol can't be used. Any combination of positive and | ||
50 | # negative items are possible, and of course leave room for some redundancy. | ||
51 | # - "kind" is "FUNCTION" or "VARIABLE". The meaning of that is obvious. | ||
52 | # - "algorithms" is a comma-separated list of algorithm names. This helps | ||
53 | # exclude symbols that are part of an algorithm that some user wants to | ||
54 | # exclude. | ||
55 | # | ||
56 | |||
57 | my $debug=0; | ||
58 | |||
59 | my $crypto_num= "util/libeay.num"; | ||
60 | my $ssl_num= "util/ssleay.num"; | ||
61 | |||
62 | my $do_update = 0; | ||
63 | my $do_rewrite = 1; | ||
64 | my $do_crypto = 0; | ||
65 | my $do_ssl = 0; | ||
66 | my $do_ctest = 0; | ||
67 | my $do_ctestall = 0; | ||
68 | my $do_checkexist = 0; | ||
8 | 69 | ||
9 | $crypto_num="util/libeay.num"; | 70 | my $VMSVAX=0; |
10 | $ssl_num= "util/ssleay.num"; | 71 | my $VMSAlpha=0; |
72 | my $VMS=0; | ||
73 | my $W32=0; | ||
74 | my $W16=0; | ||
75 | my $NT=0; | ||
76 | # Set this to make typesafe STACK definitions appear in DEF | ||
77 | my $safe_stack_def = 0; | ||
11 | 78 | ||
12 | $NT=1; | 79 | my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", |
13 | foreach (@ARGV) | 80 | "EXPORT_VAR_AS_FUNCTION" ); |
81 | my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT" ); | ||
82 | my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", | ||
83 | "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", | ||
84 | "RIPEMD", | ||
85 | "MDC2", "RSA", "DSA", "DH", "EC", "HMAC", "AES", | ||
86 | # Envelope "algorithms" | ||
87 | "EVP", "X509", "ASN1_TYPEDEFS", | ||
88 | # Helper "algorithms" | ||
89 | "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR", | ||
90 | "LOCKING", | ||
91 | # External "algorithms" | ||
92 | "FP_API", "STDIO", "SOCK", "KRB5" ); | ||
93 | |||
94 | my $options=""; | ||
95 | open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n"; | ||
96 | while(<IN>) { | ||
97 | $options=$1 if (/^OPTIONS=(.*)$/); | ||
98 | } | ||
99 | close(IN); | ||
100 | |||
101 | # The following ciphers may be excluded (by Configure). This means functions | ||
102 | # defined with ifndef(NO_XXX) are not included in the .def file, and everything | ||
103 | # in directory xxx is ignored. | ||
104 | my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; | ||
105 | my $no_cast; | ||
106 | my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; | ||
107 | my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; | ||
108 | my $no_ec; | ||
109 | my $no_fp_api; | ||
110 | |||
111 | foreach (@ARGV, split(/ /, $options)) | ||
14 | { | 112 | { |
15 | $NT=1 if $_ eq "32"; | 113 | $debug=1 if $_ eq "debug"; |
16 | $NT=0 if $_ eq "16"; | 114 | $W32=1 if $_ eq "32"; |
115 | $W16=1 if $_ eq "16"; | ||
116 | if($_ eq "NT") { | ||
117 | $W32 = 1; | ||
118 | $NT = 1; | ||
119 | } | ||
120 | if ($_ eq "VMS-VAX") { | ||
121 | $VMS=1; | ||
122 | $VMSVAX=1; | ||
123 | } | ||
124 | if ($_ eq "VMS-Alpha") { | ||
125 | $VMS=1; | ||
126 | $VMSAlpha=1; | ||
127 | } | ||
128 | $VMS=1 if $_ eq "VMS"; | ||
129 | |||
17 | $do_ssl=1 if $_ eq "ssleay"; | 130 | $do_ssl=1 if $_ eq "ssleay"; |
131 | $do_ssl=1 if $_ eq "ssl"; | ||
18 | $do_crypto=1 if $_ eq "libeay"; | 132 | $do_crypto=1 if $_ eq "libeay"; |
133 | $do_crypto=1 if $_ eq "crypto"; | ||
134 | $do_update=1 if $_ eq "update"; | ||
135 | $do_rewrite=1 if $_ eq "rewrite"; | ||
136 | $do_ctest=1 if $_ eq "ctest"; | ||
137 | $do_ctestall=1 if $_ eq "ctestall"; | ||
138 | $do_checkexist=1 if $_ eq "exist"; | ||
139 | #$safe_stack_def=1 if $_ eq "-DDEBUG_SAFESTACK"; | ||
140 | |||
141 | if (/^no-rc2$/) { $no_rc2=1; } | ||
142 | elsif (/^no-rc4$/) { $no_rc4=1; } | ||
143 | elsif (/^no-rc5$/) { $no_rc5=1; } | ||
144 | elsif (/^no-idea$/) { $no_idea=1; } | ||
145 | elsif (/^no-des$/) { $no_des=1; $no_mdc2=1; } | ||
146 | elsif (/^no-bf$/) { $no_bf=1; } | ||
147 | elsif (/^no-cast$/) { $no_cast=1; } | ||
148 | elsif (/^no-md2$/) { $no_md2=1; } | ||
149 | elsif (/^no-md4$/) { $no_md4=1; } | ||
150 | elsif (/^no-md5$/) { $no_md5=1; } | ||
151 | elsif (/^no-sha$/) { $no_sha=1; } | ||
152 | elsif (/^no-ripemd$/) { $no_ripemd=1; } | ||
153 | elsif (/^no-mdc2$/) { $no_mdc2=1; } | ||
154 | elsif (/^no-rsa$/) { $no_rsa=1; } | ||
155 | elsif (/^no-dsa$/) { $no_dsa=1; } | ||
156 | elsif (/^no-dh$/) { $no_dh=1; } | ||
157 | elsif (/^no-ec$/) { $no_ec=1; } | ||
158 | elsif (/^no-hmac$/) { $no_hmac=1; } | ||
159 | elsif (/^no-aes$/) { $no_aes=1; } | ||
160 | elsif (/^no-evp$/) { $no_evp=1; } | ||
161 | elsif (/^no-lhash$/) { $no_lhash=1; } | ||
162 | elsif (/^no-stack$/) { $no_stack=1; } | ||
163 | elsif (/^no-err$/) { $no_err=1; } | ||
164 | elsif (/^no-buffer$/) { $no_buffer=1; } | ||
165 | elsif (/^no-bio$/) { $no_bio=1; } | ||
166 | #elsif (/^no-locking$/) { $no_locking=1; } | ||
167 | elsif (/^no-comp$/) { $no_comp=1; } | ||
168 | elsif (/^no-dso$/) { $no_dso=1; } | ||
169 | elsif (/^no-krb5$/) { $no_krb5=1; } | ||
19 | } | 170 | } |
20 | 171 | ||
172 | |||
173 | # If no platform is given, assume WIN32 | ||
174 | if ($W32 + $W16 + $VMS == 0) { | ||
175 | $W32 = 1; | ||
176 | } | ||
177 | |||
178 | # Add extra knowledge | ||
179 | if ($W16) { | ||
180 | $no_fp_api=1; | ||
181 | } | ||
182 | |||
21 | if (!$do_ssl && !$do_crypto) | 183 | if (!$do_ssl && !$do_crypto) |
22 | { | 184 | { |
23 | print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 ]\n"; | 185 | print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT ]\n"; |
24 | exit(1); | 186 | exit(1); |
25 | } | 187 | } |
26 | 188 | ||
27 | %ssl_list=&load_numbers($ssl_num); | 189 | %ssl_list=&load_numbers($ssl_num); |
190 | $max_ssl = $max_num; | ||
28 | %crypto_list=&load_numbers($crypto_num); | 191 | %crypto_list=&load_numbers($crypto_num); |
192 | $max_crypto = $max_num; | ||
193 | |||
194 | my $ssl="ssl/ssl.h"; | ||
195 | $ssl.=" ssl/kssl.h"; | ||
29 | 196 | ||
30 | $ssl="ssl/ssl.h"; | 197 | my $crypto ="crypto/crypto.h"; |
31 | 198 | $crypto.=" crypto/des/des.h crypto/des/des_old.h" ; # unless $no_des; | |
32 | $crypto ="crypto/crypto.h"; | 199 | $crypto.=" crypto/idea/idea.h" ; # unless $no_idea; |
33 | $crypto.=" crypto/des/des.h"; | 200 | $crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4; |
34 | $crypto.=" crypto/idea/idea.h"; | 201 | $crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5; |
35 | $crypto.=" crypto/rc4/rc4.h"; | 202 | $crypto.=" crypto/rc2/rc2.h" ; # unless $no_rc2; |
36 | $crypto.=" crypto/rc5/rc5.h"; | 203 | $crypto.=" crypto/bf/blowfish.h" ; # unless $no_bf; |
37 | $crypto.=" crypto/rc2/rc2.h"; | 204 | $crypto.=" crypto/cast/cast.h" ; # unless $no_cast; |
38 | $crypto.=" crypto/bf/blowfish.h"; | 205 | $crypto.=" crypto/md2/md2.h" ; # unless $no_md2; |
39 | $crypto.=" crypto/cast/cast.h"; | 206 | $crypto.=" crypto/md4/md4.h" ; # unless $no_md4; |
40 | $crypto.=" crypto/md2/md2.h"; | 207 | $crypto.=" crypto/md5/md5.h" ; # unless $no_md5; |
41 | $crypto.=" crypto/md5/md5.h"; | 208 | $crypto.=" crypto/mdc2/mdc2.h" ; # unless $no_mdc2; |
42 | $crypto.=" crypto/mdc2/mdc2.h"; | 209 | $crypto.=" crypto/sha/sha.h" ; # unless $no_sha; |
43 | $crypto.=" crypto/sha/sha.h"; | 210 | $crypto.=" crypto/ripemd/ripemd.h" ; # unless $no_ripemd; |
44 | $crypto.=" crypto/ripemd/ripemd.h"; | 211 | $crypto.=" crypto/aes/aes.h" ; # unless $no_aes; |
45 | 212 | ||
46 | $crypto.=" crypto/bn/bn.h"; | 213 | $crypto.=" crypto/bn/bn.h"; |
47 | $crypto.=" crypto/rsa/rsa.h"; | 214 | $crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa; |
48 | $crypto.=" crypto/dsa/dsa.h"; | 215 | $crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa; |
49 | $crypto.=" crypto/dh/dh.h"; | 216 | $crypto.=" crypto/dh/dh.h" ; # unless $no_dh; |
50 | 217 | $crypto.=" crypto/ec/ec.h" ; # unless $no_ec; | |
51 | $crypto.=" crypto/stack/stack.h"; | 218 | $crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac; |
52 | $crypto.=" crypto/buffer/buffer.h"; | 219 | |
53 | $crypto.=" crypto/bio/bio.h"; | 220 | $crypto.=" crypto/engine/engine.h"; |
54 | $crypto.=" crypto/lhash/lhash.h"; | 221 | $crypto.=" crypto/stack/stack.h" ; # unless $no_stack; |
222 | $crypto.=" crypto/buffer/buffer.h" ; # unless $no_buffer; | ||
223 | $crypto.=" crypto/bio/bio.h" ; # unless $no_bio; | ||
224 | $crypto.=" crypto/dso/dso.h" ; # unless $no_dso; | ||
225 | $crypto.=" crypto/lhash/lhash.h" ; # unless $no_lhash; | ||
55 | $crypto.=" crypto/conf/conf.h"; | 226 | $crypto.=" crypto/conf/conf.h"; |
56 | $crypto.=" crypto/txt_db/txt_db.h"; | 227 | $crypto.=" crypto/txt_db/txt_db.h"; |
57 | 228 | ||
58 | $crypto.=" crypto/evp/evp.h"; | 229 | $crypto.=" crypto/evp/evp.h" ; # unless $no_evp; |
59 | $crypto.=" crypto/objects/objects.h"; | 230 | $crypto.=" crypto/objects/objects.h"; |
60 | $crypto.=" crypto/pem/pem.h"; | 231 | $crypto.=" crypto/pem/pem.h"; |
61 | #$crypto.=" crypto/meth/meth.h"; | 232 | #$crypto.=" crypto/meth/meth.h"; |
62 | $crypto.=" crypto/asn1/asn1.h"; | 233 | $crypto.=" crypto/asn1/asn1.h"; |
234 | $crypto.=" crypto/asn1/asn1t.h"; | ||
63 | $crypto.=" crypto/asn1/asn1_mac.h"; | 235 | $crypto.=" crypto/asn1/asn1_mac.h"; |
64 | $crypto.=" crypto/err/err.h"; | 236 | $crypto.=" crypto/err/err.h" ; # unless $no_err; |
65 | $crypto.=" crypto/pkcs7/pkcs7.h"; | 237 | $crypto.=" crypto/pkcs7/pkcs7.h"; |
238 | $crypto.=" crypto/pkcs12/pkcs12.h"; | ||
66 | $crypto.=" crypto/x509/x509.h"; | 239 | $crypto.=" crypto/x509/x509.h"; |
67 | $crypto.=" crypto/x509/x509_vfy.h"; | 240 | $crypto.=" crypto/x509/x509_vfy.h"; |
241 | $crypto.=" crypto/x509v3/x509v3.h"; | ||
68 | $crypto.=" crypto/rand/rand.h"; | 242 | $crypto.=" crypto/rand/rand.h"; |
69 | $crypto.=" crypto/hmac/hmac.h"; | 243 | $crypto.=" crypto/comp/comp.h" ; # unless $no_comp; |
244 | $crypto.=" crypto/ocsp/ocsp.h"; | ||
245 | $crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h"; | ||
246 | $crypto.=" crypto/krb5/krb5_asn.h"; | ||
247 | $crypto.=" crypto/tmdiff.h"; | ||
248 | |||
249 | my $symhacks="crypto/symhacks.h"; | ||
250 | |||
251 | my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks); | ||
252 | my @crypto_symbols = &do_defs("LIBEAY", $crypto, $symhacks); | ||
253 | |||
254 | if ($do_update) { | ||
255 | |||
256 | if ($do_ssl == 1) { | ||
257 | |||
258 | &maybe_add_info("SSLEAY",*ssl_list,@ssl_symbols); | ||
259 | if ($do_rewrite == 1) { | ||
260 | open(OUT, ">$ssl_num"); | ||
261 | &rewrite_numbers(*OUT,"SSLEAY",*ssl_list,@ssl_symbols); | ||
262 | } else { | ||
263 | open(OUT, ">>$ssl_num"); | ||
264 | } | ||
265 | &update_numbers(*OUT,"SSLEAY",*ssl_list,$max_ssl,@ssl_symbols); | ||
266 | close OUT; | ||
267 | } | ||
268 | |||
269 | if($do_crypto == 1) { | ||
270 | |||
271 | &maybe_add_info("LIBEAY",*crypto_list,@crypto_symbols); | ||
272 | if ($do_rewrite == 1) { | ||
273 | open(OUT, ">$crypto_num"); | ||
274 | &rewrite_numbers(*OUT,"LIBEAY",*crypto_list,@crypto_symbols); | ||
275 | } else { | ||
276 | open(OUT, ">>$crypto_num"); | ||
277 | } | ||
278 | &update_numbers(*OUT,"LIBEAY",*crypto_list,$max_crypto,@crypto_symbols); | ||
279 | close OUT; | ||
280 | } | ||
281 | |||
282 | } elsif ($do_checkexist) { | ||
283 | &check_existing(*ssl_list, @ssl_symbols) | ||
284 | if $do_ssl == 1; | ||
285 | &check_existing(*crypto_list, @crypto_symbols) | ||
286 | if $do_crypto == 1; | ||
287 | } elsif ($do_ctest || $do_ctestall) { | ||
70 | 288 | ||
71 | $match{'NOPROTO'}=1; | 289 | print <<"EOF"; |
72 | $match2{'PERL5'}=1; | ||
73 | 290 | ||
74 | &print_def_file(*STDOUT,"SSLEAY",*ssl_list,&do_defs("SSLEAY",$ssl)) | 291 | /* Test file to check all DEF file symbols are present by trying |
75 | if $do_ssl == 1; | 292 | * to link to all of them. This is *not* intended to be run! |
293 | */ | ||
294 | |||
295 | int main() | ||
296 | { | ||
297 | EOF | ||
298 | &print_test_file(*STDOUT,"SSLEAY",*ssl_list,$do_ctestall,@ssl_symbols) | ||
299 | if $do_ssl == 1; | ||
300 | |||
301 | &print_test_file(*STDOUT,"LIBEAY",*crypto_list,$do_ctestall,@crypto_symbols) | ||
302 | if $do_crypto == 1; | ||
303 | |||
304 | print "}\n"; | ||
305 | |||
306 | } else { | ||
307 | |||
308 | &print_def_file(*STDOUT,"SSLEAY",*ssl_list,@ssl_symbols) | ||
309 | if $do_ssl == 1; | ||
310 | |||
311 | &print_def_file(*STDOUT,"LIBEAY",*crypto_list,@crypto_symbols) | ||
312 | if $do_crypto == 1; | ||
313 | |||
314 | } | ||
76 | 315 | ||
77 | &print_def_file(*STDOUT,"LIBEAY",*crypto_list,&do_defs("LIBEAY",$crypto)) | ||
78 | if $do_crypto == 1; | ||
79 | 316 | ||
80 | sub do_defs | 317 | sub do_defs |
81 | { | 318 | { |
82 | local($name,$files)=@_; | 319 | my($name,$files,$symhacksfile)=@_; |
83 | local(@ret); | 320 | my $file; |
321 | my @ret; | ||
322 | my %syms; | ||
323 | my %platform; # For anything undefined, we assume "" | ||
324 | my %kind; # For anything undefined, we assume "FUNCTION" | ||
325 | my %algorithm; # For anything undefined, we assume "" | ||
326 | my %variant; | ||
327 | my %variant_cnt; # To be able to allocate "name{n}" if "name" | ||
328 | # is the same name as the original. | ||
329 | my $cpp; | ||
330 | my %unknown_algorithms = (); | ||
84 | 331 | ||
85 | $off=-1; | 332 | foreach $file (split(/\s+/,$symhacksfile." ".$files)) |
86 | foreach $file (split(/\s+/,$files)) | ||
87 | { | 333 | { |
88 | # print STDERR "reading $file\n"; | 334 | print STDERR "DEBUG: starting on $file:\n" if $debug; |
89 | open(IN,"<$file") || die "unable to open $file:$!\n"; | 335 | open(IN,"<$file") || die "unable to open $file:$!\n"; |
90 | $depth=0; | 336 | my $line = "", my $def= ""; |
91 | $pr=-1; | 337 | my %tag = ( |
92 | @np=""; | 338 | (map { $_ => 0 } @known_platforms), |
93 | $/=undef; | 339 | (map { "OPENSSL_SYS_".$_ => 0 } @known_ossl_platforms), |
94 | $a=<IN>; | 340 | (map { "OPENSSL_NO_".$_ => 0 } @known_algorithms), |
95 | while (($i=index($a,"/*")) >= 0) | 341 | NOPROTO => 0, |
342 | PERL5 => 0, | ||
343 | _WINDLL => 0, | ||
344 | CONST_STRICT => 0, | ||
345 | TRUE => 1, | ||
346 | ); | ||
347 | my $symhacking = $file eq $symhacksfile; | ||
348 | my @current_platforms = (); | ||
349 | my @current_algorithms = (); | ||
350 | |||
351 | # params: symbol, alias, platforms, kind | ||
352 | # The reason to put this subroutine in a variable is that | ||
353 | # it will otherwise create it's own, unshared, version of | ||
354 | # %tag and %variant... | ||
355 | my $make_variant = sub | ||
356 | { | ||
357 | my ($s, $a, $p, $k) = @_; | ||
358 | my ($a1, $a2); | ||
359 | |||
360 | print STDERR "DEBUG: make_variant: Entered with ",$s,", ",$a,", ",(defined($p)?$p:""),", ",(defined($k)?$k:""),"\n" if $debug; | ||
361 | if (defined($p)) | ||
96 | { | 362 | { |
97 | $j=index($a,"*/"); | 363 | $a1 = join(",",$p, |
98 | break unless ($j >= 0); | 364 | grep(!/^$/, |
99 | $a=substr($a,0,$i).substr($a,$j+2); | 365 | map { $tag{$_} == 1 ? $_ : "" } |
100 | # print "$i $j\n"; | 366 | @known_platforms)); |
101 | } | 367 | } |
102 | foreach (split("\n",$a)) | 368 | else |
369 | { | ||
370 | $a1 = join(",", | ||
371 | grep(!/^$/, | ||
372 | map { $tag{$_} == 1 ? $_ : "" } | ||
373 | @known_platforms)); | ||
374 | } | ||
375 | $a2 = join(",", | ||
376 | grep(!/^$/, | ||
377 | map { $tag{"OPENSSL_SYS_".$_} == 1 ? $_ : "" } | ||
378 | @known_ossl_platforms)); | ||
379 | print STDERR "DEBUG: make_variant: a1 = $a1; a2 = $a2\n" if $debug; | ||
380 | if ($a1 eq "") { $a1 = $a2; } | ||
381 | elsif ($a1 ne "" && $a2 ne "") { $a1 .= ",".$a2; } | ||
382 | if ($a eq $s) | ||
103 | { | 383 | { |
104 | if (/^\#\s*ifndef (.*)/) | 384 | if (!defined($variant_cnt{$s})) |
105 | { | 385 | { |
106 | push(@tag,$1); | 386 | $variant_cnt{$s} = 0; |
107 | $tag{$1}=-1; | ||
108 | next; | ||
109 | } | 387 | } |
110 | elsif (/^\#\s*if !defined\(([^\)]+)\)/) | 388 | $variant_cnt{$s}++; |
111 | { | 389 | $a .= "{$variant_cnt{$s}}"; |
390 | } | ||
391 | my $toadd = $a.":".$a1.(defined($k)?":".$k:""); | ||
392 | my $togrep = $s.'(\{[0-9]+\})?:'.$a1.(defined($k)?":".$k:""); | ||
393 | if (!grep(/^$togrep$/, | ||
394 | split(/;/, defined($variant{$s})?$variant{$s}:""))) { | ||
395 | if (defined($variant{$s})) { $variant{$s} .= ";"; } | ||
396 | $variant{$s} .= $toadd; | ||
397 | } | ||
398 | print STDERR "DEBUG: make_variant: Exit with variant of ",$s," = ",$variant{$s},"\n" if $debug; | ||
399 | }; | ||
400 | |||
401 | print STDERR "DEBUG: parsing ----------\n" if $debug; | ||
402 | while(<IN>) { | ||
403 | last if (/\/\* Error codes for the \w+ functions\. \*\//); | ||
404 | if ($line ne '') { | ||
405 | $_ = $line . $_; | ||
406 | $line = ''; | ||
407 | } | ||
408 | |||
409 | if (/\\$/) { | ||
410 | chomp; # remove eol | ||
411 | chop; # remove ending backslash | ||
412 | $line = $_; | ||
413 | next; | ||
414 | } | ||
415 | |||
416 | $cpp = 1 if /^\#.*ifdef.*cplusplus/; | ||
417 | if ($cpp) { | ||
418 | $cpp = 0 if /^\#.*endif/; | ||
419 | next; | ||
420 | } | ||
421 | |||
422 | s/\/\*.*?\*\///gs; # ignore comments | ||
423 | s/{[^{}]*}//gs; # ignore {} blocks | ||
424 | print STDERR "DEBUG: \$_=\"$_\"\n" if $debug; | ||
425 | if (/^\#\s*ifndef\s+(.*)/) { | ||
426 | push(@tag,"-"); | ||
112 | push(@tag,$1); | 427 | push(@tag,$1); |
113 | $tag{$1}=-1; | 428 | $tag{$1}=-1; |
114 | next; | 429 | print STDERR "DEBUG: $file: found tag $1 = -1\n" if $debug; |
430 | } elsif (/^\#\s*if\s+!defined\(([^\)]+)\)/) { | ||
431 | push(@tag,"-"); | ||
432 | if (/^\#\s*if\s+(!defined\(([^\)]+)\)(\s+\&\&\s+!defined\(([^\)]+)\))*)$/) { | ||
433 | my $tmp_1 = $1; | ||
434 | my $tmp_; | ||
435 | foreach $tmp_ (split '\&\&',$tmp_1) { | ||
436 | $tmp_ =~ /!defined\(([^\)]+)\)/; | ||
437 | print STDERR "DEBUG: $file: found tag $1 = -1\n" if $debug; | ||
438 | push(@tag,$1); | ||
439 | $tag{$1}=-1; | ||
440 | } | ||
441 | } else { | ||
442 | print STDERR "Warning: $file: complicated expression: $_" if $debug; # because it is O... | ||
443 | print STDERR "DEBUG: $file: found tag $1 = -1\n" if $debug; | ||
444 | push(@tag,$1); | ||
445 | $tag{$1}=-1; | ||
115 | } | 446 | } |
116 | elsif (/^\#\s*ifdef (.*)/) | 447 | } elsif (/^\#\s*ifdef\s+(.*)/) { |
117 | { | 448 | push(@tag,"-"); |
118 | push(@tag,$1); | 449 | push(@tag,$1); |
119 | $tag{$1}=1; | 450 | $tag{$1}=1; |
120 | next; | 451 | print STDERR "DEBUG: $file: found tag $1 = 1\n" if $debug; |
452 | } elsif (/^\#\s*if\s+defined\(([^\)]+)\)/) { | ||
453 | push(@tag,"-"); | ||
454 | if (/^\#\s*if\s+(defined\(([^\)]+)\)(\s+\|\|\s+defined\(([^\)]+)\))*)$/) { | ||
455 | my $tmp_1 = $1; | ||
456 | my $tmp_; | ||
457 | foreach $tmp_ (split '\|\|',$tmp_1) { | ||
458 | $tmp_ =~ /defined\(([^\)]+)\)/; | ||
459 | print STDERR "DEBUG: $file: found tag $1 = 1\n" if $debug; | ||
460 | push(@tag,$1); | ||
461 | $tag{$1}=1; | ||
462 | } | ||
463 | } else { | ||
464 | print STDERR "Warning: $file: complicated expression: $_\n" if $debug; # because it is O... | ||
465 | print STDERR "DEBUG: $file: found tag $1 = 1\n" if $debug; | ||
466 | push(@tag,$1); | ||
467 | $tag{$1}=1; | ||
121 | } | 468 | } |
122 | elsif (/^\#\s*if defined(.*)/) | 469 | } elsif (/^\#\s*error\s+(\w+) is disabled\./) { |
123 | { | 470 | my $tag_i = $#tag; |
124 | push(@tag,$1); | 471 | while($tag[$tag_i] ne "-") { |
125 | $tag{$1}=1; | 472 | if ($tag[$tag_i] eq "OPENSSL_NO_".$1) { |
126 | next; | 473 | $tag{$tag[$tag_i]}=2; |
474 | print STDERR "DEBUG: $file: chaged tag $1 = 2\n" if $debug; | ||
475 | } | ||
476 | $tag_i--; | ||
477 | } | ||
478 | } elsif (/^\#\s*endif/) { | ||
479 | my $tag_i = $#tag; | ||
480 | while($tag[$tag_i] ne "-") { | ||
481 | my $t=$tag[$tag_i]; | ||
482 | print STDERR "DEBUG: \$t=\"$t\"\n" if $debug; | ||
483 | if ($tag{$t}==2) { | ||
484 | $tag{$t}=-1; | ||
485 | } else { | ||
486 | $tag{$t}=0; | ||
487 | } | ||
488 | print STDERR "DEBUG: $file: changed tag ",$t," = ",$tag{$t},"\n" if $debug; | ||
489 | pop(@tag); | ||
490 | if ($t =~ /^OPENSSL_NO_([A-Z0-9_]+)$/) { | ||
491 | $t=$1; | ||
492 | } else { | ||
493 | $t=""; | ||
494 | } | ||
495 | if ($t ne "" | ||
496 | && !grep(/^$t$/, @known_algorithms)) { | ||
497 | $unknown_algorithms{$t} = 1; | ||
498 | #print STDERR "DEBUG: Added as unknown algorithm: $t\n" if $debug; | ||
499 | } | ||
500 | $tag_i--; | ||
127 | } | 501 | } |
128 | elsif (/^\#\s*endif/) | ||
129 | { | ||
130 | $tag{$tag[$#tag]}=0; | ||
131 | pop(@tag); | 502 | pop(@tag); |
503 | } elsif (/^\#\s*else/) { | ||
504 | my $tag_i = $#tag; | ||
505 | while($tag[$tag_i] ne "-") { | ||
506 | my $t=$tag[$tag_i]; | ||
507 | $tag{$t}= -$tag{$t}; | ||
508 | print STDERR "DEBUG: $file: changed tag ",$t," = ",$tag{$t},"\n" if $debug; | ||
509 | $tag_i--; | ||
510 | } | ||
511 | } elsif (/^\#\s*if\s+1/) { | ||
512 | push(@tag,"-"); | ||
513 | # Dummy tag | ||
514 | push(@tag,"TRUE"); | ||
515 | $tag{"TRUE"}=1; | ||
516 | print STDERR "DEBUG: $file: found 1\n" if $debug; | ||
517 | } elsif (/^\#\s*if\s+0/) { | ||
518 | push(@tag,"-"); | ||
519 | # Dummy tag | ||
520 | push(@tag,"TRUE"); | ||
521 | $tag{"TRUE"}=-1; | ||
522 | print STDERR "DEBUG: $file: found 0\n" if $debug; | ||
523 | } elsif (/^\#\s*define\s+(\w+)\s+(\w+)/ | ||
524 | && $symhacking && $tag{'TRUE'} != -1) { | ||
525 | # This is for aliasing. When we find an alias, | ||
526 | # we have to invert | ||
527 | &$make_variant($1,$2); | ||
528 | print STDERR "DEBUG: $file: defined $1 = $2\n" if $debug; | ||
529 | } | ||
530 | if (/^\#/) { | ||
531 | @current_platforms = | ||
532 | grep(!/^$/, | ||
533 | map { $tag{$_} == 1 ? $_ : | ||
534 | $tag{$_} == -1 ? "!".$_ : "" } | ||
535 | @known_platforms); | ||
536 | push @current_platforms | ||
537 | , grep(!/^$/, | ||
538 | map { $tag{"OPENSSL_SYS_".$_} == 1 ? $_ : | ||
539 | $tag{"OPENSSL_SYS_".$_} == -1 ? "!".$_ : "" } | ||
540 | @known_ossl_platforms); | ||
541 | @current_algorithms = | ||
542 | grep(!/^$/, | ||
543 | map { $tag{"OPENSSL_NO_".$_} == -1 ? $_ : "" } | ||
544 | @known_algorithms); | ||
545 | $def .= | ||
546 | "#INFO:" | ||
547 | .join(',',@current_platforms).":" | ||
548 | .join(',',@current_algorithms).";"; | ||
132 | next; | 549 | next; |
550 | } | ||
551 | if ($tag{'TRUE'} != -1) { | ||
552 | if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) { | ||
553 | next; | ||
554 | } elsif (/^\s*DECLARE_ASN1_ENCODE_FUNCTIONS\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) { | ||
555 | $def .= "int d2i_$3(void);"; | ||
556 | $def .= "int i2d_$3(void);"; | ||
557 | # Variant for platforms that do not | ||
558 | # have to access globale variables | ||
559 | # in shared libraries through functions | ||
560 | $def .= | ||
561 | "#INFO:" | ||
562 | .join(',',"!EXPORT_VAR_AS_FUNCTION",@current_platforms).":" | ||
563 | .join(',',@current_algorithms).";"; | ||
564 | $def .= "OPENSSL_EXTERN int $2_it;"; | ||
565 | $def .= | ||
566 | "#INFO:" | ||
567 | .join(',',@current_platforms).":" | ||
568 | .join(',',@current_algorithms).";"; | ||
569 | # Variant for platforms that have to | ||
570 | # access globale variables in shared | ||
571 | # libraries through functions | ||
572 | &$make_variant("$2_it","$2_it", | ||
573 | "EXPORT_VAR_AS_FUNCTION", | ||
574 | "FUNCTION"); | ||
575 | next; | ||
576 | } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_fname\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) { | ||
577 | $def .= "int d2i_$3(void);"; | ||
578 | $def .= "int i2d_$3(void);"; | ||
579 | $def .= "int $3_free(void);"; | ||
580 | $def .= "int $3_new(void);"; | ||
581 | # Variant for platforms that do not | ||
582 | # have to access globale variables | ||
583 | # in shared libraries through functions | ||
584 | $def .= | ||
585 | "#INFO:" | ||
586 | .join(',',"!EXPORT_VAR_AS_FUNCTION",@current_platforms).":" | ||
587 | .join(',',@current_algorithms).";"; | ||
588 | $def .= "OPENSSL_EXTERN int $2_it;"; | ||
589 | $def .= | ||
590 | "#INFO:" | ||
591 | .join(',',@current_platforms).":" | ||
592 | .join(',',@current_algorithms).";"; | ||
593 | # Variant for platforms that have to | ||
594 | # access globale variables in shared | ||
595 | # libraries through functions | ||
596 | &$make_variant("$2_it","$2_it", | ||
597 | "EXPORT_VAR_AS_FUNCTION", | ||
598 | "FUNCTION"); | ||
599 | next; | ||
600 | } elsif (/^\s*DECLARE_ASN1_FUNCTIONS\s*\(\s*(\w*)\s*\)/ || | ||
601 | /^\s*DECLARE_ASN1_FUNCTIONS_const\s*\(\s*(\w*)\s*\)/) { | ||
602 | $def .= "int d2i_$1(void);"; | ||
603 | $def .= "int i2d_$1(void);"; | ||
604 | $def .= "int $1_free(void);"; | ||
605 | $def .= "int $1_new(void);"; | ||
606 | # Variant for platforms that do not | ||
607 | # have to access globale variables | ||
608 | # in shared libraries through functions | ||
609 | $def .= | ||
610 | "#INFO:" | ||
611 | .join(',',"!EXPORT_VAR_AS_FUNCTION",@current_platforms).":" | ||
612 | .join(',',@current_algorithms).";"; | ||
613 | $def .= "OPENSSL_EXTERN int $1_it;"; | ||
614 | $def .= | ||
615 | "#INFO:" | ||
616 | .join(',',@current_platforms).":" | ||
617 | .join(',',@current_algorithms).";"; | ||
618 | # Variant for platforms that have to | ||
619 | # access globale variables in shared | ||
620 | # libraries through functions | ||
621 | &$make_variant("$1_it","$1_it", | ||
622 | "EXPORT_VAR_AS_FUNCTION", | ||
623 | "FUNCTION"); | ||
624 | next; | ||
625 | } elsif (/^\s*DECLARE_ASN1_ENCODE_FUNCTIONS_const\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) { | ||
626 | $def .= "int d2i_$2(void);"; | ||
627 | $def .= "int i2d_$2(void);"; | ||
628 | # Variant for platforms that do not | ||
629 | # have to access globale variables | ||
630 | # in shared libraries through functions | ||
631 | $def .= | ||
632 | "#INFO:" | ||
633 | .join(',',"!EXPORT_VAR_AS_FUNCTION",@current_platforms).":" | ||
634 | .join(',',@current_algorithms).";"; | ||
635 | $def .= "OPENSSL_EXTERN int $2_it;"; | ||
636 | $def .= | ||
637 | "#INFO:" | ||
638 | .join(',',@current_platforms).":" | ||
639 | .join(',',@current_algorithms).";"; | ||
640 | # Variant for platforms that have to | ||
641 | # access globale variables in shared | ||
642 | # libraries through functions | ||
643 | &$make_variant("$2_it","$2_it", | ||
644 | "EXPORT_VAR_AS_FUNCTION", | ||
645 | "FUNCTION"); | ||
646 | next; | ||
647 | } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_name\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) { | ||
648 | $def .= "int d2i_$2(void);"; | ||
649 | $def .= "int i2d_$2(void);"; | ||
650 | $def .= "int $2_free(void);"; | ||
651 | $def .= "int $2_new(void);"; | ||
652 | # Variant for platforms that do not | ||
653 | # have to access globale variables | ||
654 | # in shared libraries through functions | ||
655 | $def .= | ||
656 | "#INFO:" | ||
657 | .join(',',"!EXPORT_VAR_AS_FUNCTION",@current_platforms).":" | ||
658 | .join(',',@current_algorithms).";"; | ||
659 | $def .= "OPENSSL_EXTERN int $2_it;"; | ||
660 | $def .= | ||
661 | "#INFO:" | ||
662 | .join(',',@current_platforms).":" | ||
663 | .join(',',@current_algorithms).";"; | ||
664 | # Variant for platforms that have to | ||
665 | # access globale variables in shared | ||
666 | # libraries through functions | ||
667 | &$make_variant("$2_it","$2_it", | ||
668 | "EXPORT_VAR_AS_FUNCTION", | ||
669 | "FUNCTION"); | ||
670 | next; | ||
671 | } elsif (/^\s*DECLARE_ASN1_ITEM\s*\(\s*(\w*)\s*\)/) { | ||
672 | # Variant for platforms that do not | ||
673 | # have to access globale variables | ||
674 | # in shared libraries through functions | ||
675 | $def .= | ||
676 | "#INFO:" | ||
677 | .join(',',"!EXPORT_VAR_AS_FUNCTION",@current_platforms).":" | ||
678 | .join(',',@current_algorithms).";"; | ||
679 | $def .= "OPENSSL_EXTERN int $1_it;"; | ||
680 | $def .= | ||
681 | "#INFO:" | ||
682 | .join(',',@current_platforms).":" | ||
683 | .join(',',@current_algorithms).";"; | ||
684 | # Variant for platforms that have to | ||
685 | # access globale variables in shared | ||
686 | # libraries through functions | ||
687 | &$make_variant("$1_it","$1_it", | ||
688 | "EXPORT_VAR_AS_FUNCTION", | ||
689 | "FUNCTION"); | ||
690 | next; | ||
691 | } elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) { | ||
692 | next; | ||
693 | } elsif (/^\s*DECLARE_PKCS12_STACK_OF\s*\(\s*(\w*)\s*\)/) { | ||
694 | next; | ||
695 | } elsif (/^DECLARE_PEM_rw\s*\(\s*(\w*)\s*,/ || | ||
696 | /^DECLARE_PEM_rw_cb\s*\(\s*(\w*)\s*,/ ) { | ||
697 | # Things not in Win16 | ||
698 | $def .= | ||
699 | "#INFO:" | ||
700 | .join(',',"!WIN16",@current_platforms).":" | ||
701 | .join(',',@current_algorithms).";"; | ||
702 | $def .= "int PEM_read_$1(void);"; | ||
703 | $def .= "int PEM_write_$1(void);"; | ||
704 | $def .= | ||
705 | "#INFO:" | ||
706 | .join(',',@current_platforms).":" | ||
707 | .join(',',@current_algorithms).";"; | ||
708 | # Things that are everywhere | ||
709 | $def .= "int PEM_read_bio_$1(void);"; | ||
710 | $def .= "int PEM_write_bio_$1(void);"; | ||
711 | next; | ||
712 | } elsif (/^DECLARE_PEM_write\s*\(\s*(\w*)\s*,/ || | ||
713 | /^DECLARE_PEM_write_cb\s*\(\s*(\w*)\s*,/ ) { | ||
714 | # Things not in Win16 | ||
715 | $def .= | ||
716 | "#INFO:" | ||
717 | .join(',',"!WIN16",@current_platforms).":" | ||
718 | .join(',',@current_algorithms).";"; | ||
719 | $def .= "int PEM_write_$1(void);"; | ||
720 | $def .= | ||
721 | "#INFO:" | ||
722 | .join(',',@current_platforms).":" | ||
723 | .join(',',@current_algorithms).";"; | ||
724 | # Things that are everywhere | ||
725 | $def .= "int PEM_write_bio_$1(void);"; | ||
726 | next; | ||
727 | } elsif (/^DECLARE_PEM_read\s*\(\s*(\w*)\s*,/ || | ||
728 | /^DECLARE_PEM_read_cb\s*\(\s*(\w*)\s*,/ ) { | ||
729 | # Things not in Win16 | ||
730 | $def .= | ||
731 | "#INFO:" | ||
732 | .join(',',"!WIN16",@current_platforms).":" | ||
733 | .join(',',@current_algorithms).";"; | ||
734 | $def .= "int PEM_read_$1(void);"; | ||
735 | $def .= | ||
736 | "#INFO:" | ||
737 | .join(',',@current_platforms).":" | ||
738 | .join(',',@current_algorithms).";"; | ||
739 | # Things that are everywhere | ||
740 | $def .= "int PEM_read_bio_$1(void);"; | ||
741 | next; | ||
742 | } elsif (/^OPENSSL_DECLARE_GLOBAL\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) { | ||
743 | # Variant for platforms that do not | ||
744 | # have to access globale variables | ||
745 | # in shared libraries through functions | ||
746 | $def .= | ||
747 | "#INFO:" | ||
748 | .join(',',"!EXPORT_VAR_AS_FUNCTION",@current_platforms).":" | ||
749 | .join(',',@current_algorithms).";"; | ||
750 | $def .= "OPENSSL_EXTERN int _shadow_$2;"; | ||
751 | $def .= | ||
752 | "#INFO:" | ||
753 | .join(',',@current_platforms).":" | ||
754 | .join(',',@current_algorithms).";"; | ||
755 | # Variant for platforms that have to | ||
756 | # access globale variables in shared | ||
757 | # libraries through functions | ||
758 | &$make_variant("_shadow_$2","_shadow_$2", | ||
759 | "EXPORT_VAR_AS_FUNCTION", | ||
760 | "FUNCTION"); | ||
761 | } elsif ($tag{'CONST_STRICT'} != 1) { | ||
762 | if (/\{|\/\*|\([^\)]*$/) { | ||
763 | $line = $_; | ||
764 | } else { | ||
765 | $def .= $_; | ||
766 | } | ||
133 | } | 767 | } |
134 | elsif (/^\#\s*else/) | 768 | } |
135 | { | 769 | } |
136 | $t=$tag[$#tag]; | 770 | close(IN); |
137 | $tag{$t}= -$tag{$t}; | 771 | |
772 | my $algs; | ||
773 | my $plays; | ||
774 | |||
775 | print STDERR "DEBUG: postprocessing ----------\n" if $debug; | ||
776 | foreach (split /;/, $def) { | ||
777 | my $s; my $k = "FUNCTION"; my $p; my $a; | ||
778 | s/^[\n\s]*//g; | ||
779 | s/[\n\s]*$//g; | ||
780 | next if(/\#undef/); | ||
781 | next if(/typedef\W/); | ||
782 | next if(/\#define/); | ||
783 | |||
784 | print STDERR "DEBUG: \$_ = \"$_\"\n" if $debug; | ||
785 | if (/^\#INFO:([^:]*):(.*)$/) { | ||
786 | $plats = $1; | ||
787 | $algs = $2; | ||
788 | print STDERR "DEBUG: found info on platforms ($plats) and algorithms ($algs)\n" if $debug; | ||
789 | next; | ||
790 | } elsif (/^\s*OPENSSL_EXTERN\s.*?(\w+(\{[0-9]+\})?)(\[[0-9]*\])*\s*$/) { | ||
791 | $s = $1; | ||
792 | $k = "VARIABLE"; | ||
793 | print STDERR "DEBUG: found external variable $s\n" if $debug; | ||
794 | } elsif (/\(\*(\w*(\{[0-9]+\})?)\([^\)]+/) { | ||
795 | $s = $1; | ||
796 | print STDERR "DEBUG: found ANSI C function $s\n" if $debug; | ||
797 | } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s) { | ||
798 | # K&R C | ||
799 | print STDERR "DEBUG: found K&R C function $s\n" if $debug; | ||
138 | next; | 800 | next; |
801 | } elsif (/\w+\W+\w+(\{[0-9]+\})?\W*\(.*\)$/s) { | ||
802 | while (not /\(\)$/s) { | ||
803 | s/[^\(\)]*\)$/\)/s; | ||
804 | s/\([^\(\)]*\)\)$/\)/s; | ||
139 | } | 805 | } |
140 | #printf STDERR "$_\n%2d %2d %2d %2d %2d $NT\n", | 806 | s/\(void\)//; |
141 | #$tag{'NOPROTO'},$tag{'FreeBSD'},$tag{'WIN16'},$tag{'PERL5'},$tag{'NO_FP_API'}; | 807 | /(\w+(\{[0-9]+\})?)\W*\(\)/s; |
142 | 808 | $s = $1; | |
143 | $t=undef; | 809 | print STDERR "DEBUG: found function $s\n" if $debug; |
144 | if (/^extern .*;$/) | 810 | } elsif (/\(/ and not (/=/)) { |
145 | { $t=&do_extern($name,$_); } | 811 | print STDERR "File $file: cannot parse: $_;\n"; |
146 | elsif ( ($tag{'NOPROTO'} == 1) && | 812 | next; |
147 | ($tag{'FreeBSD'} != 1) && | 813 | } else { |
148 | (($NT && ($tag{'WIN16'} != 1)) || | 814 | next; |
149 | (!$NT && ($tag{'WIN16'} != -1))) && | 815 | } |
150 | ($tag{'PERL5'} != 1) && | 816 | |
151 | # ($tag{'_WINDLL'} != -1) && | 817 | $syms{$s} = 1; |
152 | ((!$NT && $tag{'_WINDLL'} != -1) || | 818 | $kind{$s} = $k; |
153 | ($NT && $tag{'_WINDLL'} != 1)) && | 819 | |
154 | ((($tag{'NO_FP_API'} != 1) && $NT) || | 820 | $p = $plats; |
155 | (($tag{'NO_FP_API'} != -1) && !$NT))) | 821 | $a = $algs; |
156 | { $t=&do_line($name,$_); } | 822 | $a .= ",BF" if($s =~ /EVP_bf/); |
157 | else | 823 | $a .= ",CAST" if($s =~ /EVP_cast/); |
158 | { $t=undef; } | 824 | $a .= ",DES" if($s =~ /EVP_des/); |
159 | if (($t ne undef) && (!$done{$name,$t})) | 825 | $a .= ",DSA" if($s =~ /EVP_dss/); |
160 | { | 826 | $a .= ",IDEA" if($s =~ /EVP_idea/); |
161 | $done{$name,$t}++; | 827 | $a .= ",MD2" if($s =~ /EVP_md2/); |
162 | push(@ret,$t); | 828 | $a .= ",MD4" if($s =~ /EVP_md4/); |
163 | #printf STDERR "one:$t\n" if $t =~ /BIO_/; | 829 | $a .= ",MD5" if($s =~ /EVP_md5/); |
830 | $a .= ",RC2" if($s =~ /EVP_rc2/); | ||
831 | $a .= ",RC4" if($s =~ /EVP_rc4/); | ||
832 | $a .= ",RC5" if($s =~ /EVP_rc5/); | ||
833 | $a .= ",RIPEMD" if($s =~ /EVP_ripemd/); | ||
834 | $a .= ",SHA" if($s =~ /EVP_sha/); | ||
835 | $a .= ",RSA" if($s =~ /EVP_(Open|Seal)(Final|Init)/); | ||
836 | $a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/); | ||
837 | $a .= ",RSA" if($s =~ /RSAPrivateKey/); | ||
838 | $a .= ",RSA" if($s =~ /SSLv23?_((client|server)_)?method/); | ||
839 | |||
840 | $platform{$s} = | ||
841 | &reduce_platforms((defined($platform{$s})?$platform{$s}.',':"").$p); | ||
842 | $algorithm{$s} .= ','.$a; | ||
843 | |||
844 | if (defined($variant{$s})) { | ||
845 | foreach $v (split /;/,$variant{$s}) { | ||
846 | (my $r, my $p, my $k) = split(/:/,$v); | ||
847 | my $ip = join ',',map({ /^!(.*)$/ ? $1 : "!".$_ } split /,/, $p); | ||
848 | $syms{$r} = 1; | ||
849 | if (!defined($k)) { $k = $kind{$s}; } | ||
850 | $kind{$r} = $k."(".$s.")"; | ||
851 | $algorithm{$r} = $algorithm{$s}; | ||
852 | $platform{$r} = &reduce_platforms($platform{$s}.",".$p.",".$p); | ||
853 | $platform{$s} = &reduce_platforms($platform{$s}.','.$ip.','.$ip); | ||
854 | print STDERR "DEBUG: \$variant{\"$s\"} = ",$v,"; \$r = $r; \$p = ",$platform{$r},"; \$a = ",$algorithm{$r},"; \$kind = ",$kind{$r},"\n" if $debug; | ||
164 | } | 855 | } |
165 | } | 856 | } |
166 | close(IN); | 857 | print STDERR "DEBUG: \$s = $s; \$p = ",$platform{$s},"; \$a = ",$algorithm{$s},"; \$kind = ",$kind{$s},"\n" if $debug; |
167 | } | 858 | } |
859 | } | ||
860 | |||
861 | # Prune the returned symbols | ||
862 | |||
863 | delete $syms{"bn_dump1"}; | ||
864 | $platform{"BIO_s_log"} .= ",!WIN32,!WIN16,!macintosh"; | ||
865 | |||
866 | $platform{"PEM_read_NS_CERT_SEQ"} = "VMS"; | ||
867 | $platform{"PEM_write_NS_CERT_SEQ"} = "VMS"; | ||
868 | $platform{"PEM_read_P8_PRIV_KEY_INFO"} = "VMS"; | ||
869 | $platform{"PEM_write_P8_PRIV_KEY_INFO"} = "VMS"; | ||
870 | |||
871 | # Info we know about | ||
872 | |||
873 | push @ret, map { $_."\\".&info_string($_,"EXIST", | ||
874 | $platform{$_}, | ||
875 | $kind{$_}, | ||
876 | $algorithm{$_}) } keys %syms; | ||
877 | |||
878 | if (keys %unknown_algorithms) { | ||
879 | print STDERR "WARNING: mkdef.pl doesn't know the following algorithms:\n"; | ||
880 | print STDERR "\t",join("\n\t",keys %unknown_algorithms),"\n"; | ||
881 | } | ||
168 | return(@ret); | 882 | return(@ret); |
883 | } | ||
884 | |||
885 | # Param: string of comma-separated platform-specs. | ||
886 | sub reduce_platforms | ||
887 | { | ||
888 | my ($platforms) = @_; | ||
889 | my $pl = defined($platforms) ? $platforms : ""; | ||
890 | my %p = map { $_ => 0 } split /,/, $pl; | ||
891 | my $ret; | ||
892 | |||
893 | print STDERR "DEBUG: Entered reduce_platforms with \"$platforms\"\n" | ||
894 | if $debug; | ||
895 | # We do this, because if there's code like the following, it really | ||
896 | # means the function exists in all cases and should therefore be | ||
897 | # everywhere. By increasing and decreasing, we may attain 0: | ||
898 | # | ||
899 | # ifndef WIN16 | ||
900 | # int foo(); | ||
901 | # else | ||
902 | # int _fat foo(); | ||
903 | # endif | ||
904 | foreach $platform (split /,/, $pl) { | ||
905 | if ($platform =~ /^!(.*)$/) { | ||
906 | $p{$1}--; | ||
907 | } else { | ||
908 | $p{$platform}++; | ||
909 | } | ||
910 | } | ||
911 | foreach $platform (keys %p) { | ||
912 | if ($p{$platform} == 0) { delete $p{$platform}; } | ||
169 | } | 913 | } |
170 | 914 | ||
171 | sub do_line | 915 | delete $p{""}; |
172 | { | 916 | |
173 | local($file,$_)=@_; | 917 | $ret = join(',',sort(map { $p{$_} < 0 ? "!".$_ : $_ } keys %p)); |
174 | local($n); | 918 | print STDERR "DEBUG: Exiting reduce_platforms with \"$ret\"\n" |
175 | 919 | if $debug; | |
176 | return(undef) if /^$/; | 920 | return $ret; |
177 | return(undef) if /^\s/; | 921 | } |
178 | #printf STDERR "two:$_\n" if $_ =~ /BIO_/; | 922 | |
179 | if (/(CRYPTO_get_locking_callback)/) | 923 | sub info_string { |
180 | { return($1); } | 924 | (my $symbol, my $exist, my $platforms, my $kind, my $algorithms) = @_; |
181 | elsif (/(CRYPTO_get_id_callback)/) | 925 | |
182 | { return($1); } | 926 | my %a = defined($algorithms) ? |
183 | elsif (/(CRYPTO_get_add_lock_callback)/) | 927 | map { $_ => 1 } split /,/, $algorithms : (); |
184 | { return($1); } | 928 | my $k = defined($kind) ? $kind : "FUNCTION"; |
185 | elsif (/(SSL_CTX_get_verify_callback)/) | 929 | my $ret; |
186 | { return($1); } | 930 | my $p = &reduce_platforms($platforms); |
187 | elsif (/(SSL_get_info_callback)/) | 931 | |
188 | { return($1); } | 932 | delete $a{""}; |
189 | elsif ((!$NT) && /(ERR_load_CRYPTO_strings)/) | 933 | |
190 | { return("ERR_load_CRYPTOlib_strings"); } | 934 | $ret = $exist; |
191 | elsif (!$NT && /BIO_s_file/) | 935 | $ret .= ":".$p; |
192 | { return(undef); } | 936 | $ret .= ":".$k; |
193 | elsif (!$NT && /BIO_new_file/) | 937 | $ret .= ":".join(',',sort keys %a); |
194 | { return(undef); } | 938 | return $ret; |
195 | elsif (!$NT && /BIO_new_fp/) | 939 | } |
196 | { return(undef); } | 940 | |
197 | elsif ($NT && /BIO_s_file_internal/) | 941 | sub maybe_add_info { |
198 | { return(undef); } | 942 | (my $name, *nums, my @symbols) = @_; |
199 | elsif ($NT && /BIO_new_file_internal/) | 943 | my $sym; |
200 | { return(undef); } | 944 | my $new_info = 0; |
201 | elsif ($NT && /BIO_new_fp_internal/) | 945 | my %syms=(); |
202 | { return(undef); } | 946 | |
203 | else | 947 | print STDERR "Updating $name info\n"; |
204 | { | 948 | foreach $sym (@symbols) { |
205 | /\s\**(\S+)\s*\(/; | 949 | (my $s, my $i) = split /\\/, $sym; |
206 | return($1); | 950 | if (defined($nums{$s})) { |
951 | $i =~ s/^(.*?:.*?:\w+)(\(\w+\))?/$1/; | ||
952 | (my $n, my $dummy) = split /\\/, $nums{$s}; | ||
953 | if (!defined($dummy) || $i ne $dummy) { | ||
954 | $nums{$s} = $n."\\".$i; | ||
955 | $new_info++; | ||
956 | print STDERR "DEBUG: maybe_add_info for $s: \"$dummy\" => \"$i\"\n" if $debug; | ||
957 | } | ||
207 | } | 958 | } |
959 | $syms{$s} = 1; | ||
208 | } | 960 | } |
209 | 961 | ||
210 | sub do_extern | 962 | my @s=sort { &parse_number($nums{$a},"n") <=> &parse_number($nums{$b},"n") } keys %nums; |
963 | foreach $sym (@s) { | ||
964 | (my $n, my $i) = split /\\/, $nums{$sym}; | ||
965 | if (!defined($syms{$sym}) && $i !~ /^NOEXIST:/) { | ||
966 | $new_info++; | ||
967 | print STDERR "DEBUG: maybe_add_info for $sym: -> undefined\n" if $debug; | ||
968 | } | ||
969 | } | ||
970 | if ($new_info) { | ||
971 | print STDERR "$new_info old symbols got an info update\n"; | ||
972 | if (!$do_rewrite) { | ||
973 | print STDERR "You should do a rewrite to fix this.\n"; | ||
974 | } | ||
975 | } else { | ||
976 | print STDERR "No old symbols needed info update\n"; | ||
977 | } | ||
978 | } | ||
979 | |||
980 | # Param: string of comma-separated keywords, each possibly prefixed with a "!" | ||
981 | sub is_valid | ||
982 | { | ||
983 | my ($keywords_txt,$platforms) = @_; | ||
984 | my (@keywords) = split /,/,$keywords_txt; | ||
985 | my ($falsesum, $truesum) = (0, !grep(/^[^!]/,@keywords)); | ||
986 | |||
987 | # Param: one keyword | ||
988 | sub recognise | ||
211 | { | 989 | { |
212 | local($file,$_)=@_; | 990 | my ($keyword,$platforms) = @_; |
213 | local($n); | ||
214 | 991 | ||
215 | /\s\**(\S+);$/; | 992 | if ($platforms) { |
216 | return($1); | 993 | # platforms |
994 | if ($keyword eq "VMS" && $VMS) { return 1; } | ||
995 | if ($keyword eq "WIN32" && $W32) { return 1; } | ||
996 | if ($keyword eq "WIN16" && $W16) { return 1; } | ||
997 | if ($keyword eq "WINNT" && $NT) { return 1; } | ||
998 | # Special platforms: | ||
999 | # EXPORT_VAR_AS_FUNCTION means that global variables | ||
1000 | # will be represented as functions. This currently | ||
1001 | # only happens on VMS-VAX. | ||
1002 | if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) { | ||
1003 | return 1; | ||
1004 | } | ||
1005 | return 0; | ||
1006 | } else { | ||
1007 | # algorithms | ||
1008 | if ($keyword eq "RC2" && $no_rc2) { return 0; } | ||
1009 | if ($keyword eq "RC4" && $no_rc4) { return 0; } | ||
1010 | if ($keyword eq "RC5" && $no_rc5) { return 0; } | ||
1011 | if ($keyword eq "IDEA" && $no_idea) { return 0; } | ||
1012 | if ($keyword eq "DES" && $no_des) { return 0; } | ||
1013 | if ($keyword eq "BF" && $no_bf) { return 0; } | ||
1014 | if ($keyword eq "CAST" && $no_cast) { return 0; } | ||
1015 | if ($keyword eq "MD2" && $no_md2) { return 0; } | ||
1016 | if ($keyword eq "MD4" && $no_md4) { return 0; } | ||
1017 | if ($keyword eq "MD5" && $no_md5) { return 0; } | ||
1018 | if ($keyword eq "SHA" && $no_sha) { return 0; } | ||
1019 | if ($keyword eq "RIPEMD" && $no_ripemd) { return 0; } | ||
1020 | if ($keyword eq "MDC2" && $no_mdc2) { return 0; } | ||
1021 | if ($keyword eq "RSA" && $no_rsa) { return 0; } | ||
1022 | if ($keyword eq "DSA" && $no_dsa) { return 0; } | ||
1023 | if ($keyword eq "DH" && $no_dh) { return 0; } | ||
1024 | if ($keyword eq "EC" && $no_ec) { return 0; } | ||
1025 | if ($keyword eq "HMAC" && $no_hmac) { return 0; } | ||
1026 | if ($keyword eq "AES" && $no_aes) { return 0; } | ||
1027 | if ($keyword eq "EVP" && $no_evp) { return 0; } | ||
1028 | if ($keyword eq "LHASH" && $no_lhash) { return 0; } | ||
1029 | if ($keyword eq "STACK" && $no_stack) { return 0; } | ||
1030 | if ($keyword eq "ERR" && $no_err) { return 0; } | ||
1031 | if ($keyword eq "BUFFER" && $no_buffer) { return 0; } | ||
1032 | if ($keyword eq "BIO" && $no_bio) { return 0; } | ||
1033 | if ($keyword eq "COMP" && $no_comp) { return 0; } | ||
1034 | if ($keyword eq "DSO" && $no_dso) { return 0; } | ||
1035 | if ($keyword eq "KRB5" && $no_krb5) { return 0; } | ||
1036 | if ($keyword eq "FP_API" && $no_fp_api) { return 0; } | ||
1037 | |||
1038 | # Nothing recognise as true | ||
1039 | return 1; | ||
1040 | } | ||
1041 | } | ||
1042 | |||
1043 | foreach $k (@keywords) { | ||
1044 | if ($k =~ /^!(.*)$/) { | ||
1045 | $falsesum += &recognise($1,$platforms); | ||
1046 | } else { | ||
1047 | $truesum += &recognise($k,$platforms); | ||
1048 | } | ||
217 | } | 1049 | } |
1050 | print STDERR "DEBUG: [",$#keywords,",",$#keywords < 0,"] is_valid($keywords_txt) => (\!$falsesum) && $truesum = ",(!$falsesum) && $truesum,"\n" if $debug; | ||
1051 | return (!$falsesum) && $truesum; | ||
1052 | } | ||
1053 | |||
1054 | sub print_test_file | ||
1055 | { | ||
1056 | (*OUT,my $name,*nums,my $testall,my @symbols)=@_; | ||
1057 | my $n = 1; my @e; my @r; | ||
1058 | my $sym; my $prev = ""; my $prefSSLeay; | ||
1059 | |||
1060 | (@e)=grep(/^SSLeay(\{[0-9]+\})?\\.*?:.*?:.*/,@symbols); | ||
1061 | (@r)=grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:.*/ && !/^SSLeay(\{[0-9]+\})?\\.*?:.*?:.*/,@symbols); | ||
1062 | @symbols=((sort @e),(sort @r)); | ||
1063 | |||
1064 | foreach $sym (@symbols) { | ||
1065 | (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/; | ||
1066 | my $v = 0; | ||
1067 | $v = 1 if $i=~ /^.*?:.*?:VARIABLE/; | ||
1068 | my $p = ($i =~ /^[^:]*:([^:]*):/,$1); | ||
1069 | my $a = ($i =~ /^[^:]*:[^:]*:[^:]*:([^:]*)/,$1); | ||
1070 | if (!defined($nums{$s})) { | ||
1071 | print STDERR "Warning: $s does not have a number assigned\n" | ||
1072 | if(!$do_update); | ||
1073 | } elsif (is_valid($p,1) && is_valid($a,0)) { | ||
1074 | my $s2 = ($s =~ /^(.*?)(\{[0-9]+\})?$/, $1); | ||
1075 | if ($prev eq $s2) { | ||
1076 | print OUT "\t/* The following has already appeared previously */\n"; | ||
1077 | print STDERR "Warning: Symbol '",$s2,"' redefined. old=",($nums{$prev} =~ /^(.*?)\\/,$1),", new=",($nums{$s2} =~ /^(.*?)\\/,$1),"\n"; | ||
1078 | } | ||
1079 | $prev = $s2; # To warn about duplicates... | ||
1080 | |||
1081 | ($nn,$ni)=($nums{$s2} =~ /^(.*?)\\(.*)$/); | ||
1082 | if ($v) { | ||
1083 | print OUT "\textern int $s2; /* type unknown */ /* $nn $ni */\n"; | ||
1084 | } else { | ||
1085 | print OUT "\textern int $s2(); /* type unknown */ /* $nn $ni */\n"; | ||
1086 | } | ||
1087 | } | ||
1088 | } | ||
1089 | } | ||
218 | 1090 | ||
219 | sub print_def_file | 1091 | sub print_def_file |
220 | { | 1092 | { |
221 | local(*OUT,$name,*nums,@functions)=@_; | 1093 | (*OUT,my $name,*nums,my @symbols)=@_; |
222 | local($n)=1; | 1094 | my $n = 1; my @e; my @r; my @v; my $prev=""; |
223 | 1095 | ||
224 | if ($NT) | 1096 | if ($W32) |
225 | { $name.="32"; } | 1097 | { $name.="32"; } |
226 | else | 1098 | else |
227 | { $name.="16"; } | 1099 | { $name.="16"; } |
228 | 1100 | ||
229 | print OUT <<"EOF"; | 1101 | print OUT <<"EOF"; |
230 | ; | 1102 | ; |
231 | ; Definition file for the DDL version of the $name library from SSLeay | 1103 | ; Definition file for the DLL version of the $name library from OpenSSL |
232 | ; | 1104 | ; |
233 | 1105 | ||
234 | LIBRARY $name | 1106 | LIBRARY $name |
235 | 1107 | ||
236 | DESCRIPTION 'SSLeay $name - eay\@cryptsoft.com' | 1108 | DESCRIPTION 'OpenSSL $name - http://www.openssl.org/' |
237 | 1109 | ||
238 | EOF | 1110 | EOF |
239 | 1111 | ||
240 | if (!$NT) | 1112 | if (!$W32) { |
241 | { | ||
242 | print <<"EOF"; | 1113 | print <<"EOF"; |
243 | CODE PRELOAD MOVEABLE | 1114 | CODE PRELOAD MOVEABLE |
244 | DATA PRELOAD MOVEABLE SINGLE | 1115 | DATA PRELOAD MOVEABLE SINGLE |
@@ -249,44 +1120,219 @@ HEAPSIZE 4096 | |||
249 | STACKSIZE 8192 | 1120 | STACKSIZE 8192 |
250 | 1121 | ||
251 | EOF | 1122 | EOF |
252 | } | 1123 | } |
253 | 1124 | ||
254 | print "EXPORTS\n"; | 1125 | print "EXPORTS\n"; |
255 | 1126 | ||
1127 | (@e)=grep(/^SSLeay(\{[0-9]+\})?\\.*?:.*?:FUNCTION/,@symbols); | ||
1128 | (@r)=grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:FUNCTION/ && !/^SSLeay(\{[0-9]+\})?\\.*?:.*?:FUNCTION/,@symbols); | ||
1129 | (@v)=grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:VARIABLE/,@symbols); | ||
1130 | @symbols=((sort @e),(sort @r), (sort @v)); | ||
256 | 1131 | ||
257 | (@e)=grep(/^SSLeay/,@functions); | ||
258 | (@r)=grep(!/^SSLeay/,@functions); | ||
259 | @functions=((sort @e),(sort @r)); | ||
260 | 1132 | ||
261 | foreach $func (@functions) | 1133 | foreach $sym (@symbols) { |
262 | { | 1134 | (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/; |
263 | if (!defined($nums{$func})) | 1135 | my $v = 0; |
264 | { | 1136 | $v = 1 if $i =~ /^.*?:.*?:VARIABLE/; |
265 | printf STDERR "$func does not have a number assigned\n"; | 1137 | if (!defined($nums{$s})) { |
266 | } | 1138 | printf STDERR "Warning: $s does not have a number assigned\n" |
267 | else | 1139 | if(!$do_update); |
268 | { | 1140 | } else { |
269 | $n=$nums{$func}; | 1141 | (my $n, my $dummy) = split /\\/, $nums{$s}; |
270 | printf OUT " %s%-35s@%d\n",($NT)?"":"_",$func,$n; | 1142 | my %pf = (); |
1143 | my $p = ($i =~ /^[^:]*:([^:]*):/,$1); | ||
1144 | my $a = ($i =~ /^[^:]*:[^:]*:[^:]*:([^:]*)/,$1); | ||
1145 | if (is_valid($p,1) && is_valid($a,0)) { | ||
1146 | my $s2 = ($s =~ /^(.*?)(\{[0-9]+\})?$/, $1); | ||
1147 | if ($prev eq $s2) { | ||
1148 | print STDERR "Warning: Symbol '",$s2,"' redefined. old=",($nums{$prev} =~ /^(.*?)\\/,$1),", new=",($nums{$s2} =~ /^(.*?)\\/,$1),"\n"; | ||
1149 | } | ||
1150 | $prev = $s2; # To warn about duplicates... | ||
1151 | if($v) { | ||
1152 | printf OUT " %s%-39s @%-8d DATA\n",($W32)?"":"_",$s2,$n; | ||
1153 | } else { | ||
1154 | printf OUT " %s%-39s @%d\n",($W32)?"":"_",$s2,$n; | ||
1155 | } | ||
271 | } | 1156 | } |
272 | } | 1157 | } |
273 | printf OUT "\n"; | ||
274 | } | 1158 | } |
1159 | printf OUT "\n"; | ||
1160 | } | ||
275 | 1161 | ||
276 | sub load_numbers | 1162 | sub load_numbers |
277 | { | 1163 | { |
278 | local($name)=@_; | 1164 | my($name)=@_; |
279 | local($j,@a,%ret); | 1165 | my(@a,%ret); |
1166 | |||
1167 | $max_num = 0; | ||
1168 | $num_noinfo = 0; | ||
1169 | $prev = ""; | ||
1170 | $prev_cnt = 0; | ||
280 | 1171 | ||
281 | open(IN,"<$name") || die "unable to open $name:$!\n"; | 1172 | open(IN,"<$name") || die "unable to open $name:$!\n"; |
282 | while (<IN>) | 1173 | while (<IN>) { |
283 | { | ||
284 | chop; | 1174 | chop; |
285 | s/#.*$//; | 1175 | s/#.*$//; |
286 | next if /^\s*$/; | 1176 | next if /^\s*$/; |
287 | @a=split; | 1177 | @a=split; |
288 | $ret{$a[0]}=$a[1]; | 1178 | if (defined $ret{$a[0]}) { |
1179 | # This is actually perfectly OK | ||
1180 | #print STDERR "Warning: Symbol '",$a[0],"' redefined. old=",$ret{$a[0]},", new=",$a[1],"\n"; | ||
289 | } | 1181 | } |
1182 | if ($max_num > $a[1]) { | ||
1183 | print STDERR "Warning: Number decreased from ",$max_num," to ",$a[1],"\n"; | ||
1184 | } | ||
1185 | elsif ($max_num == $a[1]) { | ||
1186 | # This is actually perfectly OK | ||
1187 | #print STDERR "Warning: Symbol ",$a[0]," has same number as previous ",$prev,": ",$a[1],"\n"; | ||
1188 | if ($a[0] eq $prev) { | ||
1189 | $prev_cnt++; | ||
1190 | $a[0] .= "{$prev_cnt}"; | ||
1191 | } | ||
1192 | } | ||
1193 | else { | ||
1194 | $prev_cnt = 0; | ||
1195 | } | ||
1196 | if ($#a < 2) { | ||
1197 | # Existence will be proven later, in do_defs | ||
1198 | $ret{$a[0]}=$a[1]; | ||
1199 | $num_noinfo++; | ||
1200 | } else { | ||
1201 | $ret{$a[0]}=$a[1]."\\".$a[2]; # \\ is a special marker | ||
1202 | } | ||
1203 | $max_num = $a[1] if $a[1] > $max_num; | ||
1204 | $prev=$a[0]; | ||
1205 | } | ||
1206 | if ($num_noinfo) { | ||
1207 | print STDERR "Warning: $num_noinfo symbols were without info."; | ||
1208 | if ($do_rewrite) { | ||
1209 | printf STDERR " The rewrite will fix this.\n"; | ||
1210 | } else { | ||
1211 | printf STDERR " You should do a rewrite to fix this.\n"; | ||
1212 | } | ||
1213 | } | ||
290 | close(IN); | 1214 | close(IN); |
291 | return(%ret); | 1215 | return(%ret); |
1216 | } | ||
1217 | |||
1218 | sub parse_number | ||
1219 | { | ||
1220 | (my $str, my $what) = @_; | ||
1221 | (my $n, my $i) = split(/\\/,$str); | ||
1222 | if ($what eq "n") { | ||
1223 | return $n; | ||
1224 | } else { | ||
1225 | return $i; | ||
1226 | } | ||
1227 | } | ||
1228 | |||
1229 | sub rewrite_numbers | ||
1230 | { | ||
1231 | (*OUT,$name,*nums,@symbols)=@_; | ||
1232 | my $thing; | ||
1233 | |||
1234 | print STDERR "Rewriting $name\n"; | ||
1235 | |||
1236 | my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols); | ||
1237 | my $r; my %r; my %rsyms; | ||
1238 | foreach $r (@r) { | ||
1239 | (my $s, my $i) = split /\\/, $r; | ||
1240 | my $a = $1 if $i =~ /^.*?:.*?:\w+\((\w+)\)/; | ||
1241 | $i =~ s/^(.*?:.*?:\w+)\(\w+\)/$1/; | ||
1242 | $r{$a} = $s."\\".$i; | ||
1243 | $rsyms{$s} = 1; | ||
1244 | } | ||
1245 | |||
1246 | my %syms = (); | ||
1247 | foreach $_ (@symbols) { | ||
1248 | (my $n, my $i) = split /\\/; | ||
1249 | $syms{$n} = 1; | ||
1250 | } | ||
1251 | |||
1252 | my @s=sort { | ||
1253 | &parse_number($nums{$a},"n") <=> &parse_number($nums{$b},"n") | ||
1254 | || $a cmp $b | ||
1255 | } keys %nums; | ||
1256 | foreach $sym (@s) { | ||
1257 | (my $n, my $i) = split /\\/, $nums{$sym}; | ||
1258 | next if defined($i) && $i =~ /^.*?:.*?:\w+\(\w+\)/; | ||
1259 | next if defined($rsyms{$sym}); | ||
1260 | print STDERR "DEBUG: rewrite_numbers for sym = ",$sym,": i = ",$i,", n = ",$n,", rsym{sym} = ",$rsyms{$sym},"syms{sym} = ",$syms{$sym},"\n" if $debug; | ||
1261 | $i="NOEXIST::FUNCTION:" | ||
1262 | if !defined($i) || $i eq "" || !defined($syms{$sym}); | ||
1263 | my $s2 = $sym; | ||
1264 | $s2 =~ s/\{[0-9]+\}$//; | ||
1265 | printf OUT "%s%-39s %d\t%s\n","",$s2,$n,$i; | ||
1266 | if (exists $r{$sym}) { | ||
1267 | (my $s, $i) = split /\\/,$r{$sym}; | ||
1268 | my $s2 = $s; | ||
1269 | $s2 =~ s/\{[0-9]+\}$//; | ||
1270 | printf OUT "%s%-39s %d\t%s\n","",$s2,$n,$i; | ||
1271 | } | ||
1272 | } | ||
1273 | } | ||
1274 | |||
1275 | sub update_numbers | ||
1276 | { | ||
1277 | (*OUT,$name,*nums,my $start_num, my @symbols)=@_; | ||
1278 | my $new_syms = 0; | ||
1279 | |||
1280 | print STDERR "Updating $name numbers\n"; | ||
1281 | |||
1282 | my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols); | ||
1283 | my $r; my %r; my %rsyms; | ||
1284 | foreach $r (@r) { | ||
1285 | (my $s, my $i) = split /\\/, $r; | ||
1286 | my $a = $1 if $i =~ /^.*?:.*?:\w+\((\w+)\)/; | ||
1287 | $i =~ s/^(.*?:.*?:\w+)\(\w+\)/$1/; | ||
1288 | $r{$a} = $s."\\".$i; | ||
1289 | $rsyms{$s} = 1; | ||
292 | } | 1290 | } |
1291 | |||
1292 | foreach $sym (@symbols) { | ||
1293 | (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/; | ||
1294 | next if $i =~ /^.*?:.*?:\w+\(\w+\)/; | ||
1295 | next if defined($rsyms{$sym}); | ||
1296 | die "ERROR: Symbol $sym had no info attached to it." | ||
1297 | if $i eq ""; | ||
1298 | if (!exists $nums{$s}) { | ||
1299 | $new_syms++; | ||
1300 | my $s2 = $s; | ||
1301 | $s2 =~ s/\{[0-9]+\}$//; | ||
1302 | printf OUT "%s%-39s %d\t%s\n","",$s2, ++$start_num,$i; | ||
1303 | if (exists $r{$s}) { | ||
1304 | ($s, $i) = split /\\/,$r{$s}; | ||
1305 | $s =~ s/\{[0-9]+\}$//; | ||
1306 | printf OUT "%s%-39s %d\t%s\n","",$s, $start_num,$i; | ||
1307 | } | ||
1308 | } | ||
1309 | } | ||
1310 | if($new_syms) { | ||
1311 | print STDERR "$new_syms New symbols added\n"; | ||
1312 | } else { | ||
1313 | print STDERR "No New symbols Added\n"; | ||
1314 | } | ||
1315 | } | ||
1316 | |||
1317 | sub check_existing | ||
1318 | { | ||
1319 | (*nums, my @symbols)=@_; | ||
1320 | my %existing; my @remaining; | ||
1321 | @remaining=(); | ||
1322 | foreach $sym (@symbols) { | ||
1323 | (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/; | ||
1324 | $existing{$s}=1; | ||
1325 | } | ||
1326 | foreach $sym (keys %nums) { | ||
1327 | if (!exists $existing{$sym}) { | ||
1328 | push @remaining, $sym; | ||
1329 | } | ||
1330 | } | ||
1331 | if(@remaining) { | ||
1332 | print STDERR "The following symbols do not seem to exist:\n"; | ||
1333 | foreach $sym (@remaining) { | ||
1334 | print STDERR "\t",$sym,"\n"; | ||
1335 | } | ||
1336 | } | ||
1337 | } | ||
1338 | |||