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

depend on gnutls 3.1.10

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-03-23 09:41:28 +01:00
parent 6632f53f58
commit b994462ce1
4 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -30,7 +30,7 @@ fi
AC_CHECK_SIZEOF([unsigned long])
AC_C_BIGENDIAN
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.9])
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.10])
AC_CHECK_LIB(gnutls, gnutls_pkcs11_reinit, [
AC_DEFINE([HAVE_PKCS11], [], [PKCS11 detected in gnutls])
])

5
src/main-resume.c
View File

@@ -186,16 +186,13 @@ time_t now, exp;
cache = htable_first(&s->tls_db->ht, &iter);
while(cache != NULL) {
#if GNUTLS_VERSION_NUMBER >= 0x030107
gnutls_datum_t d;
d.data = (void*)cache->session_data;
d.size = cache->session_data_size;
exp = gnutls_db_check_entry_time(&d);
#else
exp = 0;
#endif
if (now-exp > TLS_SESSION_EXPIRATION_TIME) {
cache->session_data_size = 0;
cache->session_id_size = 0;

5
src/sec-mod.c
View File

@@ -282,12 +282,9 @@ int sd;
data.data = &buffer[2];
data.size = ret - 2;
#if GNUTLS_VERSION_NUMBER >= 0x03010a
if (type == 'S') {
ret = gnutls_privkey_sign_raw_data(key[i], 0, &data, &out);
} else
#endif
if (type == 'D') {
} else if (type == 'D') {
ret = gnutls_privkey_decrypt_data(key[i], 0, &data, &out);
} else {
syslog(LOG_ERR, "unknown type 0x%.2x", type);

18
src/tlslib.c
View File

@@ -211,7 +211,6 @@ static int verify_certificate_cb(gnutls_session_t session)
}
if (status != 0) {
#if GNUTLS_VERSION_NUMBER > 0x030106
gnutls_datum_t out;
int type = gnutls_certificate_type_get(session);
@@ -224,9 +223,6 @@ static int verify_certificate_cb(gnutls_session_t session)
oclog(ws, LOG_INFO, "client certificate verification failed: %s", out.data);
gnutls_free(out.data);
#else
oclog(ws, LOG_INFO, "client certificate verification failed");
#endif
goto fail;
} else {
@@ -268,9 +264,7 @@ unsigned usage;
if (s->config->cert_size > 1)
return;
#if GNUTLS_VERSION_NUMBER > 0x030100
if (gnutls_url_is_supported(s->config->cert[0]) == 0) {
#endif
/* no URL */
ret = gnutls_load_file(s->config->cert[0], &data);
if (ret < 0)
@@ -294,9 +288,7 @@ unsigned usage;
mslog(s, NULL, LOG_WARNING, "no DH-params file specified; server will be limited to ECDHE ciphersuites\n");
}
}
#if GNUTLS_VERSION_NUMBER > 0x030100
}
#endif
cleanup:
gnutls_x509_crt_deinit(crt);
@@ -406,16 +398,12 @@ error:
}
#if GNUTLS_VERSION_NUMBER >= 0x03010a
static
int key_cb_sign_func (gnutls_privkey_t key, void* userdata, const gnutls_datum_t * raw_data,
gnutls_datum_t * signature)
{
return key_cb_common_func(key, userdata, raw_data, signature, 'S');
}
#else
# define key_cb_sign_func NULL
#endif
static int key_cb_decrypt_func(gnutls_privkey_t key, void* userdata, const gnutls_datum_t * ciphertext,
gnutls_datum_t * plaintext)
@@ -576,18 +564,12 @@ const char* perr;
void tls_cork(gnutls_session_t session)
{
#if GNUTLS_VERSION_NUMBER > 0x030109
gnutls_record_cork(session);
#endif
}
int tls_uncork(gnutls_session_t session)
{
#if GNUTLS_VERSION_NUMBER > 0x030109
return gnutls_record_uncork(session, GNUTLS_RECORD_WAIT);
#else
return 0;
#endif
}
void *calc_sha1_hash(char* file, unsigned cert)