libsrtp First release

2021-04-05 11:41:58 +03:00
parent 354b498647
commit 1ce70cf203
11 changed files with 315 additions and 18 deletions
@@ -0,0 +1,36 @@
+diff -up libsrtp-2.3.0/Makefile.in.sharedfix libsrtp-2.3.0/Makefile.in
+--- libsrtp-2.3.0/Makefile.in.sharedfix	2020-01-07 09:48:36.004217062 -0500
+++ libsrtp-2.3.0/Makefile.in	2020-01-07 09:53:08.117725096 -0500
+@@ -106,12 +106,14 @@ bindir = @bindir@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libsrtp2.pc
+ 
+-SHAREDLIBVERSION = 1
+SHAREDLIBMINIVER = 1
+SHAREDLIBVERSION = $(SHAREDLIBMINIVER).0.0
+ ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@)))
+ SHAREDLIB_DIR = $(libdir)
+-SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@
+ SHAREDLIBSUFFIXNOVER = so
+SHAREDLIBMINISUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBMINIVER)
+ SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION)
+SHAREDLIB_LDFLAGS = -shared -Wl,-soname,libsrtp2.$(SHAREDLIBMINISUFFIX)
+ else ifneq (,$(or $(findstring cygwin,@host@), $(findstring mingw,@host@)))
+ SHAREDLIB_DIR = $(bindir)
+ SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp2.dll.a
+@@ -166,6 +168,7 @@ libsrtp2.$(SHAREDLIBSUFFIX): $(srtpobj)
+ 	$(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \
+ 				$^ $(LDFLAGS) $(LIBS)
+ 	if [ -n "$(SHAREDLIBVERSION)" ]; then \
+		ln -sfn $@ libsrtp2.$(SHAREDLIBMINISUFFIX); \
+ 		ln -sfn $@ libsrtp2.$(SHAREDLIBSUFFIXNOVER); \
+ 	fi
+ 
+@@ -288,6 +291,7 @@ install:
+ 		cp libsrtp2.$(SHAREDLIBSUFFIXNOVER) $(DESTDIR)$(SHAREDLIB_DIR)/; \
+ 		if [ -n "$(SHAREDLIBVERSION)" ]; then \
+ 			ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBSUFFIXNOVER); \
+			ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBMINISUFFIX); \
+ 		fi; \
+ 	fi
+ 	$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
@@ -0,0 +1,13 @@
+diff -up libsrtp-2.3.0/Makefile.in.test-shared libsrtp-2.3.0/Makefile.in
+--- libsrtp-2.3.0/Makefile.in.test-shared	2020-10-12 16:00:39.065842309 -0400
+++ libsrtp-2.3.0/Makefile.in	2020-10-12 16:01:11.244097667 -0400
+@@ -196,7 +196,7 @@ ifeq (1, $(HAVE_PCAP))
+ testapp += test/rtp_decoder$(EXE)
+ endif
+ 
+-$(testapp): libsrtp2.a
+$(testapp): libsrtp2.$(SHAREDLIBSUFFIX)
+ 
+ test/rtpw$(EXE): test/rtpw.c test/rtp.c test/util.c test/getopt_s.c \
+ 		crypto/math/datatypes.c
+diff -up libsrtp-2.3.0/Makefile.test-shared libsrtp-2.3.0/Makefile
@@ -0,0 +1,12 @@
+diff -r -u libsrtp-2.3.0.orig/test/util.c libsrtp-2.3.0/test/util.c
+--- libsrtp-2.3.0.orig/test/util.c	2019-12-23 10:58:25.000000000 +0100
+++ libsrtp-2.3.0/test/util.c	2020-10-09 11:56:31.455502870 +0200
+@@ -49,7 +49,7 @@
+ #include <stdint.h>
+ 
+ /* include space for null terminator */
+-char bit_string[MAX_PRINT_STRING_LEN + 1];
+static char bit_string[MAX_PRINT_STRING_LEN + 1];
+ 
+ static inline int hex_char_to_nibble(uint8_t c)
+ {
@@ -0,0 +1,24 @@
+From 55299517f39e2e1a34df05c27cbc9898071ac9db Mon Sep 17 00:00:00 2001
+From: Lennart Grahl <lennart.grahl@gmail.com>
+Date: Mon, 18 May 2020 18:01:08 +0200
+Subject: [PATCH] Fix two-byte RTP header extension encryption
+
+Also ignores the application bits as required by RFC 8285, sec 4.3
+Fixes #490
+---
+ srtp/srtp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/srtp/srtp.c b/srtp/srtp.c
+index b45cee0f..176b01f0 100644
+--- a/srtp/srtp.c
+++ b/srtp/srtp.c
+@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption(
+                 xtn_hdr_data++;
+             }
+         }
+-    } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) {
+    } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) {
+         /* RFC 5285, section 4.3. Two-Byte Header */
+         while (xtn_hdr_data + 1 < xtn_hdr_end) {
+             uint8_t xid = *xtn_hdr_data;