[packages/mpeg4ip] - adjusted srtp patch for srtp 1.5.x

[qboosh]

commit 60df32e5cc2f21e19db08a94cf4e7af214a2d063
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Aug 5 22:12:50 2015 +0200

    - adjusted srtp patch for srtp 1.5.x

 mpeg4ip-srtp.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 mpeg4ip.spec       |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/mpeg4ip.spec b/mpeg4ip.spec
index 9f7381a..759bcdc 100644
--- a/mpeg4ip.spec
+++ b/mpeg4ip.spec
@@ -49,7 +49,7 @@ BuildRequires:	libx264-devel
 BuildRequires:	nasm >= 0.98.19
 %endif
 BuildRequires:	pkgconfig
-BuildRequires:	srtp-devel >= 1.4.2
+BuildRequires:	srtp-devel >= 1.5
 BuildRequires:	xvid-devel >= 1:1.0.0
 BuildConflicts:	faad2 < 2.0-3
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
diff --git a/mpeg4ip-srtp.patch b/mpeg4ip-srtp.patch
index e0fa782..77c4a37 100644
--- a/mpeg4ip-srtp.patch
+++ b/mpeg4ip-srtp.patch
@@ -9,3 +9,48 @@
    if ( rc != err_status_ok ) {
        fprintf(stdout," - init cipher for session %d FAILED  rc = %d\n", session,
                                       rc );
+@@ -888,7 +888,7 @@
+    if ( sp->sample_count == 1 ) {
+        memset(nonce,0,AES_KEY_LEN);
+        //rc=aes_icm_set_segment(sp->cp->state, 0); // defunct function.
+-       rc=aes_icm_set_iv(sp->cp->state, nonce);
++       rc=aes_icm_set_iv(sp->cp->state, nonce, direction_encrypt);
+    }
+ 
+    // length will not be updated in calling function (obviously) awv.
+@@ -939,7 +939,7 @@
+   if ( sp->sample_count == 1 ) {
+       memset(nonce,0,AES_KEY_LEN);
+       //rc=aes_icm_set_segment(sp->cp->state, 0); // defunct function.
+-      rc=aes_icm_set_iv(sp->cp->state, nonce);
++      rc=aes_icm_set_iv(sp->cp->state, nonce, direction_encrypt);
+   }
+ 
+   // length will not be updated in calling function (obviously) awv.
+@@ -1015,7 +1015,7 @@
+   if ( sp->sample_count == 1 ) {
+       memset(nonce,0,AES_KEY_LEN);
+       //rc=aes_icm_set_segment(sp->cp->state, 0); // defunct function.
+-      rc=aes_icm_set_iv(sp->cp->state, nonce);
++      rc=aes_icm_set_iv(sp->cp->state, nonce, direction_encrypt);
+   }
+ #endif
+ 
+@@ -1076,7 +1076,7 @@
+        memset(nonce,0,AES_KEY_LEN);
+        *((uint32_t *)(&nonce[12])) = htonl(counter);
+ #ifdef HAVE_SRTP
+-       rc=aes_icm_set_iv(sp->cp->state, nonce);
++       rc=aes_icm_set_iv(sp->cp->state, nonce, direction_encrypt);
+        rc=aes_icm_encrypt_ismacryp(sp->cp->state, fakedata, &remainder, 1);
+ #endif
+ 
+@@ -1088,7 +1088,7 @@
+   memset(nonce,0,AES_KEY_LEN);
+   *((uint32_t *)(&nonce[12])) = htonl(counter);
+ #ifdef HAVE_SRTP
+-  rc=aes_icm_set_iv(sp->cp->state, nonce);
++  rc=aes_icm_set_iv(sp->cp->state, nonce, direction_encrypt);
+   // set the number of bytes the previous key should decrypt 
+   ((aes_icm_ctx_t *)(sp->cp->state))->bytes_in_buffer = remainder;
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mpeg4ip.git/commitdiff/60df32e5cc2f21e19db08a94cf4e7af214a2d063