Fix issue: Softhsm-daemon leaks memory when certificate is stored

[keystone-linux/ti-softhsmv2.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 73465015b0064fe01fd45322857e03a379742406..73e431599f0966c9f7538703f1efebc19909a4cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ AM_CONDITIONAL([BUILD_MIGRATE], [test "x${build_migrate}" = "xyes"])
 # Check for libraries
 ACX_DLOPEN
 ACX_SEMAPHORE
-
+ACX_ZLIB(1.2.7)
 # Check for headers
 AC_CHECK_HEADERS([pthread.h])
 
@@ -98,7 +98,16 @@ full_sysconfdir=`eval eval eval eval eval echo "${sysconfdir}" | sed "s#NONE#${p
 full_localstatedir=`eval eval eval eval eval echo "${localstatedir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
 full_libdir=`eval eval eval eval eval echo "${libdir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
 default_softhsm2_conf="`eval echo ${full_sysconfdir} | sed s,NONE,$ac_default_prefix,g`/softhsm2.conf"
-softhsmtokendir=${full_localstatedir}/lib/softhsm/tokens/
+# softhsmtokendir=${full_localstatedir}/lib/softhsm/tokens
+softhsmserversock=/var/run/softhsm/server_sock
+softhsmclientsock=/var/run/softhsm/client_sock
+secstorekeyaddr=0x0c000000
+secstorekeysize=0x20
+secstorememaddr=0x0c000020
+secstorememsize=0xffe0
+secstorefile0=/mnt/securedbv0/securedb
+secstorefile1=/mnt/securedbv1/securedb
+internal_ossl_heap=no
 
 # Install the library in a sub-directory
 full_libdir="$full_libdir/softhsm"
@@ -135,19 +144,67 @@ AC_DEFINE_UNQUOTED(
        ["$default_softhsm2_conf"],
        [The default location of softhsm2.conf]
 )
-AC_DEFINE_UNQUOTED(
-       [DEFAULT_TOKENDIR],
-       ["$softhsmtokendir"],
-       [The default location of the token directory]
-)
 AC_DEFINE_UNQUOTED(
        [DEFAULT_PKCS11_LIB],
        ["$full_libdir/libsofthsm.so"],
        [The default PKCS#11 library]
 )
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_SERVERSOCK],
+       ["$softhsmserversock"],
+       [The default unix socket name for softHSM daemon ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_CLIENTSOCK],
+       ["$softhsmclientsock"],
+       [The default unix socket name prefix for softHSM client ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_SECSTORE_KEYADDR],
+       ["$secstorekeyaddr"],
+       [The default secure database key location ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_SECSTORE_KEYSIZE],
+       ["$secstorekeysize"],
+       [The default secure database key size ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_SECSTORE_MEMADDR],
+       ["$secstorememaddr"],
+       [The default secure database base address ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_SECSTORE_MEMSIZE],
+       ["$secstorememsize"],
+       [The default secure database maximum length ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_SECSTORE_FILE0],
+       ["$secstorefile0"],
+       [The default secure store ubifs volume 0 for reduncancy level 2 ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_SECSTORE_FILE1],
+       ["$secstorefile1"],
+       [The default secure store ubifs volume 1 for reduncancy level 2 ]
+)
+AC_DEFINE_UNQUOTED(
+       [DEFAULT_OSSL_HEAP_FLAG],
+       ["$internal_ossl_heap"],
+       [Use internal memory for Openssl dynamic allocations]
+)
 
-AC_SUBST([softhsmtokendir])
 AC_SUBST([default_softhsm2_conf])
+AC_SUBST([softhsmserversock])
+AC_SUBST([softhsmclientsock])
+AC_SUBST([secstorekeyaddr])
+AC_SUBST([secstorekeysize])
+AC_SUBST([secstorememaddr])
+AC_SUBST([secstorememsize])
+AC_SUBST([secstorefile0])
+AC_SUBST([secstorefile1])
+AC_SUBST([internal_ossl_heap])
 
 # Generate the libtool script and install script
 AC_PROG_INSTALL
@@ -181,6 +238,9 @@ AC_CONFIG_FILES([
        src/bin/keyconv/Makefile
        src/bin/migrate/Makefile
        src/bin/util/Makefile
+       src/bin/daemon/Makefile
+       src/lib/msg_handler/Makefile
+       src/lib/client/Makefile
 ])
 
 AC_OUTPUT