Dropbear 2014.64

NiLuJe ninuje at gmail.com
Mon Jul 28 05:58:16 WST 2014


And a minor buildsystem tweak that I completely forgot to submit when
2014.63 came out, which broke building against external libtom* with recent
binutils versions (again ;)).

----


diff -Nuarp dropbear-2014.63-ori/configure.ac dropbear-2014.63/configure.ac
--- dropbear-2014.63-ori/configure.ac	2014-02-19 15:05:24.000000000 +0100
+++ dropbear-2014.63/configure.ac	2014-03-06 22:26:14.848926797 +0100
@@ -371,16 +371,16 @@ AC_ARG_ENABLE(bundled-libtom,
 			AC_MSG_NOTICE(Forcing bundled libtom*)
 		else
 			BUNDLED_LIBTOM=0
-			AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", 
-				[AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom
was specified])] )
 			AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS
-ltomcrypt", 
 				[AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom
was specified])] )
+			AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", 
+				[AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom
was specified])] )
 		fi
 	],
 	[
 		BUNDLED_LIBTOM=0
-		AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath",
BUNDLED_LIBTOM=1)
 		AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS
-ltomcrypt", BUNDLED_LIBTOM=1)
+		AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath",
BUNDLED_LIBTOM=1)
 	]
 )
 





More information about the Dropbear mailing list