From nobody Fri Jun 23 23:20:06 2023 X-Original-To: dev-commits-src-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 4QntWB4NX5z4g68X; Fri, 23 Jun 2023 23:20:06 +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 4QntWB2jm9z3R0D; Fri, 23 Jun 2023 23:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562406; 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=rspRtAbsyC1b7Hd5YYnRg8k+AIjcZGA7iFyKyghFLaM=; b=xuYW8aIAhULfIrx8TJjRnIdn12YaBm8Gylywyj/Dnp+mLlcdterLLOtSsmh442OCJNdzdi fMFVGPF+B2Hb5fFBUr96Nj6FD7SsHPqjiElaIQPPIYQqEoq/YTeMhbCiRYfNo5f8pxJeg6 yjl2z5Rjglrj32zNX190Sb7BLeTpiaRZu02nEHA8Q4sGv+l/gUiWp8XfRob3MHvUfUhVjb hgVRxnrDj8nKlXLpvslIAuluZ8elszL/GmwdYlQ06TvUZKoiF1SxVsmilZBtvBjMC3k9Gu ClkJfVTDhkNeoTaAO7Hg2657B17ru3h/piuknLqIlvUyn+UTZlNPD+clSjYOCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562406; 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=rspRtAbsyC1b7Hd5YYnRg8k+AIjcZGA7iFyKyghFLaM=; b=YifpqVtwY4DongZz3ZjadsKTzOZhE0ECwOJi0YCuWA3e00GpiHwJRydUlN9KeNRjrxYPJP 35j2HhehDjZQ+pXqdMD4T9V4N5xgJTjAv8idMj9sYr2Og4uKmBm+/qetgNdrnD8od9zyb2 t2qg1tCICskf42VIa8eoi28qRl+kou7f4p03DEg50glCaMePDXYjobElgbLEUi2LxOuHvA in3DGcz9W3JAnl0l0gP8WP4D6kvDI3XNw8x5iVAdJrgmwf1mKUN/D7ojuk9fxsJHXbV/o0 +6AFFEUgzpU9fE2jVImTCCCz1MKS5mhKYEpUjShGzaUuckVZg6tSi8HejsmJ/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687562406; a=rsa-sha256; cv=none; b=KYCy6hFP38ZdYIKSh8p76mgd3K0WcSRJc2osYZdJ83pOrossEoik/c02fD3nf9OkVTONuM NlAt6opOr/4o8DLyAvrZmH9dFfPDYiNmm9Janxqb/k5MvWVLaClplcY69BGSwWnwre+3kC fAYeYw6VjeHlvN+F6Bkqb7/o/TQRYYQdbbyZtnLTVCOWYp2uQMFk2qGSKMmivyRfqP1zhP oHPIUCB1B9y0co3v9yvSKTF/wDjXrqz92gbWSQjlAEPyKEVkg9qHvKYhfCBRlgQUlVoe9p sVpRrEj0odPq8SkixtzmN+XUsAzrFzsgSXl39M4uUKFyFGM+Ckhis0KNOUNm6Q== 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 4QntWB0hJdzN12; Fri, 23 Jun 2023 23:20:06 +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 35NNK6xe047205; Fri, 23 Jun 2023 23:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNK6Hq047202; Fri, 23 Jun 2023 23:20:06 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:20:06 GMT Message-Id: <202306232320.35NNK6Hq047202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e23d45187b28 - main - libarchive: Avoid a build failure with OpenSSL 3.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e23d45187b287ee7a5c49c8b993daa9e6bb3ad97 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e23d45187b287ee7a5c49c8b993daa9e6bb3ad97 commit e23d45187b287ee7a5c49c8b993daa9e6bb3ad97 Author: Pierre Pronchery AuthorDate: 2023-06-01 18:17:10 +0000 Commit: Ed Maste CommitDate: 2023-06-23 22:53:36 +0000 libarchive: Avoid a build failure with OpenSSL 3.0 This is a minimal workaround; a proper fix will come via a future update from upstream. Sponsored by: The FreeBSD Foundation --- contrib/libarchive/libarchive/archive_hmac.c | 2 +- lib/libarchive/Makefile.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/libarchive/libarchive/archive_hmac.c b/contrib/libarchive/libarchive/archive_hmac.c index 012fe1596211..0914f38e3670 100644 --- a/contrib/libarchive/libarchive/archive_hmac.c +++ b/contrib/libarchive/libarchive/archive_hmac.c @@ -238,7 +238,7 @@ __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len) if (*ctx == NULL) return -1; EVP_MAC_free(mac); - params[0] = OSSL_PARAM_construct_utf8_string("digest", "SHA1", 0); + params[0] = OSSL_PARAM_construct_utf8_string("digest", (char *)"SHA1", 0); params[1] = OSSL_PARAM_construct_end(); EVP_MAC_init(*ctx, key, key_len, params); #else diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc index a03f87d7b6c3..3740beddc70f 100644 --- a/lib/libarchive/Makefile.inc +++ b/lib/libarchive/Makefile.inc @@ -12,6 +12,7 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -DWITH_OPENSSL CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD+= crypto +CFLAGS.archive_hmac.c+=-Wno-error=cast-qual .else LIBADD+= md .endif