[Pkg-voip-commits] [pjproject] 11/13: merge patched into master

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository pjproject.

commit 3693efc6e8905e2522b459ec284c60042890a25a
Merge: e0ec497 1e1e308
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sun Aug 2 19:11:21 2015 +0300

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...Use-the-OpenSSL-RNG-if-available-for-SRTP.patch | 62 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pjmedia/src/pjmedia/transport_srtp.c               | 23 ++++++++
 4 files changed, 88 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 67cc1b6,0000000..d9ca0eb
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ba4f81c07541cae77808b589b687ac9f98c4968d
- ba4f81c07541cae77808b589b687ac9f98c4968d
++1e1e3085f4541a11c3b6688476047218783fb4ba
++1e1e3085f4541a11c3b6688476047218783fb4ba
 +def680d5e127e3964d3b965931d9588a6b87170d
 +def680d5e127e3964d3b965931d9588a6b87170d
 +pjproject_2.4~dfsg.orig.tar.bz2
 +5c8ab2ae101bafb132bf84a34159ac1371618b46
 +4429619
diff --cc debian/patches/0007-Use-the-OpenSSL-RNG-if-available-for-SRTP.patch
index 0000000,0000000..260f35f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Use-the-OpenSSL-RNG-if-available-for-SRTP.patch
@@@ -1,0 -1,0 +1,62 @@@
++From 1e1e3085f4541a11c3b6688476047218783fb4ba Mon Sep 17 00:00:00 2001
++From: Liong Sauw Ming <ming at teluu.com>
++Date: Thu, 23 Apr 2015 23:58:22 +0000
++Subject: Use the OpenSSL RNG if available for SRTP
++
++The SRTP internal RNG interface (crypto_get_random()) has been
++derecated and is probably not good enough. Use one from OpenSSL, if
++possible.
++---
++ pjmedia/src/pjmedia/transport_srtp.c | 23 +++++++++++++++++++++++
++ 1 file changed, 23 insertions(+)
++
++diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c
++index 29fcb03..1887a89 100644
++--- a/pjmedia/src/pjmedia/transport_srtp.c
+++++ b/pjmedia/src/pjmedia/transport_srtp.c
++@@ -30,8 +30,21 @@
++ 
++ #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>
++ #endif
++@@ -1084,6 +1097,15 @@ static pj_status_t generate_crypto_attr_value(pj_pool_t *pool,
++ 	do {
++ 	    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);
++ 	    if (err != err_status_ok) {
++@@ -1091,6 +1113,7 @@ static pj_status_t generate_crypto_attr_value(pj_pool_t *pool,
++ 			  get_libsrtp_errstr(err)));
++ 		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;
++ 
diff --cc debian/patches/series
index 8fc0a99,0000000..ef764f6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +0001-Remove-pointless-linking-with-libasound.patch
 +0002-Reduce-number-of-libraries-linked-with-pjlib.patch
 +0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
 +0004-Enable-building-python-bindings.patch
 +0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
 +0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
++0007-Use-the-OpenSSL-RNG-if-available-for-SRTP.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git