git: 6a2d461fd331 - main - net/libsrtp2: Fix build with libressl 3.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Nov 2022 10:35:40 UTC
The branch main has been updated by zirias:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6a2d461fd331d781a757398ff80603936a83bdd3
commit 6a2d461fd331d781a757398ff80603936a83bdd3
Author: Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2022-10-17 11:32:00 +0000
Commit: Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2022-11-01 10:34:21 +0000
net/libsrtp2: Fix build with libressl 3.5
Approved by: tijl (maintainer), tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D37050
---
net/libsrtp2/files/patch-crypto_hash_hmac__ossl.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/net/libsrtp2/files/patch-crypto_hash_hmac__ossl.c b/net/libsrtp2/files/patch-crypto_hash_hmac__ossl.c
new file mode 100644
index 000000000000..248e6fda0403
--- /dev/null
+++ b/net/libsrtp2/files/patch-crypto_hash_hmac__ossl.c
@@ -0,0 +1,20 @@
+--- crypto/hash/hmac_ossl.c.orig 2022-10-17 11:30:42 UTC
++++ crypto/hash/hmac_ossl.c
+@@ -80,7 +80,7 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t *
+
+ /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
+ using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ {
+ /* allocate memory for auth and HMAC_CTX structures */
+ uint8_t *pointer;
+@@ -126,7 +126,7 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t
+
+ hmac_ctx = (HMAC_CTX *)a->state;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ HMAC_CTX_cleanup(hmac_ctx);
+
+ /* zeroize entire state*/