From nobody Thu Dec 16 22:09:24 2021 X-Original-To: dev-commits-src-main@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 1816718D92DC; Thu, 16 Dec 2021 22:09:25 +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 4JFR9J5yBZz3CRy; Thu, 16 Dec 2021 22:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AD5DC1051E; Thu, 16 Dec 2021 22:09:24 +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 1BGM9OKx089086; Thu, 16 Dec 2021 22:09:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGM9OHX089085; Thu, 16 Dec 2021 22:09:24 GMT (envelope-from git) Date: Thu, 16 Dec 2021 22:09:24 GMT Message-Id: <202112162209.1BGM9OHX089085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8b4af206f67e - main - Sort libsodium sources by path in sys/modules/crypto/Makefile. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b4af206f67e93735a5b22921469a2bce63fb6ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639692564; 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=ihGMUZ1X6uKIHX37p4mFm6Hkb4toGv1ot1U9DxwP96A=; b=TchBAmP/x+yyKbaO+yNpsT4XdRxxRoPoI07YYpcyiufBzj3rkb465SEwfzHeHeyB0XXhE4 XUGr7wUk5XfKwGx2FHC8/UOCu6wjkyg7M/dlfY2dryVZkoJetDSktGTobrLmHkWggieIen v6ZS/WEhsBkT9FYq0+dAoDTNriwZgQv8wXlSlJjE7Ddc+mnfm/rE3n/EXN4yFZweNuPVvH sgqJdzvkAfAoUFGwZqYbM14fioq1aYh8WhKJfP05eDTrL7lV/Sw/ZMX1+svAXSYGVjBu/2 IbvE/7dI4xUiqgxR1K2yzZmtPNQoT7K3eOTyVlew950Zy7fLXlk+2o2Ti1q9Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639692564; a=rsa-sha256; cv=none; b=fAe6SydH+FPGsqBoDmvXnvtMjdatkOqnqbOe4cMXX5VB2SbAXi8YERZKFiBkLxdEcVNhxR NvB5NgTi2CVH9vQG7NhaLUNEEOuOsF6hGBoQoWabRD9Y2iRIVGHXDstLk6qrN+UFXZp59P +BkKxS5/bZF5G33xelMbV0fqwasgmxWlci5ONxuLknq0Mn6VwrfNg7/2AsK0QEtJzdIwYW 2Bm979gb5oQCJkK834hq9s5Fkba8quCt27/OQxhtjQC4kqCKbvspjmQGCS7G47HcpTb2NO tSaBRljw2W70/Wc2NpzbvPR8vPIDJHfS6lz+TmBg3XZRBvqBldG/tVEgZhxtlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4af206f67e93735a5b22921469a2bce63fb6ab commit 8b4af206f67e93735a5b22921469a2bce63fb6ab Author: John Baldwin AuthorDate: 2021-12-16 21:47:03 +0000 Commit: John Baldwin CommitDate: 2021-12-16 21:47:03 +0000 Sort libsodium sources by path in sys/modules/crypto/Makefile. This matches the order used in sys/conf/files to make it easier to keep these two files in sync. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33484 --- sys/modules/crypto/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index f64ea1f6fc8b..4bea88b2af28 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -61,14 +61,14 @@ SRCS += xform_chacha20_poly1305.c CFLAGS.xform_chacha20_poly1305.c+= -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT} SRCS += xform_poly1305.c CFLAGS.xform_poly1305.c += -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT} -SRCS += stream_chacha20.c -CFLAGS.stream_chacha20.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} -SRCS += chacha20_ref.c -CFLAGS.chacha20_ref.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += onetimeauth_poly1305.c CFLAGS.onetimeauth_poly1305.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += poly1305_donna.c CFLAGS.poly1305_donna.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +SRCS += stream_chacha20.c +CFLAGS.stream_chacha20.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +SRCS += chacha20_ref.c +CFLAGS.chacha20_ref.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += verify.c CFLAGS.verify.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += randombytes.c