planix.org
/
actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3 from alagoutte/gnutls 

Fix build when use old GnuTLS release (< 3.1)

FossilOrigin-Name: 141e606f8216f459814350606f11b8071f7e1dc9dd9f521e6d125e663401a6fc
This commit is contained in:
7u83@mail.ru 2015-04-30 16:50:54 +00:00
parent 2654150107 ec935f3306
commit e4019e7a26
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/capwap/dtls_gnutls.c
View File

@ -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.

4
src/capwap/dtls_gnutls_connect.c
View File

@ -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;