| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From 4feaf9b61f93e4043eca26b4ec9f9f68d0cf5e68 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| 3 | Date: Wed, 6 Mar 2019 01:08:43 +0300 |
| 4 | Subject: [PATCH 1/4] ima-evm-utils: link to libcrypto instead of OpenSSL |
| 5 | |
| 6 | There is no need to link to full libssl. evmctl uses functions from |
| 7 | libcrypto, so let's link only against that library. |
| 8 | |
| 9 | Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
| 10 | --- |
| 11 | configure.ac | 4 +--- |
| 12 | src/Makefile.am | 9 ++++----- |
| 13 | 2 files changed, 5 insertions(+), 8 deletions(-) |
| 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index 60f3684..32e8d85 100644 |
| 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
| 19 | @@ -24,9 +24,7 @@ LT_INIT |
| 20 | # Checks for header files. |
| 21 | AC_HEADER_STDC |
| 22 | |
| 23 | -PKG_CHECK_MODULES(OPENSSL, [ openssl >= 0.9.8 ]) |
| 24 | -AC_SUBST(OPENSSL_CFLAGS) |
| 25 | -AC_SUBST(OPENSSL_LIBS) |
| 26 | +PKG_CHECK_MODULES(LIBCRYPTO, [libcrypto >= 0.9.8 ]) |
| 27 | AC_SUBST(KERNEL_HEADERS) |
| 28 | AC_CHECK_HEADER(unistd.h) |
| 29 | AC_CHECK_HEADERS(openssl/conf.h) |
| 30 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 31 | index d74fc6f..b81281a 100644 |
| 32 | --- a/src/Makefile.am |
| 33 | +++ b/src/Makefile.am |
| 34 | @@ -1,11 +1,11 @@ |
| 35 | lib_LTLIBRARIES = libimaevm.la |
| 36 | |
| 37 | libimaevm_la_SOURCES = libimaevm.c |
| 38 | -libimaevm_la_CPPFLAGS = $(OPENSSL_CFLAGS) |
| 39 | +libimaevm_la_CPPFLAGS = $(LIBCRYPTO_CFLAGS) |
| 40 | # current[:revision[:age]] |
| 41 | # result: [current-age].age.revision |
| 42 | libimaevm_la_LDFLAGS = -version-info 0:0:0 |
| 43 | -libimaevm_la_LIBADD = $(OPENSSL_LIBS) |
| 44 | +libimaevm_la_LIBADD = $(LIBCRYPTO_LIBS) |
| 45 | |
| 46 | include_HEADERS = imaevm.h |
| 47 | |
| 48 | @@ -17,12 +17,11 @@ hash_info.h: Makefile |
| 49 | bin_PROGRAMS = evmctl |
| 50 | |
| 51 | evmctl_SOURCES = evmctl.c |
| 52 | -evmctl_CPPFLAGS = $(OPENSSL_CFLAGS) |
| 53 | +evmctl_CPPFLAGS = $(LIBCRYPTO_CFLAGS) |
| 54 | evmctl_LDFLAGS = $(LDFLAGS_READLINE) |
| 55 | -evmctl_LDADD = $(OPENSSL_LIBS) -lkeyutils libimaevm.la |
| 56 | +evmctl_LDADD = $(LIBCRYPTO_LIBS) -lkeyutils libimaevm.la |
| 57 | |
| 58 | INCLUDES = -I$(top_srcdir) -include config.h |
| 59 | |
| 60 | CLEANFILES = hash_info.h |
| 61 | DISTCLEANFILES = @DISTCLEANFILES@ |
| 62 | - |
| 63 | -- |
| 64 | 2.17.1 |
| 65 | |