GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

gnutls: increased dependency to 3.3.0

Browse Source 
That way PKCS#11 reinitialization and global initialization are
implicit.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos
2018-02-04 10:37:05 +01:00
parent 7d762748db
commit e61029445c
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -49,10 +49,7 @@ AC_CHECK_SIZEOF([unsigned long])
AC_C_BIGENDIAN
PKG_CHECK_MODULES([LIBNETTLE], [nettle >= 2.7])
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.10])
AC_CHECK_LIB(gnutls, gnutls_pkcs11_reinit, [
AC_DEFINE([HAVE_PKCS11], [], [PKCS11 detected in gnutls])
])
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.3.0])
if ! $PKG_CONFIG --atleast-version=3.0 nettle; then
AC_DEFINE([NETTLE_OLD_BASE64_API], [1],

2
src/config.c
View File

@@ -1294,9 +1294,7 @@ static void print_version(void)
#ifdef HAVE_PAM
append("PAM");
#endif
#ifdef HAVE_PKCS11
append("PKCS#11");
#endif
#ifdef ANYCONNECT_CLIENT_COMPAT
append("AnyConnect");
#endif

8
src/sec-mod.c
View File

@@ -920,14 +920,6 @@ void sec_mod_server(void *main_pool, struct perm_cfg_st *perm_config, const char
sec->cmd_fd = cmd_fd;
sec->cmd_fd_sync = cmd_fd_sync;
#ifdef HAVE_PKCS11
ret = gnutls_pkcs11_reinit();
if (ret < 0) {
seclog(sec, LOG_WARNING, "error in PKCS #11 reinitialization: %s",
gnutls_strerror(ret));
}
#endif
if (sec_mod_client_db_init(sec) == NULL) {
seclog(sec, LOG_ERR, "error in client db initialization");
exit(1);