From nobody Thu Feb 9 20:40:47 2023 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 4PCTKD2NWfz3ndd4; Thu, 9 Feb 2023 20:40:48 +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 4PCTKC6Twcz3xDc; Thu, 9 Feb 2023 20:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675975247; 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=PbxjqggXmnYu4ua/4JVxpepuYHyRybETwGOoluKPg2Q=; b=X37WwK0uiFmCRagKGlohzWfP2xYQww9n+sLj+E5hK0giG0F9xpolpenvujxZpxvL+UZdxt bnjIlYLxa64B/5ox0u4OiPDgZKfREMkiiOcc4q2mJB6rZxKnvIHEylQUYgRqzZhAsCNz2j JdCiVUYK9jq4LsB+2MmVv63YCGrXRiYiO7DB1eXxn/b+jzCBpM7f5Kpy0/X+1dfun/0eBR CuNoGxPsCsJtIuIcV2F/v2Czhsb41pozw99wOOotHsZ9X/jT6Fxttg1qTBhBbuSP2C08SG Rgj77eeTQOyXLZOsXjdeFIpazfd7fQLmBWDFfx1uZHMw8QUbBNW+fDlYKWQjig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675975247; 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=PbxjqggXmnYu4ua/4JVxpepuYHyRybETwGOoluKPg2Q=; b=KJFToImGHUGCTw5jHi37BbuLEIP6ngVRhGRgIvEXsKDYOJQDxTixrYImT/FFb0kn4b7qZ8 xYcM4bH33rKChnjF26GstFN627s+PkxzZvw2BYgKJpYqrzSImiELVqatvt+e/x7WyjgoWy BogOan93YM8ouxm7nMsJSi2GRpim+jqK2DH7AJSDt+ONOZ1Y35/OFeA1PpibWLcO2jVCgH bcijBTz1Q3MVBbLB0WcaSkobKD7yp/57k3yVgT/5e7cNYmNcfJTNOy2C4xIbGUzBj9sV7W Q6rCBMXd0ya20gxvofYy8GdpaGba4Z8V0bWYlLSWhDBQ1vOFQeDStZxQmsgCWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675975247; a=rsa-sha256; cv=none; b=BMaSKHmSnUduuyWuAddU0ocq+dKNLJ3vPMEBqfQF0UkG43rJIf8AyIY8kFbTUilcrAuNXn XIRNBakJ2FIIf3yHIni4uAliv4/ZWbmXo+AoLlAYn8olpPtwBtRCIon+sGcs6ebhb12fiY a1O1uT2JxATaCROns2R9HqoleDb7ZrG9jqwiVquV/aZCW5JFRz9VnSuCKMRBYGHN97Cs5r thqObnmQx9K8JwuRhz7BsJNFCqYwwPXh/ga+k8Fe1/YL88D3KJ4b0efG/b2f2OEUtjS/AJ GwqjPXFxze3+jJpu49bQZrpPzHyBlBvBD/mW+BSBHVQEd35iym9pavb8VE1qTA== 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 4PCTKC4ZxDzrcS; Thu, 9 Feb 2023 20:40:47 +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 319Kel86094069; Thu, 9 Feb 2023 20:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319KelJI094068; Thu, 9 Feb 2023 20:40:47 GMT (envelope-from git) Date: Thu, 9 Feb 2023 20:40:47 GMT Message-Id: <202302092040.319KelJI094068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: b9e0160e0788 - stable/13 - sha512_224: Fix SHA512_224_Final() on little-endian machines. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9e0160e07882ff62df7c31695e18c3197cea8b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e0160e07882ff62df7c31695e18c3197cea8b9 commit b9e0160e07882ff62df7c31695e18c3197cea8b9 Author: Sebastian Huber AuthorDate: 2023-02-06 16:57:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-09 20:32:56 +0000 sha512_224: Fix SHA512_224_Final() on little-endian machines. PR: 266863 MFC after: 1 week Reviewed by: allanjude, cperciva, des Differential Revision: https://reviews.freebsd.org/D38372 (cherry picked from commit 6680cfe8e0eec4427716ab50d73ab8231dd9ab28) --- sys/crypto/sha2/sha512c.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/crypto/sha2/sha512c.c b/sys/crypto/sha2/sha512c.c index f18a7e6fa994..4533632500f2 100644 --- a/sys/crypto/sha2/sha512c.c +++ b/sys/crypto/sha2/sha512c.c @@ -60,23 +60,26 @@ __FBSDID("$FreeBSD$"); #else /* BYTE_ORDER != BIG_ENDIAN */ /* - * Encode a length len/4 vector of (uint64_t) into a length len vector of - * (unsigned char) in big-endian form. Assumes len is a multiple of 8. + * Encode a length (len + 7) / 8 vector of (uint64_t) into a length len + * vector of (unsigned char) in big-endian form. Assumes len is a + * multiple of 4. */ -static void +static inline void be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len) { size_t i; for (i = 0; i < len / 8; i++) be64enc(dst + i * 8, src[i]); + if (len % 8 == 4) + be32enc(dst + i * 8, src[i] >> 32); } /* * Decode a big-endian length len vector of (unsigned char) into a length - * len/4 vector of (uint64_t). Assumes len is a multiple of 8. + * len/8 vector of (uint64_t). Assumes len is a multiple of 8. */ -static void +static inline void be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len) { size_t i;