comparison Makefile.in @ 1610:96e4c9b2cc00 coverity

merge coverity
author Matt Johnston <matt@ucc.asn.au>
date Wed, 21 Mar 2018 00:52:02 +0800
parents b794d277c6da
children b59623a64678 76189c9ffea2
comparison
equal deleted inserted replaced
1580:7f2be495dff6 1610:96e4c9b2cc00
68 68
69 dropbearobjs=$(allobjs) svr-main.o 69 dropbearobjs=$(allobjs) svr-main.o
70 dbclientobjs=$(allobjs) cli-main.o 70 dbclientobjs=$(allobjs) cli-main.o
71 dropbearkeyobjs=$(allobjs) $(KEYOBJS) 71 dropbearkeyobjs=$(allobjs) $(KEYOBJS)
72 dropbearconvertobjs=$(allobjs) $(CONVERTOBJS) 72 dropbearconvertobjs=$(allobjs) $(CONVERTOBJS)
73 # CXX only set when fuzzing
74 CXX=@CXX@
73 else 75 else
74 dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) 76 dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
75 dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) 77 dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
76 dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) 78 dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
77 dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) 79 dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
251 -rm -f *~ *.gcov */*~ 253 -rm -f *~ *.gcov */*~
252 254
253 ## Fuzzing targets 255 ## Fuzzing targets
254 256
255 # list of fuzz targets 257 # list of fuzz targets
256 FUZZ_TARGETS=fuzzer-preauth fuzzer-pubkey fuzzer-verify fuzzer-preauth_nomaths 258 FUZZ_TARGETS=fuzzer-preauth fuzzer-pubkey fuzzer-verify fuzzer-preauth_nomaths fuzzer-kexdh fuzzer-kexecdh
257 259
258 FUZZER_OPTIONS = $(addsuffix .options, $(FUZZ_TARGETS)) 260 FUZZER_OPTIONS = $(addsuffix .options, $(FUZZ_TARGETS))
259 261
260 list-fuzz-targets: 262 list-fuzz-targets:
261 @echo $(FUZZ_TARGETS) 263 @echo $(FUZZ_TARGETS)
266 268
267 # exclude svr-main.o to avoid duplicate main 269 # exclude svr-main.o to avoid duplicate main
268 svrfuzzobjs=$(subst svr-main.o, ,$(dropbearobjs)) 270 svrfuzzobjs=$(subst svr-main.o, ,$(dropbearobjs))
269 271
270 # build all the fuzzers. This will require fail to link unless built with 272 # build all the fuzzers. This will require fail to link unless built with
271 # make fuzz-targetsk FUZZLIB=-lFuzzer.a 273 # make fuzz-targets FUZZLIB=-lFuzzer.a
272 # or similar - the library provides main(). 274 # or similar - the library provides main().
273 fuzz-targets: $(FUZZ_TARGETS) $(FUZZER_OPTIONS) 275 fuzz-targets: $(FUZZ_TARGETS) $(FUZZER_OPTIONS)
274 276
275 fuzzer-preauth: fuzzer-preauth.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs) 277 fuzzer-preauth: fuzzer-preauth.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs)
276 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@ 278 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@
277 279
278 fuzzer-preauth_nomaths: fuzzer-preauth_nomaths.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs) 280 fuzzer-preauth_nomaths: fuzzer-preauth_nomaths.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs)
279 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@ 281 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@
280 282
281
282 fuzzer-pubkey: fuzzer-pubkey.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs) 283 fuzzer-pubkey: fuzzer-pubkey.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs)
283 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@ 284 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@
284 285
285 fuzzer-verify: fuzzer-verify.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs) 286 fuzzer-verify: fuzzer-verify.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs)
287 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@
288
289 fuzzer-kexdh: fuzzer-kexdh.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs)
290 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@
291
292 fuzzer-kexecdh: fuzzer-kexecdh.o $(HEADERS) $(LIBTOM_DEPS) Makefile $(svrfuzzobjs)
286 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@ 293 $(CXX) $(CXXFLAGS) [email protected] $(LDFLAGS) $(svrfuzzobjs) -o $@$(EXEEXT) $(LIBTOM_LIBS) $(LIBS) $(FUZZLIB) @CRYPTLIB@
287 294
288 fuzzer-%.options: Makefile 295 fuzzer-%.options: Makefile
289 echo "[libfuzzer]" > $@ 296 echo "[libfuzzer]" > $@
290 echo "max_len = 50000" >> $@ 297 echo "max_len = 50000" >> $@