94 lines
2.7 KiB
Diff
94 lines
2.7 KiB
Diff
From aa06f50efb5725a99f5ff93cca04c968ec981635 Mon Sep 17 00:00:00 2001
|
|
From: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
Date: Fri, 9 Jun 2023 04:52:30 +0000
|
|
Subject: [PATCH 5/7] uadk: build uadk_engine only if openssl 1.1
|
|
|
|
Rename e_uadk.c to uadk_engine_init.c
|
|
Build uadk_engine only if openssl 1.1
|
|
|
|
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
---
|
|
Makefile.am | 2 --
|
|
configure.ac | 7 ++++---
|
|
src/Makefile.am | 11 ++++++++---
|
|
src/{e_uadk.c => uadk_engine_init.c} | 0
|
|
4 files changed, 12 insertions(+), 8 deletions(-)
|
|
rename src/{e_uadk.c => uadk_engine_init.c} (100%)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 55fd400..1ade214 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1,7 +1,5 @@
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
-if HAVE_CRYPTO
|
|
if HAVE_WD
|
|
SUBDIRS = src
|
|
endif
|
|
-endif
|
|
diff --git a/configure.ac b/configure.ac
|
|
index fb03a5b..0fc14ed 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1,6 +1,5 @@
|
|
AC_PREREQ([2.69])
|
|
AC_INIT([uadk_engine], [1.2])
|
|
-AC_CONFIG_SRCDIR([src/e_uadk.c])
|
|
AM_INIT_AUTOMAKE([1.10 no-define])
|
|
|
|
AC_CONFIG_MACRO_DIR([m4])
|
|
@@ -15,8 +14,6 @@ AC_ARG_ENABLE(kae,
|
|
AC_SUBST(enable_kae)
|
|
AM_CONDITIONAL([WD_KAE], [test "$enable_kae" = "yes"])
|
|
|
|
-AC_CHECK_HEADERS([openssl/engine.h])
|
|
-
|
|
PKG_CHECK_MODULES(WD, libwd libwd_crypto, [with_wd=yes], [with_wd=no])
|
|
AM_CONDITIONAL(HAVE_WD, [test "$with_wd" != "no"])
|
|
|
|
@@ -24,6 +21,10 @@ PKG_CHECK_MODULES(libcrypto, libcrypto < 3.0 libcrypto >= 1.1,
|
|
[with_crypto=yes], [with_crypto=no])
|
|
AM_CONDITIONAL(HAVE_CRYPTO, test "$with_crypto" != "no")
|
|
|
|
+PKG_CHECK_MODULES(libcrypto, libcrypto >= 3.0,
|
|
+ [with_crypto3=yes], [with_crypto3=no])
|
|
+AM_CONDITIONAL(HAVE_CRYPTO3, test "$with_crypto3" != "no")
|
|
+
|
|
AC_CONFIG_FILES([
|
|
Makefile
|
|
src/Makefile])
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 8ced0e8..65afe1d 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -1,13 +1,18 @@
|
|
VERSION = 1:2
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
+if HAVE_CRYPTO
|
|
lib_LTLIBRARIES=uadk_engine.la
|
|
+endif #HAVE_CRYPTO
|
|
+
|
|
+uadk_engine_la_SOURCES=uadk_utils.c uadk_engine_init.c uadk_cipher.c \
|
|
+ uadk_digest.c uadk_async.c uadk_rsa.c uadk_sm2.c \
|
|
+ uadk_pkey.c uadk_dh.c uadk_ec.c uadk_ecx.c
|
|
|
|
-uadk_engine_la_SOURCES=uadk_utils.c e_uadk.c uadk_cipher.c uadk_digest.c uadk_async.c \
|
|
- uadk_rsa.c uadk_sm2.c uadk_pkey.c uadk_dh.c uadk_ec.c uadk_ecx.c
|
|
uadk_engine_la_LIBADD=-ldl $(WD_LIBS) -lpthread
|
|
uadk_engine_la_LDFLAGS=-module -version-number $(VERSION)
|
|
-uadk_engine_la_CFLAGS=$(WD_CFLAGS)
|
|
+uadk_engine_la_CFLAGS=$(WD_CFLAGS) $(libcrypto_CFLAGS)
|
|
+uadk_engine_la_CFLAGS+=-DCRYPTO
|
|
|
|
AUTOMAKE_OPTIONS = subdir-objects
|
|
|
|
diff --git a/src/e_uadk.c b/src/uadk_engine_init.c
|
|
similarity index 100%
|
|
rename from src/e_uadk.c
|
|
rename to src/uadk_engine_init.c
|
|
--
|
|
2.25.1
|
|
|