git: e23d45187b28 - main - libarchive: Avoid a build failure with OpenSSL 3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 23 Jun 2023 23:20:06 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=e23d45187b287ee7a5c49c8b993daa9e6bb3ad97
commit e23d45187b287ee7a5c49c8b993daa9e6bb3ad97
Author: Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2023-06-01 18:17:10 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
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