Changeset 5623 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

Timestamp:

Jul 7, 2017 2:52:44 AM (7 years ago)

Author:

nanang

Message:

Close #1999: Support OpenSSL 1.1.0 with backward compatibility setting turned of (no deprecated APIs).

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -28 +28 @@
  * Include OpenSSL headers
  */
+#include <openssl/bn.h>
+#include <openssl/err.h>
+#include <openssl/rsa.h>
 #include <openssl/ssl.h>
-#include <openssl/err.h>
-
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#  define X509_get_notBefore(x)     X509_getm_notBefore(x)
+#  define X509_get_notAfter(x)      X509_getm_notAfter(x)
+#endif
 
 /* Set to 1 to enable DTLS-SRTP debugging */
@@ -370 +376 @@
         
     /* Create DTLS context */
-    ctx = SSL_CTX_new(DTLSv1_method());
+    ctx = SSL_CTX_new(DTLS_method());
     if (ctx == NULL) {
         return GET_SSL_STATUS(ds);
@@ -1032 +1038 @@
 {
     dtls_srtp *ds = (dtls_srtp *)tp;
-    pjmedia_sdp_media *m_rem, *m_loc;
+    pjmedia_sdp_media *m_loc;
     pjmedia_sdp_attr *a;
     pj_bool_t use_ice = PJ_FALSE;
@@ -1043 +1049 @@
     PJ_UNUSED_ARG(sdp_pool);
 
-    m_rem = sdp_remote ? sdp_remote->media[media_index] : NULL;
     m_loc = sdp_local->media[media_index];
     if (ds->srtp->offerer_side) {
@@ -1186 +1191 @@
 {
     dtls_srtp *ds = (dtls_srtp *)tp;
-    pjmedia_sdp_media *m_rem, *m_loc;
     pj_ice_strans_state ice_state;
     pj_status_t status = PJ_SUCCESS;
@@ -1195 +1199 @@
 
     PJ_UNUSED_ARG(tmp_pool);
-
-    m_rem = sdp_remote->media[media_index];
-    m_loc = sdp_local->media[media_index];
+    PJ_UNUSED_ARG(sdp_local);
 
     if (ds->srtp->offerer_side) {