Changeset 5623

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

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (6 diffs)
• pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (6 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -116 +116 @@
 #  define M_ASN1_STRING_data(x)     ASN1_STRING_get0_data(x)
 #  define M_ASN1_STRING_length(x)   ASN1_STRING_length(x)
+#  define X509_get_notBefore(x)     X509_get0_notBefore(x)
+#  define X509_get_notAfter(x)      X509_get0_notAfter(x)
 #else
 #  define SSL_CIPHER_get_id(c)      (c)->id
@@ -405 +407 @@
 
     /* Init OpenSSL lib */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     SSL_library_init();
     SSL_load_error_strings();
+#else
+    OPENSSL_init_ssl(0, NULL);
+#endif
 #if OPENSSL_VERSION_NUMBER < 0x009080ffL
     /* This is now synonym of SSL_library_init() */
@@ -422 +428 @@
         const char *cname;
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
         meth = (SSL_METHOD*)SSLv23_server_method();
         if (!meth)
@@ -433 +440 @@
             meth = (SSL_METHOD*)SSLv2_server_method();
 #endif
+
+#else
+        /* Specific version methods are deprecated in 1.1.0 */
+        meth = (SSL_METHOD*)TLS_method();
+#endif
+
         pj_assert(meth);
 
@@ -650 +663 @@
 
     /* Determine SSL method to use */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     switch (ssock->param.proto) {
     case PJ_SSL_SOCK_PROTO_TLS1:
@@ -665 +679 @@
         break;
     }
+#else
+    /* Specific version methods are deprecated in 1.1.0 */
+    ssl_method = (SSL_METHOD*)TLS_method();
+#endif
 
     if (!ssl_method) {

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) {