kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #608 in FS/freeswitch from ~SJTHOMASON/freeswitch:feature/FS-8568 to master 

* commit 'e31a8999c750fdc8ee95b413274114521d6c6075':
  Allow building using system OpenSSL without EC support
This commit is contained in:
Mike Jerris 2015-11-25 10:50:29 -06:00
parent e111c72790 e31a8999c7
commit 9dede690e1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_rtp.c
View File

@ -3259,7 +3259,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_dtls(switch_rtp_t *rtp_session, d
const char *kind = ""; const char *kind = "";
BIO *bio; BIO *bio;
DH *dh; DH *dh;
#ifndef OPENSSL_NO_EC
EC_KEY* ecdh; EC_KEY* ecdh;
#endif
#ifndef HAVE_OPENSSL_DTLS_SRTP #ifndef HAVE_OPENSSL_DTLS_SRTP
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -3367,6 +3369,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_dtls(switch_rtp_t *rtp_session, d
SSL_set_read_ahead(dtls->ssl, 1); SSL_set_read_ahead(dtls->ssl, 1);
//SSL_set_verify(dtls->ssl, (SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT), cb_verify_peer); //SSL_set_verify(dtls->ssl, (SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT), cb_verify_peer);
#ifndef OPENSSL_NO_EC
ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
if (!ecdh) { if (!ecdh) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -3374,6 +3377,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_dtls(switch_rtp_t *rtp_session, d
SSL_set_options(dtls->ssl, SSL_OP_SINGLE_ECDH_USE); SSL_set_options(dtls->ssl, SSL_OP_SINGLE_ECDH_USE);
SSL_set_tmp_ecdh(dtls->ssl, ecdh); SSL_set_tmp_ecdh(dtls->ssl, ecdh);
EC_KEY_free(ecdh); EC_KEY_free(ecdh);
#endif
SSL_set_verify(dtls->ssl, SSL_VERIFY_NONE, NULL); SSL_set_verify(dtls->ssl, SSL_VERIFY_NONE, NULL);
SSL_set_app_data(dtls->ssl, dtls); SSL_set_app_data(dtls->ssl, dtls);