comparison configure.ac @ 1733:d529a52b2f7c coverity coverity

merge coverity from main
author Matt Johnston <matt@ucc.asn.au>
date Fri, 26 Jun 2020 21:07:34 +0800
parents a139fe25f919
children d5680e12ac33
comparison
equal deleted inserted replaced
1643:b59623a64678 1733:d529a52b2f7c
321 AC_CHECK_HEADERS([shadow.h]) 321 AC_CHECK_HEADERS([shadow.h])
322 AC_MSG_NOTICE(Using shadow passwords if available) 322 AC_MSG_NOTICE(Using shadow passwords if available)
323 ] 323 ]
324 ) 324 )
325 325
326 AC_ARG_ENABLE(plugin,
327 [ --enable-plugin Enable support for External Public Key Authentication plug-in],
328 [
329 AC_DEFINE(DROPBEAR_PLUGIN, 1, External Public Key Authentication)
330 AC_MSG_NOTICE(Enabling support for External Public Key Authentication)
331 DROPBEAR_PLUGIN=1
332 ],
333 [
334 AC_DEFINE(DROPBEAR_PLUGIN, 0, External Public Key Authentication)
335 DROPBEAR_PLUGIN=0
336 ]
337
338 )
339 AC_SUBST(DROPBEAR_PLUGIN)
340
326 AC_ARG_ENABLE(fuzz, 341 AC_ARG_ENABLE(fuzz,
327 [ --enable-fuzz Build fuzzing. Not recommended for deployment.], 342 [ --enable-fuzz Build fuzzing. Not recommended for deployment.],
328 [ 343 [
329 AC_DEFINE(DROPBEAR_FUZZ, 1, Fuzzing) 344 if test "x$enableval" = "xyes"; then
330 AC_MSG_NOTICE(Enabling fuzzing) 345 AC_DEFINE(DROPBEAR_FUZZ, 1, Fuzzing)
331 DROPBEAR_FUZZ=1 346 AC_MSG_NOTICE(Enabling fuzzing)
332 # libfuzzer needs linking with c++ libraries 347 DROPBEAR_FUZZ=1
333 AC_PROG_CXX 348 # libfuzzer needs linking with c++ libraries
349 AC_PROG_CXX
350 else
351 AC_DEFINE(DROPBEAR_FUZZ, 0, Fuzzing)
352 AC_MSG_NOTICE(Disabling fuzzing)
353 DROPBEAR_FUZZ=0
354 fi
334 ], 355 ],
335 [ 356 [
336 AC_DEFINE(DROPBEAR_FUZZ, 0, Fuzzing) 357 AC_DEFINE(DROPBEAR_FUZZ, 0, Fuzzing)
358 AC_MSG_NOTICE(Disabling fuzzing)
337 DROPBEAR_FUZZ=0 359 DROPBEAR_FUZZ=0
338 ] 360 ]
339 361
340 ) 362 )
341 AC_SUBST(DROPBEAR_FUZZ) 363 AC_SUBST(DROPBEAR_FUZZ)
346 AC_HEADER_SYS_WAIT 368 AC_HEADER_SYS_WAIT
347 AC_CHECK_HEADERS([netinet/in.h netinet/tcp.h \ 369 AC_CHECK_HEADERS([netinet/in.h netinet/tcp.h \
348 crypt.h \ 370 crypt.h \
349 pty.h libutil.h libgen.h inttypes.h stropts.h utmp.h \ 371 pty.h libutil.h libgen.h inttypes.h stropts.h utmp.h \
350 utmpx.h lastlog.h paths.h util.h netdb.h security/pam_appl.h \ 372 utmpx.h lastlog.h paths.h util.h netdb.h security/pam_appl.h \
351 pam/pam_appl.h netinet/in_systm.h sys/uio.h linux/pkt_sched.h]) 373 pam/pam_appl.h netinet/in_systm.h sys/uio.h linux/pkt_sched.h \
374 sys/random.h])
352 375
353 # Checks for typedefs, structures, and compiler characteristics. 376 # Checks for typedefs, structures, and compiler characteristics.
354 AC_C_CONST 377 AC_C_CONST
355 AC_TYPE_UID_T 378 AC_TYPE_UID_T
356 AC_TYPE_MODE_T 379 AC_TYPE_MODE_T
502 525
503 # OS X monotonic time 526 # OS X monotonic time
504 AC_CHECK_HEADERS([mach/mach_time.h]) 527 AC_CHECK_HEADERS([mach/mach_time.h])
505 AC_CHECK_FUNCS(mach_absolute_time) 528 AC_CHECK_FUNCS(mach_absolute_time)
506 529
507 AC_CHECK_FUNCS(explicit_bzero memset_s) 530 AC_CHECK_FUNCS(explicit_bzero memset_s getrandom)
508 531
509 AC_ARG_ENABLE(bundled-libtom, 532 AC_ARG_ENABLE(bundled-libtom,
510 [ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. 533 [ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists.
511 --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. 534 --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist.
512 Default is to use system if available, otherwise bundled.], 535 Default is to use system if available, otherwise bundled.
536 Dropbear requires system libtommath >= 1.2.0 and libtomcrypt >= 1.18.0],
513 [ 537 [
514 if test "x$enableval" = "xyes"; then 538 if test "x$enableval" = "xyes"; then
515 BUNDLED_LIBTOM=1 539 BUNDLED_LIBTOM=1
516 AC_MSG_NOTICE(Forcing bundled libtom*) 540 AC_MSG_NOTICE(Forcing bundled libtom*)
517 else 541 else
518 BUNDLED_LIBTOM=0 542 BUNDLED_LIBTOM=0
519 AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", 543 AC_CHECK_LIB(tommath, mp_to_ubin, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS",
520 [AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom was specified])] ) 544 [AC_MSG_ERROR([Missing/old system libtommath and --disable-bundled-libtom was specified])] )
521 AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", 545 AC_CHECK_LIB(tomcrypt, poly1305_init, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS",
522 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) 546 [AC_MSG_ERROR([Missing/old system libtomcrypt and --disable-bundled-libtom was specified])] )
523 fi 547 fi
524 ], 548 ],
525 [ 549 [
526 BUNDLED_LIBTOM=0 550 BUNDLED_LIBTOM=0
527 AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1) 551 AC_CHECK_LIB(tommath, mp_to_ubin, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1)
528 AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1) 552 AC_CHECK_LIB(tomcrypt, poly1305_init, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1)
529 ] 553 ]
530 ) 554 )
531 555
532 if test $BUNDLED_LIBTOM = 1 ; then 556 if test $BUNDLED_LIBTOM = 1 ; then
533 AC_DEFINE(BUNDLED_LIBTOM,1,Use bundled libtom) 557 AC_DEFINE(BUNDLED_LIBTOM,1,Use bundled libtom)
856 AC_MSG_NOTICE() 880 AC_MSG_NOTICE()
857 AC_MSG_NOTICE([crypt() not available, dropbear server will not have password authentication]) 881 AC_MSG_NOTICE([crypt() not available, dropbear server will not have password authentication])
858 fi 882 fi
859 883
860 AC_MSG_NOTICE() 884 AC_MSG_NOTICE()
861 AC_MSG_NOTICE([Now edit options.h to choose features.]) 885 AC_MSG_NOTICE([Now edit localoptions.h to choose features.])