d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libarchive: Avoid a build failure with OpenSSL 3.0

Browse Source 
This is a minimal workaround; a proper fix will come via a future update
from upstream.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Pierre Pronchery 2023-06-01 20:17:10 +02:00 committed by Ed Maste
parent 5abd4d378e
commit e23d45187b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libarchive/libarchive/archive_hmac.c
View File

@ -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

1
lib/libarchive/Makefile.inc
View File

@ -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