From eeee1c7972e196c80a425461bd0543f8460d0cfb Mon Sep 17 00:00:00 2001 From: zrj Date: Wed, 17 Apr 2019 04:30:19 +0300 Subject: [PATCH] libtacplus: Decouple from libmd. Library is simple enough to not depend on librecrypto. Use MD5 hash internally and remove inter-lib dep. --- Makefile.inc1 | 2 +- lib/libtacplus/Makefile | 5 +---- lib/libtacplus/taclib.c | 8 +++++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 01360396ea..7a0df90612 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1037,7 +1037,7 @@ _generic_libs= gnu/lib _prebuild_libs+= lib/libcrypt lib/libmd \ lib/libncurses/libncurses -lib/libopie__L lib/libtacplus__L: lib/libmd__L +lib/libopie__L: lib/libmd__L _generic_libs+= lib diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile index fc3aeb8a2c..b1a29c5caf 100644 --- a/lib/libtacplus/Makefile +++ b/lib/libtacplus/Makefile @@ -28,11 +28,8 @@ LIB= tacplus SRCS= taclib.c INCS= taclib.h -# XXX sys/md5.h shim errata for bootstrap REMOVE_OPENSSL_FILES -CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv +CFLAGS+= -I${.CURDIR}/../omd -DPADD+= ${LIBMD} -LDADD+= -lmd SHLIB_MAJOR= 2 WARNS?= 2 MAN= libtacplus.3 tacplus.conf.5 diff --git a/lib/libtacplus/taclib.c b/lib/libtacplus/taclib.c index 9a556a856b..cb5fcefbe6 100644 --- a/lib/libtacplus/taclib.c +++ b/lib/libtacplus/taclib.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,13 @@ #include "taclib_private.h" +#define MD5Init _libtacplus_MD5Init +#define MD5Final _libtacplus_MD5Final +#define MD5Pad _libtacplus_MD5Pad +#define MD5Transform _libtacplus_MD5Transform +#define MD5Update _libtacplus_MD5Update +#include "private_md5.h" + static int add_str_8(struct tac_handle *, u_int8_t *, struct clnt_str *); static int add_str_16(struct tac_handle *, u_int16_t *, -- 2.41.0