Mercurial > dropbear
comparison configure.ac @ 1694:39534eedf429
Mention libtom version requirements, check for poly1305 in libtomcrypt
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Wed, 27 May 2020 00:05:15 +0800 |
parents | 1051e4eea25a |
children | f966834f0f9c |
comparison
equal
deleted
inserted
replaced
1693:f9ad4d39e388 | 1694:39534eedf429 |
---|---|
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, | 326 AC_ARG_ENABLE(plugin, |
327 [ --enable-plugin Enable support for External Public Key Authentication plug-in], | 327 [ --enable-plugin Enable support for External Public Key Authentication plug-in], |
328 [ | 328 [ |
329 AC_DEFINE(DROPBEAR_PLUGIN, 1, External Public Key Authentication) | 329 AC_DEFINE(DROPBEAR_PLUGIN, 1, External Public Key Authentication) |
330 AC_MSG_NOTICE(Enabling support for External Public Key Authentication) | 330 AC_MSG_NOTICE(Enabling support for External Public Key Authentication) |
331 DROPBEAR_PLUGIN=1 | 331 DROPBEAR_PLUGIN=1 |
332 ], | 332 ], |
529 AC_CHECK_FUNCS(explicit_bzero memset_s) | 529 AC_CHECK_FUNCS(explicit_bzero memset_s) |
530 | 530 |
531 AC_ARG_ENABLE(bundled-libtom, | 531 AC_ARG_ENABLE(bundled-libtom, |
532 [ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. | 532 [ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. |
533 --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. | 533 --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. |
534 Default is to use system if available, otherwise bundled.], | 534 Default is to use system if available, otherwise bundled. |
535 Dropbear requires system libtommath >= 1.2.0 and libtomcrypt >= 1.18.0], | |
535 [ | 536 [ |
536 if test "x$enableval" = "xyes"; then | 537 if test "x$enableval" = "xyes"; then |
537 BUNDLED_LIBTOM=1 | 538 BUNDLED_LIBTOM=1 |
538 AC_MSG_NOTICE(Forcing bundled libtom*) | 539 AC_MSG_NOTICE(Forcing bundled libtom*) |
539 else | 540 else |
540 BUNDLED_LIBTOM=0 | 541 BUNDLED_LIBTOM=0 |
541 AC_CHECK_LIB(tommath, mp_to_ubin, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", | 542 AC_CHECK_LIB(tommath, mp_to_ubin, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", |
542 [AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom was specified])] ) | 543 [AC_MSG_ERROR([Missing/old system libtommath and --disable-bundled-libtom was specified])] ) |
543 AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", | 544 AC_CHECK_LIB(tomcrypt, poly1305_init, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", |
544 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) | 545 [AC_MSG_ERROR([Missing/old system libtomcrypt and --disable-bundled-libtom was specified])] ) |
545 fi | 546 fi |
546 ], | 547 ], |
547 [ | 548 [ |
548 BUNDLED_LIBTOM=0 | 549 BUNDLED_LIBTOM=0 |
549 AC_CHECK_LIB(tommath, mp_to_ubin, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1) | 550 AC_CHECK_LIB(tommath, mp_to_ubin, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1) |