From nobody Tue May 3 12:31:18 2022 X-Original-To: dev-commits-src-branches@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 738101AC4F98; Tue, 3 May 2022 12:31:19 +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 4Kszpb09MKz4vLj; Tue, 3 May 2022 12:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651581079; 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=w3uLar24VbjAKgTLuK3u53guny/FZVPfxBc2gHHNCGk=; b=rV03ppq78D5F1jxuXf7swlniN3n3IfUyrrge2CzpqJbYcPjhdohZLUlILsd8tn/NqEQhpl aqgqHR4F82ZtWZTUsonj909kw91FArd4AX1+iALdEb9s23Ik+t37Ydwq0/YpzA7Rw+BtSJ /sGamjUgDzebmIhsaoILsGnUtxdXicit4LaA2imT7nSBZi1cra+bQsPlHz5XsPb8sRaCUy jqiWQOUalKLj3wKmD/25m+DbwPjJa/8NEDCUC8F3tINaMwBk123GrnQogR01qzjNCyv0yl B1+DrEyLZfuV6jBPPlMqx/1SFdKnrRLBLfkCYP2IR/ewU63GvXJQiLXm3W/DsQ== 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 C25FD1E66E; Tue, 3 May 2022 12:31:18 +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 243CVI63054880; Tue, 3 May 2022 12:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243CVINg054879; Tue, 3 May 2022 12:31:18 GMT (envelope-from git) Date: Tue, 3 May 2022 12:31:18 GMT Message-Id: <202205031231.243CVINg054879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 6cc68da14658 - stable/13 - libarchive: import changes from upstream List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cc68da146583dc3484fa69c7c1e87882c6cb5b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651581079; 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=w3uLar24VbjAKgTLuK3u53guny/FZVPfxBc2gHHNCGk=; b=uZYc5SL3qDyUfn7rY0Vomldq3NshlxFzGI7CJoudyEw9dIXLwobK0S2KSxIZzj1W+PHW6Z LfksMXUn0XgLYqjbBMtXy7erR2cugDQQaETsVXUfffSqNLoh+4e/Onpy4XMtv+uxNa7q1A gussZ1KaNYoJ0X/BnfGrtk4rbRu3yRdsOb5Lia+0CgS4w51rIe8mbLA2D96n2JN0nVz1LP oFuIRSFfcU9WyX1EMUZBaxjx/joY0tYdqMwmseIMbTn3H0TBKJFFFmzdZzUtgUqkAoud9C WtV/S5HfrMTFd/qWyFPCn5xtzbdeNbD5rkLyxjQ44M43pDRqvM12g1tCJv+svA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651581079; a=rsa-sha256; cv=none; b=UbvNdkR8dWHVEW9PRuo0dba+iF1qEE1y/CiDca3GqkN94j0cGvCe0uYyD4pD1Ubzsm//NK SJ68gZlnYjhTFKZRaxA/bodTBUNGEIJ1q19BoXI3csgZ6fNwtruuySx+8kOydakExDZBco CjHwUFIFyC4O8JhFKGNBdjEFWJCDlQ9DF2Kn9fQZuBK/7JWGXQ6tqU03iBHItVvF7hvldL XXYMpool8B/5rJoHxwBUvbUUY9zXjztomtJk4G+gH6qYhpQlYoI8jq5qe9Zsc4VoSPdLDY JA8uIQAdU89BVeTT2WizGK6xzL8C6+ao8jjfZowckI1fVPW7AEIoeMaotVr59A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6cc68da146583dc3484fa69c7c1e87882c6cb5b1 commit 6cc68da146583dc3484fa69c7c1e87882c6cb5b1 Author: Martin Matuska AuthorDate: 2022-04-12 18:12:34 +0000 Commit: Martin Matuska CommitDate: 2022-05-03 12:30:52 +0000 libarchive: import changes from upstream Libarchive 3.6.1 Bug fixes: PR #1549: archive_digest: check return value of EVP_DigestInit() (cherry picked from commit 7ec51a3e2b91caaea5c1de1a4c7b362b20d35a62) --- contrib/libarchive/NEWS | 2 ++ contrib/libarchive/libarchive/archive.h | 4 ++-- contrib/libarchive/libarchive/archive_digest.c | 18 ++++++++++++------ contrib/libarchive/libarchive/archive_entry.h | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/contrib/libarchive/NEWS b/contrib/libarchive/NEWS index 0ccdb5d61b04..bf0515f34d8c 100644 --- a/contrib/libarchive/NEWS +++ b/contrib/libarchive/NEWS @@ -1,3 +1,5 @@ +Apr 08, 2022: libarchive 3.6.1 released + Feb 09, 2022: libarchive 3.6.0 released Feb 08, 2022: libarchive 3.5.3 released diff --git a/contrib/libarchive/libarchive/archive.h b/contrib/libarchive/libarchive/archive.h index 67381bf24be0..ee1a02f4de01 100644 --- a/contrib/libarchive/libarchive/archive.h +++ b/contrib/libarchive/libarchive/archive.h @@ -36,7 +36,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3006000 +#define ARCHIVE_VERSION_NUMBER 3006001 #include #include /* for wchar_t */ @@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.6.0" +#define ARCHIVE_VERSION_ONLY_STRING "3.6.1" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); diff --git a/contrib/libarchive/libarchive/archive_digest.c b/contrib/libarchive/libarchive/archive_digest.c index 410df01563df..a7bd5f0286a4 100644 --- a/contrib/libarchive/libarchive/archive_digest.c +++ b/contrib/libarchive/libarchive/archive_digest.c @@ -243,7 +243,8 @@ __archive_md5init(archive_md5_ctx *ctx) { if ((*ctx = EVP_MD_CTX_new()) == NULL) return (ARCHIVE_FAILED); - EVP_DigestInit(*ctx, EVP_md5()); + if (!EVP_DigestInit(*ctx, EVP_md5())) + return (ARCHIVE_FAILED); return (ARCHIVE_OK); } @@ -434,7 +435,8 @@ __archive_ripemd160init(archive_rmd160_ctx *ctx) { if ((*ctx = EVP_MD_CTX_new()) == NULL) return (ARCHIVE_FAILED); - EVP_DigestInit(*ctx, EVP_ripemd160()); + if (!EVP_DigestInit(*ctx, EVP_ripemd160())) + return (ARCHIVE_FAILED); return (ARCHIVE_OK); } @@ -624,7 +626,8 @@ __archive_sha1init(archive_sha1_ctx *ctx) { if ((*ctx = EVP_MD_CTX_new()) == NULL) return (ARCHIVE_FAILED); - EVP_DigestInit(*ctx, EVP_sha1()); + if (!EVP_DigestInit(*ctx, EVP_sha1())) + return (ARCHIVE_FAILED); return (ARCHIVE_OK); } @@ -887,7 +890,8 @@ __archive_sha256init(archive_sha256_ctx *ctx) { if ((*ctx = EVP_MD_CTX_new()) == NULL) return (ARCHIVE_FAILED); - EVP_DigestInit(*ctx, EVP_sha256()); + if (!EVP_DigestInit(*ctx, EVP_sha256())) + return (ARCHIVE_FAILED); return (ARCHIVE_OK); } @@ -1122,7 +1126,8 @@ __archive_sha384init(archive_sha384_ctx *ctx) { if ((*ctx = EVP_MD_CTX_new()) == NULL) return (ARCHIVE_FAILED); - EVP_DigestInit(*ctx, EVP_sha384()); + if (!EVP_DigestInit(*ctx, EVP_sha384())) + return (ARCHIVE_FAILED); return (ARCHIVE_OK); } @@ -1381,7 +1386,8 @@ __archive_sha512init(archive_sha512_ctx *ctx) { if ((*ctx = EVP_MD_CTX_new()) == NULL) return (ARCHIVE_FAILED); - EVP_DigestInit(*ctx, EVP_sha512()); + if (!EVP_DigestInit(*ctx, EVP_sha512())) + return (ARCHIVE_FAILED); return (ARCHIVE_OK); } diff --git a/contrib/libarchive/libarchive/archive_entry.h b/contrib/libarchive/libarchive/archive_entry.h index 8b76360a777f..461866a5a6a2 100644 --- a/contrib/libarchive/libarchive/archive_entry.h +++ b/contrib/libarchive/libarchive/archive_entry.h @@ -30,7 +30,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3006000 +#define ARCHIVE_VERSION_NUMBER 3006001 /* * Note: archive_entry.h is for use outside of libarchive; the