tools: Remove libcrypto dependency

Remove all occurrence of libcrypto in the build system.

Signed-off-by: Yuzhuo Jing <yuzhuo@google.com>
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Reviewed-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250625202311.23244-5-ebiggers@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 2e5f4c8b6547652cd491c44d922b70e196768ec1..649c5ab8e8f26b93c7dd047a843c1cbee070b4f6 100644 (file)
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -86,7 +86,6 @@ FEATURE_TESTS_BASIC :=                  \
         libtraceevent                   \
         libtracefs                      \
         libcpupower                     \
-        libcrypto                       \
         pthread-attr-setaffinity-np     \
         pthread-barrier                \
         reallocarray                    \
@@ -147,7 +146,6 @@ FEATURE_DISPLAY ?=              \
          numa_num_possible_cpus \
          libperl                \
          libpython              \
-         libcrypto              \
          libcapstone            \
          llvm-perf              \
          zlib                   \

diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index 0c4e541ed56e89c68697301502a289088726c54e..b41a42818d8ac232ade78ecb41363d26ce2a9471 100644 (file)
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -38,7 +38,6 @@ FILES=                                          \
          test-libtraceevent.bin                 \
          test-libcpupower.bin                   \
          test-libtracefs.bin                    \
-         test-libcrypto.bin                     \
          test-libunwind.bin                     \
          test-libunwind-debug-frame.bin         \
          test-libunwind-x86.bin                 \
@@ -247,9 +246,6 @@ $(OUTPUT)test-libcpupower.bin:
 $(OUTPUT)test-libtracefs.bin:
         $(BUILD) $(shell $(PKG_CONFIG) --cflags libtracefs 2>/dev/null) -ltracefs
 
-$(OUTPUT)test-libcrypto.bin:
-       $(BUILD) -lcrypto
-
 $(OUTPUT)test-gtk2.bin:
        $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) -Wno-deprecated-declarations
 

diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
index 1010f233d9c1ad49ce9ec39c653b810d4785da58..4419fb4710bd1c709f4c74f2eeb4ac536d8821b8 100644 (file)
--- a/tools/build/feature/test-all.c
+++ b/tools/build/feature/test-all.c
@@ -130,10 +130,6 @@
 # include "test-bpf.c"
 #undef main
 
-#define main main_test_libcrypto
-# include "test-libcrypto.c"
-#undef main
-
 #define main main_test_sdt
 # include "test-sdt.c"
 #undef main
@@ -188,7 +184,6 @@ int main(int argc, char *argv[])
        main_test_lzma();
        main_test_get_cpuid();
        main_test_bpf();
-       main_test_libcrypto();
        main_test_scandirat();
        main_test_sched_getcpu();
        main_test_sdt();

diff --git a/tools/build/feature/test-libcrypto.c b/tools/build/feature/test-libcrypto.c
deleted file mode 100644 (file)
index bc34a5b..0000000
--- a/tools/build/feature/test-libcrypto.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <openssl/evp.h>
-#include <openssl/sha.h>
-#include <openssl/md5.h>
-
-int main(void)
-{
-       EVP_MD_CTX *mdctx;
-       unsigned char md[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];
-       unsigned char dat[] = "12345";
-       unsigned int digest_len;
-
-       mdctx = EVP_MD_CTX_new();
-       if (!mdctx)
-               return 0;
-
-       EVP_DigestInit_ex(mdctx, EVP_md5(), NULL);
-       EVP_DigestUpdate(mdctx, &dat[0], sizeof(dat));
-       EVP_DigestFinal_ex(mdctx, &md[0], &digest_len);
-       EVP_MD_CTX_free(mdctx);
-
-       SHA1(&dat[0], sizeof(dat), &md[0]);
-
-       return 0;
-}

diff --git a/tools/perf/Documentation/perf-check.txt b/tools/perf/Documentation/perf-check.txt
index 799982d8d86878b9190c35ec13ce3bf7387d2a00..ee92042082f731212cba9f03a2dde8a120be899b 100644 (file)
--- a/tools/perf/Documentation/perf-check.txt
+++ b/tools/perf/Documentation/perf-check.txt
@@ -54,7 +54,6 @@ feature::
                 libbfd                  /  HAVE_LIBBFD_SUPPORT
                 libbpf-strings          /  HAVE_LIBBPF_STRINGS_SUPPORT
                 libcapstone             /  HAVE_LIBCAPSTONE_SUPPORT
