jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

GnuTLS: Remove old version number checks for 1.3.2

Browse source 
No one should be using GnuTLS versions older than 1.3.2 from 2006
anymore, so remove these unnecessary #if/#endif checks.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-01-11 11:13:20 +02:00
parent ae0a23a0ca
commit e1d63f6aea
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/crypto/tls_gnutls.c
View file

@ -449,7 +449,6 @@ int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn,
int pkcs12_ok = 0; int pkcs12_ok = 0;
#ifdef PKCS12_FUNCS #ifdef PKCS12_FUNCS
/* Try to load in PKCS#12 format */ /* Try to load in PKCS#12 format */
#if LIBGNUTLS_VERSION_NUMBER >= 0x010302
ret = gnutls_certificate_set_x509_simple_pkcs12_file( ret = gnutls_certificate_set_x509_simple_pkcs12_file(
conn->xcred, params->private_key, GNUTLS_X509_FMT_DER, conn->xcred, params->private_key, GNUTLS_X509_FMT_DER,
params->private_key_passwd); params->private_key_passwd);
@ -459,7 +458,6 @@ int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn,
return -1; return -1;
} else } else
pkcs12_ok = 1; pkcs12_ok = 1;
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x010302 */
#endif /* PKCS12_FUNCS */ #endif /* PKCS12_FUNCS */
if (!pkcs12_ok) { if (!pkcs12_ok) {
@ -560,7 +558,6 @@ int tls_global_set_params(void *tls_ctx,
int pkcs12_ok = 0; int pkcs12_ok = 0;
#ifdef PKCS12_FUNCS #ifdef PKCS12_FUNCS
/* Try to load in PKCS#12 format */ /* Try to load in PKCS#12 format */
#if LIBGNUTLS_VERSION_NUMBER >= 0x010302
ret = gnutls_certificate_set_x509_simple_pkcs12_file( ret = gnutls_certificate_set_x509_simple_pkcs12_file(
global->xcred, params->private_key, global->xcred, params->private_key,
GNUTLS_X509_FMT_DER, params->private_key_passwd); GNUTLS_X509_FMT_DER, params->private_key_passwd);
@ -570,7 +567,6 @@ int tls_global_set_params(void *tls_ctx,
goto fail; goto fail;
} else } else
pkcs12_ok = 1; pkcs12_ok = 1;
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x010302 */
#endif /* PKCS12_FUNCS */ #endif /* PKCS12_FUNCS */
if (!pkcs12_ok) { if (!pkcs12_ok) {
@ -639,15 +635,11 @@ int tls_connection_prf(void *tls_ctx, struct tls_connection *conn,
const char *label, int server_random_first, const char *label, int server_random_first,
u8 *out, size_t out_len) u8 *out, size_t out_len)
{ {
#if LIBGNUTLS_VERSION_NUMBER >= 0x010302
if (conn == NULL || conn->session == NULL) if (conn == NULL || conn->session == NULL)
return -1; return -1;
return gnutls_prf(conn->session, os_strlen(label), label, return gnutls_prf(conn->session, os_strlen(label), label,
server_random_first, 0, NULL, out_len, (char *) out); server_random_first, 0, NULL, out_len, (char *) out);
#else /* LIBGNUTLS_VERSION_NUMBER >= 0x010302 */
return -1;
#endif /* LIBGNUTLS_VERSION_NUMBER >= 0x010302 */
} }