From nobody Wed Dec 28 22:11:48 2022 X-Original-To: dev-commits-src-all@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 4Nj5N50vNwz2c8hJ; Wed, 28 Dec 2022 22:11:49 +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 4Nj5N50Scwz3GDJ; Wed, 28 Dec 2022 22:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672265509; 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=Twz0mcyhVAkz0ExEq5OevYPknL2LHI+jL/uj4wYonpA=; b=w/7XcuO6deErRw5l7JXhCxBrvUEtmoT3RWxq2JzvzjPjo5xwdFesQA2JsaPPmkScj1Nh0V fWIi9cMMS6u7BV5Lso0BRy6zFK4IZP/NiTkqnxCUuUM6oIAhfeMm7ChsmS0nTFHPb69mkj +5XUfulEUhz8cNvxwPFB4O5JIMjz7llVVF223QiiYN7CcdGxNUSPQ9rHkLoATGShWmXvEC wL2Eyf2Xq5kGMMK4Z79K5bSsdWsjvkcg/Nrz1aGOEf/OsUR72gqSOvSj1Z7sbUPOKiiUil t9Pjc0bL15aUXbf9beXGyEfSZMQV/F2QG8x44Rt+ZcJYGwWTzTI15hCC86/CuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672265509; 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=Twz0mcyhVAkz0ExEq5OevYPknL2LHI+jL/uj4wYonpA=; b=v4vO9BNB2ogMFqQvCcpVMXODXbAWZKtOGC1eGqGKbcQjqu9DWOUExzP6E6rXdW/rSG+nEX yee2VHx2lj+8bcjJetHl+kFGqQkaxZGF3vfTlVCtG/ivIcumI9Te7pJ5thZVVkBQ8i/hHX KVhEyl1N6oEie4Qq8bq8YVySEVGRMr85zjPGSXXRiOBnaBHjYSn2FOyc//CtBq/WbIaZsu bo/kTV1mXTJpe+yl7Dn1pciDP8LBmul7n7cRW+sQ7FtOdJnOaQDVQG/8loa46le9V7qZ/3 iWtzXGy8NilQ7RlMNUDij/3pUxcbuY/oMZZghnWNwM4FqZRy72KMYSqf6Xl1EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672265509; a=rsa-sha256; cv=none; b=QBmOkIQM0ck4WRq+nMHk1RceukruUSPXVN4Hf9kGKbx2v4kBrzl/fu8rjAvQ6HlMn2p8Jg 1CaAe2obD3PZYBOvLPQwPQKe/caq8bCSc3WFqiVku+pfWHzoD/3Xv6l61UwSF6rQu4Bp8f x+1W4VggNr1ak6yMYa6xvpSAGOakNOag4TzK/AUEjXWIOKDaghPkDrxl+hjiOyo0Bm5nMt M7Li/OlQYwdG6/A39WxxSInWUToFYM+DvaBH6TEq7dPzrIN/bE0Mw42G90zdrlGWZZJlzp qAh9f691v33I6vPLS/G7UcLUU0zQFSr4QO6EMqXmBlmrUmn6GhJWdzXAntI4Gw== 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 4Nj5N46dRKz15Hn; Wed, 28 Dec 2022 22:11:48 +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 2BSMBmBm094212; Wed, 28 Dec 2022 22:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BSMBmUx094211; Wed, 28 Dec 2022 22:11:48 GMT (envelope-from git) Date: Wed, 28 Dec 2022 22:11:48 GMT Message-Id: <202212282211.2BSMBmUx094211@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: d43d863bc832 - stable/12 - libarchive: import changes from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: d43d863bc832239bd29efa81467808b8a90398ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d43d863bc832239bd29efa81467808b8a90398ce commit d43d863bc832239bd29efa81467808b8a90398ce Author: Martin Matuska AuthorDate: 2022-04-12 18:12:34 +0000 Commit: Martin Matuska CommitDate: 2022-12-28 21:57:11 +0000 libarchive: import changes from upstream Libarchive 3.6.1 Bug fixes: PR #1549: archive_digest: check return value of EVP_DigestInit() Relnotes: yes (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