File openssl3-rename-libica-files.patch of Package openssl-ibmca.31233

Overview Repositories Revisions Requests Users Attributes Meta

File openssl3-rename-libica-files.patch of Package openssl-ibmca.31233

---
 configure.ac              |   18 +++++++++---------
 src/provider/Makefile.am  |    4 ++--
 test/engine/enginectrl.c  |   20 ++++++++++----------
 test/provider/Makefile.am |   12 ++++++------
 4 files changed, 27 insertions(+), 27 deletions(-)

--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ AC_CHECK_LIB([crypto], [OSSL_LIB_CTX_new
 # 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-openssl3-devel >= 3.6.0 is required ***]))
 
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -67,7 +67,7 @@ AC_TYPE_SSIZE_T
 # 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-openssl3-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"],
@@ -85,11 +85,11 @@ AC_ARG_WITH([libica-version],
 	[libicaversion=4])
 
 if test "x$usecexonly" = xyes; then
-	defaultlib="libica-cex.so.$libicaversion"
-	ica="ica-cex"
+	defaultlib="libica-openssl3-cex.so.$libicaversion"
+	ica="ica-openssl3-cex"
 else
-	defaultlib="libica.so.$libicaversion"
-	ica="ica"
+	defaultlib="libica-openssl3.so.$libicaversion"
+	ica="ica-openssl3"
 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
@@ -121,7 +121,7 @@ AM_CONDITIONAL([IBMCA_PROVIDER], [test "
 
 
 AC_DEFINE_UNQUOTED([LIBICA_SHARED_LIB],["$defaultlib"])
-AC_SUBST([ICA],["$ica"])
+AC_SUBST([ICA],["$ica-openssl3"])
 
 AC_CHECK_PROG([openssl_var],[openssl],[yes],[no])
 if test "x$openssl_var" != xyes; then
@@ -155,7 +155,7 @@ echo "IBMCA engine:      $enable_engine"
 echo "  default library: $defaultlib"
 echo "IBMCA provider:    $enable_provider"
 if test "x$useproviderfulllibica" = xyes; then
-	echo "  libica library:  libica"
+	echo "  libica library:  libica-openssl3"
 else
-	echo "  libica library:  libica-cex"
+	echo "  libica library:  libica-openssl3-cex"
 fi
--- a/src/provider/Makefile.am
+++ b/src/provider/Makefile.am
@@ -11,9 +11,9 @@ ibmca_provider_la_SOURCES=p_ibmca.c p_ke
 ibmca_provider_la_CFLAGS=-DIBMCA_VERSION=\"${VERSION_STR}\" -DIBMCA_LOGDIR=\"$(logdir)\"
 
 if PROVIDER_FULL_LIBICA
-ibmca_provider_la_LIBADD=-ldl -lica
+ibmca_provider_la_LIBADD=-ldl -lica-openssl3
 else
-ibmca_provider_la_LIBADD=-ldl -lica-cex
+ibmca_provider_la_LIBADD=-ldl -lica-openssl3-cex
 endif
 ibmca_provider_la_LDFLAGS=-module -version-number ${VERSION} -shared -no-undefined \
 		  -avoid-version -Wl,--version-script=${srcdir}/ibmca-provider.map
--- a/test/engine/enginectrl.c
+++ b/test/engine/enginectrl.c
@@ -42,12 +42,12 @@ int initwithlib(ENGINE *e, const char *l
         }
         dlclose(hdl);
     }
-    if (ENGINE_ctrl_cmd_string(e, "libica", lib, 0) != 1) {
-        fprintf(stderr, "\"libica\" ctrl failed to set \"%s\" on un-initialized ibmca!\n", lib);
+    if (ENGINE_ctrl_cmd_string(e, "libica-openssl3", lib, 0) != 1) {
+        fprintf(stderr, "\"libica-openssl3\" ctrl failed to set \"%s\" on un-initialized ibmca!\n", lib);
         return 0;
     }
     if (ENGINE_init(e) != expectedinitval) {
-        fprintf(stderr, "ibmca unexpted initialization result for libica=%s (expected: %d)!\n",
+        fprintf(stderr, "ibmca unexpted initialization result for libica-openssl3=%s (expected: %d)!\n",
                 lib, expectedinitval);
         return 0;
     }
@@ -65,10 +65,10 @@ int testctrl(void)
         int expectedinitval;
     } params[] = {
                   {"doesnotexist",    0, 0},
-                  {"libica.so.3",     1, 1},
-                  {"libica-cex.so.3", 1, 1},
-                  {"libica.so.4",     1, 1},
-                  {"libica-cex.so.4", 1, 1}
+                  {"libica-openssl3.so.3",     1, 1},
+                  {"libica-openssl3-cex.so.3", 1, 1},
+                  {"libica-openssl3.so.4",     1, 1},
+                  {"libica-openssl3-cex.so.4", 1, 1}
     };
 
     engine = ENGINE_by_id("ibmca");
@@ -81,8 +81,8 @@ int testctrl(void)
         goto out;
     }
     /* Engine ctrl "libica" only works if engine is not initialized. */
-    if (ENGINE_ctrl_cmd_string(engine, "libica", "doesnotexist", 0) == 1) {
-        fprintf(stderr, "\"libica\" ctrl succeeded despite initialized ibmca!\n");
+    if (ENGINE_ctrl_cmd_string(engine, "libica-openssl3", "doesnotexist", 0) == 1) {
+        fprintf(stderr, "\"libica-openssl3\" ctrl succeeded despite initialized ibmca!\n");
         goto out;
     }
     ENGINE_finish(engine);
@@ -94,7 +94,7 @@ int testctrl(void)
     /* We have to restore the correct libica and init ibmca here to
        restore the double free above.  This might leak resources, but
        should be okay for a test. */
-    ENGINE_ctrl_cmd_string(engine, "libica", LIBICA_SHARED_LIB, 0);
+    ENGINE_ctrl_cmd_string(engine, "libica-openssl3", LIBICA_SHARED_LIB, 0);
     ENGINE_init(engine);
  out:
     ENGINE_free(engine);
--- a/test/provider/Makefile.am
+++ b/test/provider/Makefile.am
@@ -25,23 +25,23 @@ check_PROGRAMS = rsakey eckey dhkey thre
 
 dhkey_SOURCES = dhkey.c
 if PROVIDER_FULL_LIBICA
-dhkey_LDADD = -lcrypto -lica
+dhkey_LDADD = -lcrypto -lica-openssl3
 else
-dhkey_LDADD = -lcrypto -lica-cex
+dhkey_LDADD = -lcrypto -lica-openssl3-cex
 endif
 
 eckey_SOURCES = eckey.c
 if PROVIDER_FULL_LIBICA
-eckey_LDADD = -lcrypto -lica
+eckey_LDADD = -lcrypto -lica-openssl3
 else
-eckey_LDADD = -lcrypto -lica-cex
+eckey_LDADD = -lcrypto -lica-openssl3-cex
 endif
 
 rsakey_SOURCES = rsakey.c
 if PROVIDER_FULL_LIBICA
-rsakey_LDADD = -lcrypto -lica
+rsakey_LDADD = -lcrypto -lica-openssl3
 else
-rsakey_LDADD = -lcrypto -lica-cex
+rsakey_LDADD = -lcrypto -lica-openssl3-cex
 endif
 
 threadtest_SOURCES = threadtest.c

Places

File openssl3-rename-libica-files.patch of Package openssl-ibmca.31233

Places