[pkgsrc/pkgsrc-2017Q1]: pkgsrc/security/dropbear Pullup ticket #5468 - reques...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee2194cafc1f
branches:  pkgsrc-2017Q1
changeset: 360386:ee2194cafc1f
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 29 18:21:24 2017 +0000

description:
Pullup ticket #5468 - requested by sevan
security/dropbear: security fix

Revisions pulled up:
- security/dropbear/Makefile                                    1.32
- security/dropbear/distinfo                                    1.24
- security/dropbear/patches/patch-aa                            1.11
- security/dropbear/patches/patch-ab                            1.9
- security/dropbear/patches/patch-configure                     1.1

---
   Module Name:    pkgsrc
   Committed By:   snj
   Date:           Tue May 16 21:54:21 UTC 2017

   Modified Files:
           pkgsrc/security/dropbear: Makefile distinfo
           pkgsrc/security/dropbear/patches: patch-aa patch-ab
   Added Files:
           pkgsrc/security/dropbear/patches: patch-configure

   Log Message:
   update dropbear to 2016.74.  changes:

   2016.74 - 21 July 2016

   - Security: Message printout was vulnerable to format string injection.

     If specific usernames including "%" symbols can be created on a system
     (validated by getpwnam()) then an attacker could run arbitrary code as
   root
     when connecting to Dropbear server.

     A dbclient user who can control username or host arguments could
   potentially
     run arbitrary code as the dbclient user. This could be a problem if
   scripts
     or webpages pass untrusted input to the dbclient program.
     CVE-2016-7406
     https://secure.ucc.asn.au/hg/dropbear/rev/b66a483f3dcb

   - Security: dropbearconvert import of OpenSSH keys could run arbitrary
   code as
     the local dropbearconvert user when parsing malicious key files
     CVE-2016-7407
     https://secure.ucc.asn.au/hg/dropbear/rev/34e6127ef02e

   - Security: dbclient could run arbitrary code as the local dbclient user if
     particular -m or -c arguments are provided. This could be an issue where
     dbclient is used in scripts.
     CVE-2016-7408
     https://secure.ucc.asn.au/hg/dropbear/rev/eed9376a4ad6

   - Security: dbclient or dropbear server could expose process memory to the
     running user if compiled with DEBUG_TRACE and running with -v
     CVE-2016-7409
     https://secure.ucc.asn.au/hg/dropbear/rev/6a14b1f6dc04

     The security issues were reported by an anonymous researcher working with
     Beyond Security's SecuriTeam Secure Disclosure
   www.beyondsecurity.com/ssd.html

   - Fix port forwarding failure when connecting to domains that have both
     IPv4 and IPv6 addresses. The bug was introduced in 2015.68

   - Fix 100% CPU use while waiting for rekey to complete. Thanks to Zhang
   Hui P
     for the patch

   2016.73 - 18 March 2016

   - Support syslog in dbclient, option -o usesyslog=yes. Patch from
   Konstantin Tokarev

   - Kill a proxycommand when dbclient exits, patch from Konstantin Tokarev

   - Option to exit when a TCP forward fails, patch from Konstantin Tokarev

   - New "-o" option parsing from Konstantin Tokarev. This allows handling
   some extra options
     in the style of OpenSSH, though implementing all OpenSSH options is
   not planned.

   - Fix crash when fallback initshells() is used, reported by Michael
   Nowak and Mike Tzou

   - Allow specifying commands eg "dropbearmulti dbclient ..." instead of
   symlinks

   - Various cleanups for issues found by a lint tool, patch from Francois
   Perrad

   - Fix tab indent consistency, patch from Francois Perrad

   - Fix issues found by cppcheck, reported by Mike Tzou

   - Use system memset_s() or explicit_bzero() if available to clear
   memory. Also make
     libtomcrypt/libtommath routines use that (or Dropbear's own m_burn()).

   - Prevent scp failing when the local user doesn't exist. Based on patch
   from Michael Witten.

   - Improved Travis CI test running, thanks to Mike Tzou

   - Improve some code that was flagged by Coverity and Fortify Static Code
   Analyzer

   2016.72 - 9 March 2016

   - Validate X11 forwarding input. Could allow bypass of authorized_keys
   command= restrictions,
     found by github.com/tintinweb. Thanks for Damien Miller for a patch.
   CVE-2016-3116
     https://secure.ucc.asn.au/hg/dropbear/rev/a3e8389e01ff

   2015.71 - 3 December 2015

   - Fix "bad buf_incrpos" when data is transferred, broke in 2015.69

   - Fix crash on exit when -p address:port is used, broke in 2015.68,
   thanks to
     Frank Stollenwerk for reporting and investigation

   - Fix building with only ENABLE_CLI_REMOTETCPFWD given, patch from
   Konstantin Tokarev

   - Fix bad configure script test which didn't work with dash shell, patch
   from Juergen Daubert,
     broke in 2015.70

   - Fix server race condition that could cause sessions to hang on exit,
     https://github.com/robotframework/SSHLibrary/issues/128

   2015.70 - 26 November 2015

   - Fix server password authentication on Linux, broke in 2015.69

   2015.69 - 25 November 2015

   - Fix crash when forwarded TCP connections fail to connect (bug
   introduced in 2015.68)

   - Avoid hang on session close when multiple sessions are started,
   affects Qt Creator
     Patch from Andrzej Szombierski

   - Reduce per-channel memory consumption in common case, increase default
     channel limit from 100 to 1000 which should improve SOCKS forwarding
   for modern
     webpages

   - Handle multiple command line arguments in a single flag, thanks to
   Guilhem Moulin

   - Manpage improvements from Guilhem Moulin

   - Build fixes for Android from Mike Frysinger

   - Don't display the MOTD when an explicit command is run from Guilhem Moulin

   - Check curve25519 shared secret isn't zero

   2015.68 - Saturday 8 August 2015

   - Reduce local data copying for improved efficiency. Measured 30%
     increase in throughput for connections to localhost

   - Forwarded TCP ports connect asynchronously and try all available addresses
     (IPv4, IPv6, round robin DNS)

   - Fix all compile warnings, many patches from Ga?l Portay
     Note that configure with -Werror may not be successful on some
   platforms (OS X)
     and some configuration options may still result in unused variable
     warnings.

   - Use TCP Fast Open on Linux if available. Saves a round trip at connection
     to hosts that have previously been connected.
     Needs a recent Linux kernel and possibly "sysctl -w
   net.ipv4.tcp_fastopen=3"
     Client side is disabled by default pending further compatibility testing
     with networks and systems.

   - Increase maximum command length to 9000 bytes

   - Free memory before exiting, patch from Thorsten Horstmann. Useful for
     Dropbear ports to embedded systems and for checking memory leaks
     with valgrind. Only partially implemented for dbclient.
     This is disabled by default, enable with DROPBEAR_CLEANUP in sysoptions.h

   - DROPBEAR_DEFAULT_CLI_AUTHKEY setting now always prepends home
   directory unless
     there is a leading slash (~ isn't treated specially)

   - Fix small ECC memory leaks

   - Tighten validation of Diffie-Hellman parameters, from Florent Daigniere of
     Matta Consulting. Odds of bad values are around 2**-512 -- improbable.

   - Twofish-ctr cipher is supported though disabled by default

   - Fix pre-authentication timeout when waiting for client SSH-2.0 banner,
   thanks
     to CL Ouyang

   - Fix null pointer crash with restrictions in authorized_keys without a
   command, patch from
     Guilhem Moulin

   - Ensure authentication timeout is handled while reading the initial banner,
     thanks to CL Ouyang for finding it.

   - Fix null pointer crash when handling bad ECC keys. Found by afl-fuzz

   2015.67 - Wednesday 28 January 2015

   - Call fsync() after generating private keys to ensure they aren't lost if a
     reboot occurs. Thanks to Peter Korsgaard

   - Disable non-delayed zlib compression by default on the server. Can be
     enabled if required for old clients with DROPBEAR_SERVER_DELAY_ZLIB

   - Default client key path ~/.ssh/id_dropbear

   - Prefer stronger algorithms by default, from Fedor Brunner.
     AES256 over 3DES
     Diffie-hellman group14 over group1

   - Add option to disable CBC ciphers.

   - Disable twofish in default options.h

   - Enable sha2 HMAC algorithms by default, the code was already required
     for ECC key exchange. sha1 is the first preference still for performance.

   - Fix installing dropbear.8 in a separate build directory, from Like Ma

   - Allow configure to succeed if libtomcrypt/libtommath are missing, from
   Elan Ruusam?e

   - Don't crash if ssh-agent provides an unknown type of key. From Catalin
   Patulea

   - Minor bug fixes, a few issues found by Coverity scan

   2014.66 - Thursday 23 October 2014

   - Use the same keepalive handling behaviour as OpenSSH. This will work
   better
     with some SSH implementations that have different behaviour with unknown
     message types.

   - Don't reply with SSH_MSG_UNIMPLEMENTED when we receive a reply to our own
     keepalive message

   - Set $SSH_CLIENT to keep bash happy, patch from Ryan Cleere

   - Fix wtmp which broke since 2013.62, patch from Whoopie

   2014.65 - Friday 8 August 2014

   - Fix 2014.64 regression, server session hang on exit with scp (and probably
     others), thanks to NiLuJe for tracking it down

   - Fix 2014.64 regression, clock_gettime() error handling which broke on
   older
     Linux kernels, reported by NiLuJe

   - Fix 2014.64 regression, writev() could occassionally fail with EAGAIN
   which
     wasn't caught

   - Avoid error message when trying to set QoS on proxycommand or multihop
   pipes

   - Use /usr/bin/xauth, thanks to Mike Frysinger

   - Don't exit the client if the local user entry can't be found, thanks
   to iquaba

   2014.64 - Sunday 27 July 2014

   - Fix compiling with ECDSA and DSS disabled

   - Don't exit abruptly if too many outgoing packets are queued for
   writev(). Patch
     thanks to Ronny Meeus

   - The -K keepalive option now behaves more like OpenSSH's
   "ServerAliveInterval".
     If no response is received after 3 keepalives then the session is
   terminated. This
     will close connections faster than waiting for a TCP timeout.

   - Rework TCP priority setting. New settings are
           if (connecting || ptys || x11) tos = LOWDELAY
           else if (tcp_forwards) tos = 0
           else tos = BULK
     Thanks to Catalin Patulea for the suggestion.

   - Improve handling of many concurrent new TCP forwarded connections,
   should now
     be able to handle as many as MAX_CHANNELS. Thanks to Eduardo Silva for
   reporting
     and investigating it.

   - Make sure that exit messages from the client are printed, regression
   in 2013.57

   - Use monotonic clock where available, timeouts won't be affected by
   system time
     changes

   - Add -V for version

   2014.63 - Wednesday 19 February 2014

   - Fix ~. to terminate a client interactive session after waking a laptop
     from sleep.

   - Changed port separator syntax again, now using host^port. This is because
     IPv6 link-local addresses use %. Reported by Gui Iribarren

   - Avoid constantly relinking dropbearmulti target, fix "make install"
     for multi target, thanks to Mike Frysinger

   - Avoid getting stuck in a loop writing huge key files, reported by Bruno
     Thomsen

   - Don't link dropbearkey or dropbearconvert to libz or libutil,
     thanks to Nicolas Boos

   - Fix linking -lcrypt on systems without /usr/lib, thanks to Nicolas Boos

   - Avoid crash on exit due to cleaned up keys before last packets are sent,
     debugged by Ronald Wahl

   - Fix a race condition in rekeying where Dropbear would exit if it
   received a
     still-in-flight packet after initiating rekeying. Reported by Oliver Metz.
     This is a longstanding bug but is triggered more easily since 2013.57

   - Fix README for ecdsa keys, from Catalin Patulea

   - Ensure that generated RSA keys are always exactly the length
     requested. Previously Dropbear always generated N+16 or N+15 bit keys.
     Thanks to Unit 193

   - Fix DROPBEAR_CLI_IMMEDIATE_AUTH mode which saves a network round trip
   if the
     first public key succeeds. Still not enabled by default, needs more
     compatibility testing with other implementations.

   - Fix for port 0 forwarding in the client and port forwarding with
   Apache MINA SSHD.

   - Fix for bad system linux/pkt-sched.h header file with older Linux
   kernels, from Steve Dover

   - Fix signal handlers so that errno is saved, thanks to Erik Ahl?n for a
   patch
     and Mark Wickham for independently spotting the same problem.

diffstat:

 security/dropbear/Makefile                |   8 +++---
 security/dropbear/distinfo                |  15 ++++++-----
 security/dropbear/patches/patch-aa        |  37 +++++++++++-------------------
 security/dropbear/patches/patch-ab        |  12 +++++-----
 security/dropbear/patches/patch-configure |  15 ++++++++++++
 5 files changed, 47 insertions(+), 40 deletions(-)

diffs (186 lines):

diff -r 60bb46f9e308 -r ee2194cafc1f security/dropbear/Makefile
--- a/security/dropbear/Makefile        Sun May 28 08:45:14 2017 +0000
+++ b/security/dropbear/Makefile        Mon May 29 18:21:24 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2014/03/14 22:40:17 agc Exp $
+# $NetBSD: Makefile,v 1.31.26.1 2017/05/29 18:21:24 bsiegert Exp $
 
-DISTNAME=      dropbear-2013.62
+DISTNAME=      dropbear-2016.74
 CATEGORIES=    security
 MASTER_SITES=  http://matt.ucc.asn.au/dropbear/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -11,7 +11,7 @@
 LICENSE=       modified-bsd
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q} --disable-bundled-libtom
 USE_TOOLS+=            gmake
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dropbear
@@ -39,7 +39,7 @@
 SUBST_SED.config=      -e "s,/etc/dropbear/,"${PKG_SYSCONFDIR:Q}"/dropbear/,g"
 
 # used by dbscp
-CPPFLAGS+=             -D_PATH_SSH_PROGRAM="\"${PREFIX}/bin/dbclient\""
+CPPFLAGS+=             -DDROPBEAR_PATH_SSH_PROGRAM="\"${PREFIX}/bin/dbclient\""
 
 .include "../../x11/xauth/builtin.mk"
 
diff -r 60bb46f9e308 -r ee2194cafc1f security/dropbear/distinfo
--- a/security/dropbear/distinfo        Sun May 28 08:45:14 2017 +0000
+++ b/security/dropbear/distinfo        Mon May 29 18:21:24 2017 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2015/11/04 01:17:44 agc Exp $
+$NetBSD: distinfo,v 1.23.12.1 2017/05/29 18:21:24 bsiegert Exp $
 
-SHA1 (dropbear-2013.62.tar.bz2) = 1d0abb6c46206a2c95b26a6f454844855f585403
-RMD160 (dropbear-2013.62.tar.bz2) = 0eff5a4caf353898d3f5d4518786b2ec2473554a
-SHA512 (dropbear-2013.62.tar.bz2) = 8811eae921333bbb242227c52d057a01d0536bf47d37b553834a2cd4730ab1693460a7b4eacfafc8a2c20cc1ac6a4b8c5cdb735e9dd069f9499e4144767fe37b
-Size (dropbear-2013.62.tar.bz2) = 1598084 bytes
-SHA1 (patch-aa) = d5cc422972ad8bf0dc016cd568d55f258f052ed0
-SHA1 (patch-ab) = 35d96409e8763b6e79533c1f05dce02924092c55
+SHA1 (dropbear-2016.74.tar.bz2) = 92483315a112c862667c3e90af854a52dab09a12
+RMD160 (dropbear-2016.74.tar.bz2) = ec0a5a45ce3f636ac25e8f1170aa75cc79cafe12
+SHA512 (dropbear-2016.74.tar.bz2) = c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22
+Size (dropbear-2016.74.tar.bz2) = 1622234 bytes
+SHA1 (patch-aa) = d23b69458c54933a4cafa6146ca2167c80453523
+SHA1 (patch-ab) = 8595e4c65d8aa78c8d34af70619ced02f807e77b
+SHA1 (patch-configure) = 95c82b951d16a5cca92a3d4d7ef67b7eb5f47540
diff -r 60bb46f9e308 -r ee2194cafc1f security/dropbear/patches/patch-aa
--- a/security/dropbear/patches/patch-aa        Sun May 28 08:45:14 2017 +0000
+++ b/security/dropbear/patches/patch-aa        Mon May 29 18:21:24 2017 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.10 2014/01/31 17:32:19 agc Exp $
+$NetBSD: patch-aa,v 1.10.26.1 2017/05/29 18:21:24 bsiegert Exp $
 
 use pkgsrc macros to install programs and man pages
 set up dropbear default key locations correctly
 
---- Makefile.in.orig   2013-12-03 05:39:15.000000000 -0800
-+++ Makefile.in        2014-01-29 16:14:08.000000000 -0800
-@@ -73,6 +73,7 @@
+--- Makefile.in.orig   2016-07-21 08:17:09.000000000 -0700
++++ Makefile.in        2017-05-16 14:04:51.556137923 -0700
+@@ -75,6 +75,7 @@ datarootdir = @datarootdir@
  bindir=@bindir@
  sbindir=@sbindir@
  mandir=@mandir@
@@ -13,7 +13,7 @@
  
  CC=@CC@
  AR=@AR@
-@@ -96,6 +97,9 @@
+@@ -98,6 +99,9 @@ ifneq (,$(strip $(foreach prog, $(PROGRA
        CFLAGS+= -DDROPBEAR_CLIENT
  endif
  
@@ -23,7 +23,7 @@
  
  # these are exported so that libtomcrypt's makefile will use them
  export CC
-@@ -125,31 +129,30 @@
+@@ -127,31 +131,30 @@ strip: $(TARGETS)
  install: $(addprefix inst_, $(TARGETS))
  
  insmultidropbear: dropbearmulti
@@ -32,9 +32,9 @@
        -rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
        -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
 -      $(INSTALL) -d $(DESTDIR)$(mandir)/man8
--      $(INSTALL) -m 644 dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
+-      $(INSTALL) -m 644 $(srcdir)/dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
 +      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
-+      $(BSD_INSTALL_MAN) dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
++      $(BSD_INSTALL_MAN) $(srcdir)/dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
  
  insmulti%: dropbearmulti
 -      $(INSTALL) -d $(DESTDIR)$(bindir)
@@ -42,22 +42,22 @@
 +      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
        -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
 -      $(INSTALL) -d $(DESTDIR)$(mandir)/man1
--      $(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
+-      if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
 +      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
-+      $(BSD_INSTALL_MAN) $*.1  $(DESTDIR)$(mandir)/man1/$*.1
++      if test -e $*.1; then $(BSD_INSTALL_MAN) $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
  
- # dropbear should go in sbin, so it needs a seperate rule
+ # dropbear should go in sbin, so it needs a separate rule
  inst_dropbear: dropbear
 -      $(INSTALL) -d $(DESTDIR)$(sbindir)
 -      $(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
 -      $(INSTALL) -d $(DESTDIR)$(mandir)/man8
--      $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
+-      $(INSTALL) -m 644 $(srcdir)/dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
 +      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(sbindir)
 +      $(BSD_INSTALL_PROGRAM) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
 +      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man8
-+      $(BSD_INSTALL_MAN) dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
++      $(BSD_INSTALL_MAN) $(srcdir)/dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
  
- inst_%: $*
+ inst_%: %
 -      $(INSTALL) -d $(DESTDIR)$(bindir)
 -      $(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
 -      $(INSTALL) -d $(DESTDIR)$(mandir)/man1
@@ -69,12 +69,3 @@
  
  inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) 
  
-@@ -187,7 +190,7 @@
-       -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT)
- 
- $(LTC): options.h
--      cd libtomcrypt && $(MAKE)
-+      cd libtomcrypt && $(MAKE) clean && $(MAKE)
- 
- $(LTM): options.h
-       cd libtommath && $(MAKE)
diff -r 60bb46f9e308 -r ee2194cafc1f security/dropbear/patches/patch-ab
--- a/security/dropbear/patches/patch-ab        Sun May 28 08:45:14 2017 +0000
+++ b/security/dropbear/patches/patch-ab        Mon May 29 18:21:24 2017 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.8 2014/01/31 17:32:19 agc Exp $
+$NetBSD: patch-ab,v 1.8.26.1 2017/05/29 18:21:24 bsiegert Exp $
 
 comment out the path to the dropbear ssh client
 - this is passed through CFLAGS
 
---- options.h.orig     2009-08-26 13:15:07.000000000 -0700
-+++ options.h  2009-08-26 13:15:14.000000000 -0700
-@@ -232,7 +232,7 @@ etc) slower (perhaps by 50%). Recommende
+--- options.h.orig     2016-07-21 08:17:09.000000000 -0700
++++ options.h  2017-03-18 00:25:05.000000000 -0700
+@@ -305,7 +305,7 @@ Homedir is prepended unless path begins 
  
  /* This is used by the scp binary when used as a client binary. If you're
   * not using the Dropbear client, you'll need to change it */
--#define _PATH_SSH_PROGRAM "/usr/bin/dbclient"
-+/*#define _PATH_SSH_PROGRAM "/usr/bin/dbclient"*/
+-#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"
++/*#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"*/
  
  /* Whether to log commands executed by a client. This only logs the 
   * (single) command sent to the server, not what a user did in a 
diff -r 60bb46f9e308 -r ee2194cafc1f security/dropbear/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dropbear/patches/patch-configure Mon May 29 18:21:24 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1.2.2 2017/05/29 18:21:24 bsiegert Exp $
+
+this test for the system libtomcrypt needs -ltommath.
+
+--- configure.orig     2017-04-25 21:47:13.570580493 -0700
++++ configure  2017-04-25 21:47:30.336185297 -0700
+@@ -5963,7 +5963,7 @@ if ${ac_cv_lib_tomcrypt_register_cipher+
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltomcrypt  $LIBS"
++LIBS="-ltomcrypt -ltommath $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+