eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-15 12:50:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol version test if dlvsym() is not available.

Browse Source 
If we have no dlvsym(), just run dlsym() test.
This commit is contained in:
Milan Broz
2021-08-21 13:33:13 +02:00
parent e008a88b98
commit 20b678c9f3
2 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -101,6 +101,11 @@ AC_CHECK_LIB(uuid, uuid_clear, ,[AC_MSG_ERROR([You need the uuid library.])])
AC_SUBST(UUID_LIBS, $LIBS) AC_SUBST(UUID_LIBS, $LIBS)
LIBS=$saved_LIBS LIBS=$saved_LIBS
saved_LIBS=$LIBS
AC_SEARCH_LIBS([dlsym],[dl])
AC_CHECK_FUNCS([dlvsym])
LIBS=$saved_LIBS
AC_SEARCH_LIBS([clock_gettime],[rt posix4]) AC_SEARCH_LIBS([clock_gettime],[rt posix4])
AC_CHECK_FUNCS([posix_memalign clock_gettime posix_fallocate explicit_bzero]) AC_CHECK_FUNCS([posix_memalign clock_gettime posix_fallocate explicit_bzero])

71
tests/all-symbols-test.c
View File

@@ -68,34 +68,57 @@ static void test_logf(int level, const char *format, ...)
#define log_std(x...) test_logf(LOG_NORMAL, x) #define log_std(x...) test_logf(LOG_NORMAL, x)
#define log_err(x...) test_logf(LOG_ERROR, x) #define log_err(x...) test_logf(LOG_ERROR, x)
static int check_all_symbols(void *h) static int check_dlvsym(void *h, const char *symbol, const char *version)
{
#ifdef HAVE_DLVSYM
void *sym;
char *err;
log_dbg("Checking %s@%s...", symbol, version);
sym = dlvsym(h, symbol, version);
UNUSED(sym);
err = dlerror();
if (err) {
log_err("%s.", err);
return 1;
}
log_dbg("OK\n");
#endif
return 0;
}
static int check_dlsym(void *h, const char *symbol)
{ {
void *sym; void *sym;
char *err; char *err;
log_dbg("Checking %s...", symbol);
sym = dlsym(h, symbol);
UNUSED(sym);
err = dlerror();
if (err) {
log_err("%s", err);
return 1;
}
log_dbg("OK\n");
return 0;
}
static int check_all_symbols(void *h)
{
unsigned scount = 0; unsigned scount = 0;
#define CHECK_SYMBOL(SYM, VER) \ #define CHECK_SYMBOL(SYM, VER) \
do { \ do { \
log_dbg("Checking " #SYM "@" #VER "..."); \ if (check_dlvsym(h, #SYM, #VER)) \
sym = dlvsym(h, #SYM, #VER); \ return 1; \
UNUSED(sym); \ if (check_dlsym(h, #SYM)) \
err = dlerror(); \ return 1; \
\ scount++; \
if (err) { \
log_err("%s.", err); \
return 1; \
} \
\
log_dbg("OK\nChecking " #SYM "..."); \
sym = dlsym(h, #SYM); \
UNUSED(sym); \
err = dlerror(); \
if (err) { \
log_err("%s", err); \
return 1; \
} \
log_dbg("OK\n"); \
scount++; \
} while (0); } while (0);
#include "test-symbols-list.h" #include "test-symbols-list.h"
@@ -106,7 +129,7 @@ do { \
return 1; return 1;
} }
log_std("Performed %u symbol checks in total\n.", scount); log_std("Performed %u symbol checks in total.\n", scount);
return 0; return 0;
} }