From nobody Tue Nov 01 10:35:40 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N1md84yMqz4gxRG; Tue, 1 Nov 2022 10:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N1md84MjHz3MNY; Tue, 1 Nov 2022 10:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667298940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykq+LtPHFo/tQWcloSxiFSVFJwWLw1QLG1V6gqRzhVM=; b=fPXiu75pdSv5QWWrkV7YkVYG1PpC07QN3/1JkzGnDy5z0UTiP4dEvrK3cR6PVq4GZiGgpl 2h1CrF8qiB9fXfJxkCPRMZbKRSRg8gTsDvqf3/JbK1gSeaB02YRJtjcELFWsDi34puvE0C RbyTBzFDyJ4vHmtRNUbxF+2uBEuTZLu7kCRxdmXmN6fEuVumyRyFd+ypLjD0Dyp9fUAX99 KJ3nSn3aEgGH6nqbLuABp1NM4u/ILtCTYa0x1N98RsTGs5vyVTr3Vpu2E1/Hz+tZ+MV0S2 OlKJ9n9yzKiWWbJq9g1DyzFM2aM4PEeNzWg5Oxwf4QZPXqNura0Pu2UesqAn/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N1md83Mxzz1C48; Tue, 1 Nov 2022 10:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A1AZek1076593; Tue, 1 Nov 2022 10:35:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1AZeWQ076592; Tue, 1 Nov 2022 10:35:40 GMT (envelope-from git) Date: Tue, 1 Nov 2022 10:35:40 GMT Message-Id: <202211011035.2A1AZeWQ076592@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 6a2d461fd331 - main - net/libsrtp2: Fix build with libressl 3.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a2d461fd331d781a757398ff80603936a83bdd3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667298940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykq+LtPHFo/tQWcloSxiFSVFJwWLw1QLG1V6gqRzhVM=; b=FZuBVN9gXvdpP17uHWANXz8pheYp8I52iBQivItjNreEJSosDg/GCrN04DzQB4Z89syrOJ m7L2EnVM1Zep0q8ncgDqfkhqs8VdTa/khpTcnz8uOxDPd84og3a+hoiQYrPyr6O8sGfOtJ Sh724YtpFHdQCRfbYeFcbwwrP10+uxcIzRzQ3i6BpCi4MtdJ1dJBAgWuLqDn87LopfF470 bo+yU/Oy2eyxmH+6nAdsataETIEiXTv7ue3YFdU4jawvsVbwj+Wk2v+jaLO22wqiFSPqSG I2/sM1aA2CdREhmKKkakOuLMwudWeZwVUxWqpPYmqHDRZTRHWEdIMLorJnAqnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667298940; a=rsa-sha256; cv=none; b=N9GG/3AyR2uiz5SxwKFgEq0sBqqPDMrTB0lJUlgsVHFFLpYJF19HkJDGg5zDzQCk+J5F5G STjMgem4Dmxbh8AUkvg8/3QwwmYY7lGIjN5vt7eHf/OMLy2lvvQWcKbUAnZePKmaHQGDYk NdRNbojEhHOd9D5uE9dKYO9ozqBQCRbe5xcTQVHlYGLZmAWjhJmZXId5fp09K+rqfv6Vww idjJpk7WrHZ1OwhUnN21GZ+9EGi+qFEdIN7lVD7k6bjewSI+B6mG+0tN/JxXYvp5Iz9bAM MULWsdWEWMIG6C8KXSfy4P5lQ/LkDksUYqRLT0zef3DKmTI25i4Ll4F1d/3axQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a2d461fd331d781a757398ff80603936a83bdd3 commit 6a2d461fd331d781a757398ff80603936a83bdd3 Author: Felix Palmen AuthorDate: 2022-10-17 11:32:00 +0000 Commit: Felix Palmen 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*/