rpms/libsrtp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix NSS incompatibility, thanks to George Joseph

Browse Source
This commit is contained in:
Tom spot Callaway 2021-04-15 14:06:29 -04:00
parent 8837b3ea53
commit 7a955adae9
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libsrtp-2.3.0-nss-3.63-fix.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up libsrtp-2.3.0/crypto/include/aes_gcm.h.nssfix libsrtp-2.3.0/crypto/include/aes_gcm.h
--- libsrtp-2.3.0/crypto/include/aes_gcm.h.nssfix 2021-04-15 13:47:08.667150587 -0400
+++ libsrtp-2.3.0/crypto/include/aes_gcm.h 2021-04-15 13:47:26.991294515 -0400
@@ -66,6 +66,8 @@ typedef struct {
#ifdef NSS
+#define NSS_PKCS11_2_0_COMPAT 1
+
#include <nss.h>
#include <pk11pub.h>
diff -up libsrtp-2.3.0/crypto/include/aes_icm_ext.h.nssfix libsrtp-2.3.0/crypto/include/aes_icm_ext.h
--- libsrtp-2.3.0/crypto/include/aes_icm_ext.h.nssfix 2021-04-15 13:47:36.617370124 -0400
+++ libsrtp-2.3.0/crypto/include/aes_icm_ext.h 2021-04-15 13:59:50.074073286 -0400
@@ -65,6 +65,8 @@ typedef struct {
#ifdef NSS
+#define NSS_PKCS11_2_0_COMPAT 1
+
#include <nss.h>
#include <pk11pub.h>

9
libsrtp.spec
View File

@ -2,7 +2,7 @@
Name: libsrtp
Version: 2.3.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: An implementation of the Secure Real-time Transport Protocol (SRTP)
License: BSD
URL: https://github.com/cisco/libsrtp
@ -15,6 +15,9 @@ Patch0: libsrtp-2.3.0-shared-fix.patch
Patch1: libsrtp-2.3.0-test-util.patch
# Link test binaries against shared lib
Patch2: libsrtp-2.3.0-shared-test-fix.patch
# Fix issue with NSS 3.63 incompatibility
# credit to George Joseph
Patch3: libsrtp-2.3.0-nss-3.63-fix.patch
%description
This package provides an implementation of the Secure Real-time
@ -42,6 +45,7 @@ Tools for testing and decoding SRTP
%patch0 -p1 -b .sharedfix
%patch1 -p1 -b .utilfix
%patch2 -p1 -b .test-shared-fix
%patch3 -p1 -b .nssfix
%if 0%{?rhel} > 0
%ifarch ppc64
@ -84,6 +88,9 @@ install -D -p -m 0755 test/test_srtp %{buildroot}%{_bindir}/test_srtp
%{_bindir}/*
%changelog
* Thu Apr 15 2021 Tom Callaway <spot@fedoraproject.org> - 2.3.0-6
- fix NSS incompatibility, thanks to George Joseph
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild