From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: linux-integrity@vger.kernel.org
Subject: [PATCH 1/4] ima-evm-utils: link to libcrypto instead of OpenSSL
Date: Thu, 23 May 2019 15:26:20 +0300 [thread overview]
Message-ID: <20190523122623.25684-1-dbaryshkov@gmail.com> (raw)
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 10d1d88ccdc7..9beb4b6c2377 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 d74fc6f6e190..b81281a31d9b 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.20.1
next reply other threads:[~2019-05-23 12:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 12:26 Dmitry Eremin-Solenikov [this message]
2019-05-23 12:26 ` [PATCH 2/4] ima-evm-utils: replace INCLUDES with AM_CPPFLAGS Dmitry Eremin-Solenikov
2019-05-23 12:26 ` [PATCH 3/4] ima-evm-utils: include hash-info.gen into distribution Dmitry Eremin-Solenikov
2019-05-23 12:26 ` [PATCH 4/4] ima-evm-utils: update .gitignore files Dmitry Eremin-Solenikov
2019-05-23 15:12 ` [PATCH 1/4] ima-evm-utils: link to libcrypto instead of OpenSSL Mimi Zohar
2019-05-23 15:17 ` Dmitry Eremin-Solenikov
2019-07-11 15:07 ` Vitaly Chikunov
2019-07-12 2:05 ` Vitaly Chikunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190523122623.25684-1-dbaryshkov@gmail.com \
--to=dbaryshkov@gmail.com \
--cc=linux-integrity@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).