66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
|
--- openssl-ibmca-2.4.1/configure.ac 2023-09-21 08:52:43.000000000 +0200
|
||
|
|
+++ changed/configure.ac 2024-04-17 10:13:02.267582864 +0200
|
||
|
|
@@ -69,7 +69,7 @@
|
||
|
|
# Checks for header files.
|
||
|
|
AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h \
|
||
|
|
string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
|
||
|
|
-AC_CHECK_HEADER([ica_api.h], [], AC_MSG_ERROR([*** libica-devel >= 3.6.0 is required ***]))
|
||
|
|
+AC_CHECK_HEADER([ica_api.h], [], AC_MSG_ERROR([*** libica-openssl1_1-devel >= 3.6.0 is required ***]))
|
||
|
|
|
||
|
|
|
||
|
|
# Checks for typedefs, structures, and compiler characteristics.
|
||
|
|
@@ -81,15 +81,15 @@
|
||
|
|
# Checks for library functions.
|
||
|
|
AC_CHECK_FUNCS([gethostbyaddr gethostbyname memset strcasecmp strncasecmp strstr malloc])
|
||
|
|
AC_CHECK_DECLS([ICA_FLAG_DHW,DES_ECB], [],
|
||
|
|
- AC_MSG_ERROR([*** libica-devel >= 3.6.0 are required ***]),
|
||
|
|
+ AC_MSG_ERROR([*** libica-openssl1_1-devel >= 3.6.0 are required ***]),
|
||
|
|
[#include <ica_api.h>])
|
||
|
|
AC_CHECK_DECLS([OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION],
|
||
|
|
[openssl_implicit_rejection="yes"], [openssl_implicit_rejection="no"],
|
||
|
|
[#include <openssl/core_names.h>])
|
||
|
|
AM_CONDITIONAL([OPENSSL_IMPLICIT_REJECTION], [test "x$openssl_implicit_rejection" = xyes])
|
||
|
|
|
||
|
|
-AC_ARG_WITH([libica-cex],
|
||
|
|
- [AS_HELP_STRING([--with-libica-cex],[Use libica-cex as default library for the IBMCA engine])],
|
||
|
|
+AC_ARG_WITH([libica-openssl1_1-cex],
|
||
|
|
+ [AS_HELP_STRING([--with-libica-openssl1_1-cex],[Use libica-openssl1_1-cex as default library for the IBMCA engine])],
|
||
|
|
[usecexonly=${withval}],
|
||
|
|
[])
|
||
|
|
|
||
|
|
@@ -99,11 +99,11 @@
|
||
|
|
[libicaversion=4])
|
||
|
|
|
||
|
|
if test "x$usecexonly" = xyes; then
|
||
|
|
- defaultlib="libica-cex.so.$libicaversion"
|
||
|
|
- ica="ica-cex"
|
||
|
|
+ defaultlib="libica-openssl1_1-cex.so.$libicaversion"
|
||
|
|
+ ica="ica-openssl1_1-cex"
|
||
|
|
else
|
||
|
|
- defaultlib="libica.so.$libicaversion"
|
||
|
|
- ica="ica"
|
||
|
|
+ defaultlib="libica-openssl1_1.so.$libicaversion"
|
||
|
|
+ ica="ica-openssl1_1"
|
||
|
|
fi
|
||
|
|
# In cex-only mode, testing the ciphers does not make any sense since
|
||
|
|
# they will fall back to OpenSSL without the engine. So remove these
|
||
|
|
@@ -135,7 +135,7 @@
|
||
|
|
|
||
|
|
|
||
|
|
AC_DEFINE_UNQUOTED([LIBICA_SHARED_LIB],["$defaultlib"])
|
||
|
|
-AC_SUBST([ICA],["$ica"])
|
||
|
|
+AC_SUBST([ICA],["$ica-openssl1_1"])
|
||
|
|
|
||
|
|
AC_CHECK_PROG([openssl_var],[openssl],[yes],[no])
|
||
|
|
if test "x$openssl_var" != xyes; then
|
||
|
|
@@ -169,7 +169,7 @@
|
||
|
|
echo " default library: $defaultlib"
|
||
|
|
echo "IBMCA provider: $enable_provider"
|
||
|
|
if test "x$useproviderfulllibica" = xyes; then
|
||
|
|
- echo " libica library: libica"
|
||
|
|
+ echo " libica library: libica-openssl1_1"
|
||
|
|
else
|
||
|
|
- echo " libica library: libica-cex"
|
||
|
|
+ echo " libica library: libica-openssl1_1-cex"
|
||
|
|
fi
|