From ec935f3306fa82442e3a19ceb3f620b837418a93 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Thu, 30 Apr 2015 06:36:40 +0000 Subject: [PATCH] Fix build when use old GnuTLS release (< 3.1) FossilOrigin-Name: a707b54e17b5c62455abfdc7857ee9b4196f963848ff5401d9099ac8aeaa9eb9 --- src/capwap/dtls_gnutls.c | 4 ++++ src/capwap/dtls_gnutls_connect.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/capwap/dtls_gnutls.c b/src/capwap/dtls_gnutls.c index 99f0d7bc..81ed2027 100644 --- a/src/capwap/dtls_gnutls.c +++ b/src/capwap/dtls_gnutls.c @@ -117,7 +117,11 @@ struct dtls_gnutls_data *dtls_gnutls_data_create(struct conn *conn,int config) int bits; +#if GNUTLS_VERSION_NUMBER >= 0x030100 bits = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, GNUTLS_SEC_PARAM_INSECURE); +#elseif + bits = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, GNUTLS_SEC_PARAM_WEAK); +#endif /* Generate Diffie-Hellman parameters - for use with DHE * kx algorithms. When short bit length is used, it might * be wise to regenerate parameters often. diff --git a/src/capwap/dtls_gnutls_connect.c b/src/capwap/dtls_gnutls_connect.c index 4bbd63c1..619ff7d2 100644 --- a/src/capwap/dtls_gnutls_connect.c +++ b/src/capwap/dtls_gnutls_connect.c @@ -17,9 +17,11 @@ int dtls_gnutls_connect(struct conn *conn) d = dtls_gnutls_data_create(conn,GNUTLS_CLIENT | GNUTLS_DATAGRAM | GNUTLS_NONBLOCK); // gnutls_dh_set_prime_bits(d->session, 512); - gnutls_handshake_set_timeout(d->session,GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT); +#if GNUTLS_VERSION_NUMBER >= 0x030100 + gnutls_handshake_set_timeout(d->session,GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT); gnutls_dtls_set_data_mtu(d->session,1500); +#endif gnutls_dtls_set_mtu(d->session,1500); int rc;