Changeset 5079

Timestamp:

Apr 23, 2015 11:58:22 PM (8 years ago)

Author:

ming

Message:

Re #1843: Add support if app uses external libSRTP 1.5.x or above (thanks to Alexander Traud for the patch)

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -31 +31 @@
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
 
+#if defined(PJ_HAS_SSL_SOCK) && (PJ_HAS_SSL_SOCK != 0)
+#  include <openssl/rand.h>
+
+/* Suppress compile warning of OpenSSL deprecation (OpenSSL is deprecated
+ * since MacOSX 10.7).
+ */
+#if defined(PJ_DARWINOS) && PJ_DARWINOS==1
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#endif
+
 #if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0)
 #  include <srtp/srtp.h>
+#  include <srtp/crypto_kernel.h>
 #else
 #  include <srtp.h>
@@ -1085 +1098 @@
             key_ok = PJ_TRUE;
 
+
+#if defined(PJ_HAS_SSL_SOCK) && (PJ_HAS_SSL_SOCK != 0)
+            err = RAND_bytes((unsigned char*)key,
+                             crypto_suites[cs_idx].cipher_key_len);
+            if (err != 1) {
+                PJ_LOG(5,(THIS_FILE, "Failed generating random key"));
+                return PJMEDIA_ERRNO_FROM_LIBSRTP(1);
+            }
+#else       
             err = crypto_get_random((unsigned char*)key,
                                      crypto_suites[cs_idx].cipher_key_len);
@@ -1092 +1114 @@
                 return PJMEDIA_ERRNO_FROM_LIBSRTP(err);
             }
+#endif
             for (i=0; i<crypto_suites[cs_idx].cipher_key_len && key_ok; ++i)
                 if (key[i] == 0) key_ok = PJ_FALSE;