srtp: updated to 2.5.0 2.5.0 - Make mbedtls hmac less restrictive in line with RFC and library capabilities - Allow overriding stream list implementation - update min openssl version to 1.1.0 - Openssl 3 support for EVP MAC - Add android build to CI - add CIFuzz Github action to workflows - Add policy_set_aes_cm_192_xxx symbols to def file - Use current directions in stream update test - Call `set_aad` and `get_tag` in AEAD performance tests - Create alias for srtp2 as libSRTP::srtp2 - Remove compatibility code for legacy OpenSSL to fix LibreSSL build - Export CMake Targets - Avoid initializing local char table when converting nibble to hex - EVP_CIPHER_CTX_cleanup() is deprecated in OpenSSL 1.1.0 - Correct null cipher key sizes and be more defensive - Include directory should point to 'include' not to 'include/srtp2' - Count blocks instead of bytes in AES-ICM limit computation - Rtp decoder support ssrc and roc - Use a full-length key even with null ciphers - Fix set ROC functionality with gcm 2.4.0 Major changes - Remove EKT files, this was never completed and the draft has since changed. - Adds support for Mbedtls as a crypto backend. - Support apple silicon build. - Adds support for the Meson build system. This is an alternative to Cmake and auto tools. Other changes - Improve OpenSSL KDF check. - Add void to function declarations for EVP_EncryptInit check. - Remove dead code. - Support running against nss >= 3.52. - Remove references to dtls from libsrtp. - Use nss based hmac when nss enabled. - Move selftest vectors form backends to common files. - Extend cmake support. - Fix gcc11 warning by defining output length. - Remove visual studio build files. - cmake: Set the VERSION property of the srtp2 library. - Fixed issue 499 with buffer overflow. - Feature/additional error checks. - Rework check for OPENSSL_cleanse(). - Avoid non-existing compiler flag -O4. - Fix two-byte RTP header extension encryption. - Modify cmake to install crypto_types.h instead of cipher_types.hdiff -r1.4 -r1.5 pkgsrc/comms/srtp/Makefile
(adam)
@@ -1,25 +1,25 @@ | @@ -1,25 +1,25 @@ | |||
1 | # $NetBSD: Makefile,v 1.4 2020/05/05 17:54:39 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.5 2023/02/15 12:23:30 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= srtp-2.3.0 | 3 | DISTNAME= srtp-2.5.0 | |
4 | CATEGORIES= comms security | 4 | CATEGORIES= comms security | |
5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=cisco/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=cisco/} | |
6 | GITHUB_PROJECT= libsrtp | 6 | GITHUB_PROJECT= libsrtp | |
7 | GITHUB_TAG= v${PKGVERSION_NOREV} | 7 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://github.com/cisco/libsrtp | 10 | HOMEPAGE= https://github.com/cisco/libsrtp | |
11 | COMMENT= Secure Real-time Transport Protocol library | 11 | COMMENT= Secure Real-time Transport Protocol library | |
12 | LICENSE= modified-bsd | 12 | LICENSE= modified-bsd | |
13 | 13 | |||
14 | USE_CMAKE= yes | |||
15 | USE_TOOLS+= gmake | |||
16 | PKGCONFIG_OVERRIDE= libsrtp2.pc.in | 14 | PKGCONFIG_OVERRIDE= libsrtp2.pc.in | |
17 | TEST_TARGET= test | 15 | TEST_TARGET= test | |
18 | 16 | |||
19 | CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON | 17 | CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON | |
18 | CMAKE_ARGS+= -DBUILD_WITH_WARNINGS=OFF | |||
20 | CMAKE_ARGS+= -DENABLE_OPENSSL=ON | 19 | CMAKE_ARGS+= -DENABLE_OPENSSL=ON | |
21 | 20 | |||
22 | LDFLAGS.SunOS+= -lsocket -lnsl | 21 | LDFLAGS.SunOS+= -lsocket -lnsl | |
23 | 22 | |||
23 | .include "../../devel/cmake/build.mk" | |||
24 | .include "../../security/openssl/buildlink3.mk" | 24 | .include "../../security/openssl/buildlink3.mk" | |
25 | .include "../../mk/bsd.pkg.mk" | 25 | .include "../../mk/bsd.pkg.mk" |
@@ -1,10 +1,12 @@ | @@ -1,10 +1,12 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2020/05/05 17:54:39 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2023/02/15 12:23:30 adam Exp $ | |
2 | include/srtp2/auth.h | 2 | include/srtp2/auth.h | |
3 | include/srtp2/cipher.h | 3 | include/srtp2/cipher.h | |
4 | include/srtp2/cipher_types.h | |||
5 | include/srtp2/crypto_types.h | 4 | include/srtp2/crypto_types.h | |
6 | include/srtp2/srtp.h | 5 | include/srtp2/srtp.h | |
6 | lib/cmake/libSRTP/libSRTPConfig.cmake | |||
7 | lib/cmake/libSRTP/libSRTPConfigVersion.cmake | |||
8 | lib/cmake/libSRTP/libSRTPTargets-noconfig.cmake | |||
9 | lib/cmake/libSRTP/libSRTPTargets.cmake | |||
7 | lib/libsrtp2.so | 10 | lib/libsrtp2.so | |
8 | lib/libsrtp2.so.${PKGVERSION} | 11 | lib/libsrtp2.so.${PKGVERSION} | |
9 | lib/libsrtp2.so.2 | |||
10 | lib/pkgconfig/libsrtp2.pc | 12 | lib/pkgconfig/libsrtp2.pc |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2021/10/26 10:06:06 nia Exp $ | 1 | $NetBSD: distinfo,v 1.8 2023/02/15 12:23:30 adam Exp $ | |
2 | 2 | |||
3 | BLAKE2s (srtp-2.3.0.tar.gz) = 89da9bdf742280f8088b69ae8f8a3184ed35fe3c8a67db1f1fd3d02a9aa7fead | 3 | BLAKE2s (srtp-2.5.0.tar.gz) = f5901a179289b5fef66b85e94f8005e722c193c652670b1de2adba5b3c47f07d | |
4 | SHA512 (srtp-2.3.0.tar.gz) = 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461 | 4 | SHA512 (srtp-2.5.0.tar.gz) = bd679ab65ccf22ca30fe867b9649a0b84cfa6fad6e22eb10f081141632f6dd56479a04d525b865f11fd46007303ca211065d9c170e4820d6ea7055403702340a | |
5 | Size (srtp-2.3.0.tar.gz) = 633819 bytes | 5 | Size (srtp-2.5.0.tar.gz) = 638704 bytes | |
6 | SHA1 (patch-CMakeLists.txt) = 26975bb773ab2729a0a7df45c44239cf5fb0fb6f | 6 | SHA1 (patch-CMakeLists.txt) = b8818d6d91e164eb2f008c6445e09312552161e3 |
@@ -1,39 +1,27 @@ | @@ -1,39 +1,27 @@ | |||
1 | $NetBSD: patch-CMakeLists.txt,v 1.1 2020/05/05 17:54:39 adam Exp $ | 1 | $NetBSD: patch-CMakeLists.txt,v 1.2 2023/02/15 12:23:31 adam Exp $ | |
2 | 2 | |||
3 | Set shared library version. | |||
4 | Prepare and install pkgconfig file. | 3 | Prepare and install pkgconfig file. | |
5 | Install crypto_types.h. | |||
6 | 4 | |||
7 | --- CMakeLists.txt.orig 2019-12-23 09:58:25.000000000 +0000 | 5 | --- CMakeLists.txt.orig 2023-02-01 07:25:02.000000000 +0000 | |
8 | +++ CMakeLists.txt | 6 | +++ CMakeLists.txt | |
9 | @@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 2.8) | 7 | @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.12) | |
10 | 8 | |||
11 | project(libsrtp2 LANGUAGES C) | 9 | project(libsrtp2 VERSION 2.5.0 LANGUAGES C) | |
12 | 10 | |||
13 | +set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") | 11 | +set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") | |
14 | set(PACKAGE_VERSION 2.3.0) | 12 | set(PACKAGE_VERSION ${CMAKE_PROJECT_VERSION}) | |
15 | +set(PACKAGE_SOVERSION 2) | 13 | set(PACKAGE_STRING "${CMAKE_PROJECT_NAME} ${CMAKE_PROJECT_VERSION}") | |
16 | set(PACKAGE_STRING "${CMAKE_PROJECT_NAME} ${PACKAGE_VERSION}") | |||
17 | 14 | |||
18 | include(TestBigEndian) | 15 | @@ -278,6 +279,12 @@ install(TARGETS srtp2 DESTINATION lib | |
19 | @@ -184,10 +186,20 @@ if(WIN32) | 16 | EXPORT libSRTPTargets | |
20 | target_link_libraries(srtp2 ws2_32) | 17 | ) | |
21 | endif() | |||
22 | 18 | |||
23 | +set(prefix "${CMAKE_INSTALL_PREFIX}") | 19 | +set(prefix "${CMAKE_INSTALL_PREFIX}") | |
24 | +set(libdir "\${exec_prefix}/lib") | 20 | +set(libdir "\${exec_prefix}/lib") | |
25 | +set(includedir "\${prefix}/include") | 21 | +set(includedir "\${prefix}/include") | |
26 | +configure_file(libsrtp2.pc.in libsrtp2.pc @ONLY) | 22 | +configure_file(libsrtp2.pc.in libsrtp2.pc @ONLY) | |
27 | +install(FILES libsrtp2.pc DESTINATION lib/pkgconfig) | 23 | +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libsrtp2.pc DESTINATION lib/pkgconfig) | |
28 | + | 24 | + | |
29 | +set_target_properties(srtp2 PROPERTIES | |||
30 | + VERSION ${PACKAGE_VERSION} SOVERSION ${PACKAGE_SOVERSION}) | |||
31 | + | |||
32 | install(TARGETS srtp2 DESTINATION lib) | |||
33 | install(FILES include/srtp.h crypto/include/auth.h | 25 | install(FILES include/srtp.h crypto/include/auth.h | |
34 | crypto/include/cipher.h | 26 | crypto/include/cipher.h | |
35 | crypto/include/cipher_types.h | 27 | crypto/include/crypto_types.h | |
36 | + crypto/include/crypto_types.h | |||
37 | DESTINATION include/srtp2) | |||
38 | ||||
39 | if(TEST_APPS) |