| From 4feaf9b61f93e4043eca26b4ec9f9f68d0cf5e68 Mon Sep 17 00:00:00 2001 |
| From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| Date: Wed, 6 Mar 2019 01:08:43 +0300 |
| Subject: [PATCH 1/4] ima-evm-utils: link to libcrypto instead of OpenSSL |
| |
| There is no need to link to full libssl. evmctl uses functions from |
| libcrypto, so let's link only against that library. |
| |
| Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| --- |
| configure.ac | 4 +--- |
| src/Makefile.am | 9 ++++----- |
| 2 files changed, 5 insertions(+), 8 deletions(-) |
| |
| diff --git a/configure.ac b/configure.ac |
| index 60f3684..32e8d85 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -24,9 +24,7 @@ LT_INIT |
| # Checks for header files. |
| AC_HEADER_STDC |
| |
| -PKG_CHECK_MODULES(OPENSSL, [ openssl >= 0.9.8 ]) |
| -AC_SUBST(OPENSSL_CFLAGS) |
| -AC_SUBST(OPENSSL_LIBS) |
| +PKG_CHECK_MODULES(LIBCRYPTO, [libcrypto >= 0.9.8 ]) |
| AC_SUBST(KERNEL_HEADERS) |
| AC_CHECK_HEADER(unistd.h) |
| AC_CHECK_HEADERS(openssl/conf.h) |
| diff --git a/src/Makefile.am b/src/Makefile.am |
| index d74fc6f..b81281a 100644 |
| --- a/src/Makefile.am |
| +++ b/src/Makefile.am |
| @@ -1,11 +1,11 @@ |
| lib_LTLIBRARIES = libimaevm.la |
| |
| libimaevm_la_SOURCES = libimaevm.c |
| -libimaevm_la_CPPFLAGS = $(OPENSSL_CFLAGS) |
| +libimaevm_la_CPPFLAGS = $(LIBCRYPTO_CFLAGS) |
| # current[:revision[:age]] |
| # result: [current-age].age.revision |
| libimaevm_la_LDFLAGS = -version-info 0:0:0 |
| -libimaevm_la_LIBADD = $(OPENSSL_LIBS) |
| +libimaevm_la_LIBADD = $(LIBCRYPTO_LIBS) |
| |
| include_HEADERS = imaevm.h |
| |
| @@ -17,12 +17,11 @@ hash_info.h: Makefile |
| bin_PROGRAMS = evmctl |
| |
| evmctl_SOURCES = evmctl.c |
| -evmctl_CPPFLAGS = $(OPENSSL_CFLAGS) |
| +evmctl_CPPFLAGS = $(LIBCRYPTO_CFLAGS) |
| evmctl_LDFLAGS = $(LDFLAGS_READLINE) |
| -evmctl_LDADD = $(OPENSSL_LIBS) -lkeyutils libimaevm.la |
| +evmctl_LDADD = $(LIBCRYPTO_LIBS) -lkeyutils libimaevm.la |
| |
| INCLUDES = -I$(top_srcdir) -include config.h |
| |
| CLEANFILES = hash_info.h |
| DISTCLEANFILES = @DISTCLEANFILES@ |
| - |
| -- |
| 2.17.1 |
| |