CAPWAP_CIPHER moved here

FossilOrigin-Name: d113320421b69726a3566c4925e7583364c2e688aed36d0f91780b77762779cb
This commit is contained in:
7u83@mail.ru 2018-04-03 22:11:59 +00:00
parent 526c0da605
commit a125fa2754
2 changed files with 8 additions and 1 deletions

View File

@ -169,7 +169,7 @@ struct dtls_gnutls_data *dtls_gnutls_data_create(struct conn *conn,int config)
#if GNUTLS_VERSION_NUMBER >= 0x030100
bits = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, GNUTLS_SEC_PARAM_INSECURE);
#else
*/ bits = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, GNUTLS_SEC_PARAM_HIGH);
*/ bits = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, GNUTLS_SEC_PARAM_LEGACY);
/*#endif*/
/* Generate Diffie-Hellman parameters - for use with DHE
@ -177,7 +177,11 @@ struct dtls_gnutls_data *dtls_gnutls_data_create(struct conn *conn,int config)
* be wise to regenerate parameters often.
*/
gnutls_dh_params_init(&d->dh_params);
cw_dbg(DBG_DTLS,"Generating DH params, %d",bits);
gnutls_dh_params_generate2(d->dh_params, bits);
cw_dbg(DBG_DTLS,"DH params generated, %d",bits);
gnutls_certificate_set_dh_params(d->x509_cred, d->dh_params);

View File

@ -45,6 +45,9 @@ struct dtls_openssl_data{
extern int dtls_openssl_init();
#define CAPWAP_CIPHER "ALL"
struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SSL_METHOD * method, BIO_METHOD * bio);
extern int dtls_openssl_psk_key2bn(const char *psk_key, unsigned char *psk, unsigned int max_psk_len);
extern int dtls_openssl_generate_cookie(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len);