-                libcrypto               /  HAVE_LIBCRYPTO_SUPPORT
                 libdw-dwarf-unwind      /  HAVE_LIBDW_SUPPORT
                 libelf                  /  HAVE_LIBELF_SUPPORT
                 libnuma                 /  HAVE_LIBNUMA_SUPPORT

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 70a3e771c7c08f62e1b92ff980b00ca998551b6e..5a5832ee7b53c604ec0d90c5ca7e2bee5bfa6a17 100644 (file)
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -134,8 +134,6 @@ ifndef NO_LIBUNWIND
   FEATURE_CHECK_LDFLAGS-libunwind-x86_64 += -lunwind -llzma -lunwind-x86_64
 endif
 
-FEATURE_CHECK_LDFLAGS-libcrypto = -lcrypto
-
 ifdef CSINCLUDES
   LIBOPENCSD_CFLAGS := -I$(CSINCLUDES)
 endif
@@ -784,17 +782,6 @@ ifneq ($(NO_LIBTRACEEVENT),1)
   $(call detected,CONFIG_TRACE)
 endif
 
-ifndef NO_LIBCRYPTO
-  ifneq ($(feature-libcrypto), 1)
-    $(warning No libcrypto.h found, disables jitted code injection, please install openssl-devel or libssl-dev)
-    NO_LIBCRYPTO := 1
-  else
-    CFLAGS += -DHAVE_LIBCRYPTO_SUPPORT
-    EXTLIBS += -lcrypto
-    $(call detected,CONFIG_CRYPTO)
-  endif
-endif
-
 ifndef NO_SLANG
   ifneq ($(feature-libslang), 1)
     ifneq ($(feature-libslang-include-subdir), 1)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 4f292edeca5a8f1eafb2702094846b49adcf871d..62697d62f706081659b27821f3093a417149623f 100644 (file)
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -61,9 +61,6 @@ include ../scripts/utilities.mak
 #
 # Define NO_LIBBIONIC if you do not want bionic support
 #
-# Define NO_LIBCRYPTO if you do not want libcrypto (openssl) support
-# used for generating build-ids for ELFs generated by jitdump.
-#
 # Define NO_LIBDW_DWARF_UNWIND if you do not want libdw support
 # for dwarf backtrace post unwind.
 #

diff --git a/tools/perf/builtin-check.c b/tools/perf/builtin-check.c
index f4827f0ddb47167748ccde5bc9610216dc9d4b21..b1e205871ab17a77e00e4c3769479daf211abd44 100644 (file)
--- a/tools/perf/builtin-check.c
+++ b/tools/perf/builtin-check.c
@@ -45,7 +45,6 @@ struct feature_status supported_features[] = {
        FEATURE_STATUS_TIP("libbfd", HAVE_LIBBFD_SUPPORT, "Deprecated, license incompatibility, use BUILD_NONDISTRO=1 and install binutils-dev[el]"),
        FEATURE_STATUS("libbpf-strings", HAVE_LIBBPF_STRINGS_SUPPORT),
        FEATURE_STATUS("libcapstone", HAVE_LIBCAPSTONE_SUPPORT),
-       FEATURE_STATUS("libcrypto", HAVE_LIBCRYPTO_SUPPORT),
        FEATURE_STATUS("libdw-dwarf-unwind", HAVE_LIBDW_SUPPORT),
        FEATURE_STATUS("libelf", HAVE_LIBELF_SUPPORT),
        FEATURE_STATUS("libnuma", HAVE_LIBNUMA_SUPPORT),

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 0ee94caf9ec19820a94a87dd46a7ccf1cefb844a..e3651e5b195a4b5da8701d5ceb7bb478c4b44afc 100644 (file)
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -91,7 +91,6 @@ make_no_auxtrace    := NO_AUXTRACE=1
 make_no_libbpf     := NO_LIBBPF=1
 make_libbpf_dynamic := LIBBPF_DYNAMIC=1
 make_no_libbpf_DEBUG := NO_LIBBPF=1 DEBUG=1
-make_no_libcrypto   := NO_LIBCRYPTO=1
 make_no_libllvm     := NO_LIBLLVM=1
 make_with_babeltrace:= LIBBABELTRACE=1
 make_with_coresight := CORESIGHT=1
@@ -122,7 +121,7 @@ make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_GTK2=1
 make_minimal        += NO_DEMANGLE=1 NO_LIBELF=1 NO_BACKTRACE=1
 make_minimal        += NO_LIBNUMA=1 NO_LIBBIONIC=1
 make_minimal        += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1
-make_minimal        += NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1
+make_minimal        += NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1
 make_minimal        += NO_LIBCAP=1 NO_CAPSTONE=1
 
 # $(run) contains all available tests
@@ -160,7 +159,6 @@ run += make_no_libbionic
 run += make_no_auxtrace
 run += make_no_libbpf
 run += make_no_libbpf_DEBUG
-run += make_no_libcrypto
 run += make_no_libllvm
 run += make_no_sdt
 run += make_no_syscall_tbl