From nobody Tue Jan 18 22:50:30 2022 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 CE54E195E8D6; Tue, 18 Jan 2022 22:50:31 +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 4JdkWW1N5Kz3HqB; Tue, 18 Jan 2022 22:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642546231; 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=gr1fW7VRP3BdGrJMmJAsPIAe8fz9HgiU6m3SOFLT7pA=; b=nSrjyaJxvHZW8EiRh3awbl6WMwIUwVHq8EfNXVvxSgJ7CdP0v5JPBHq80XIZZB8udi9r/c vKDQxlXZV9cavlZKelKkfXRFn/IbqjfQqYWavjzGOBf95+WSaB3qx70DMzILbz9Ku5scNS Y1knTtPyrlPiVyf5CQpA8o7OdcpBQJ1Krf6f2iPdYbcPneZivjxYBXnIT9+NPy0J+RqIhJ 1a4emnD6mxs5dzWohA0saE0gh45sEccJaTcVmtNkTeEESzxP+tAqOK/Wnx3y4xfzFc+V14 2FU2lligi0vEWmy1y7SUqgEVnXkBnce/FFJmvL/rmPf6iOxyrkzY1/qBvZcyFw== 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 B73F11A7C; Tue, 18 Jan 2022 22:50:30 +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 20IMoUAu063298; Tue, 18 Jan 2022 22:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20IMoUMG063297; Tue, 18 Jan 2022 22:50:30 GMT (envelope-from git) Date: Tue, 18 Jan 2022 22:50:30 GMT Message-Id: <202201182250.20IMoUMG063297@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: 42876a039e2b - main - crypto: Stop compiling in chacha20poly1305 AEAD ciphers from libsodium. 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: 42876a039e2b4b70918aba51a5d96d67219a5295 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642546231; 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=gr1fW7VRP3BdGrJMmJAsPIAe8fz9HgiU6m3SOFLT7pA=; b=qLm76PvOW2sS2Xv7suDE5aGWUhtz5xkfuhpRMex6yGef/orUJC2MRR7wB46xg0NSte7e+O EYUOSJNi/2b3JkLZm3xPhTZIEPAhi9qKBseSYlpJDzUZFBlLcgLz7aYkdOGQ7wGUdjrAuJ 1S+ylBwS7mIIs5+8wQozdrbez52ntIQWBWkJUVEd1JMh7ybq/IOZgvQ3j1hJLh4NIx3J0Z pcunAWRODFWqpdfp8hUpySLHWnMMXW7IPCXAbQhUVmTNdw3LHKsUy3O/yNqVoDrpwH6VW3 iOzJepp+1NYp2NdusWAi0xq6Kq+Q41KtRV9fCkCGvv84/1z0gbKOZNjQXXoaMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642546231; a=rsa-sha256; cv=none; b=B/rcFOnh+GAXZcRDufC6ZYS9Pzg/bDr+99Nl4dZuVEq+mKzZMhudnQ7mutPTOaeyV4v9en Z/sRiY7i6Z2MnBNpSZrinp8+ejjBgGPFw/ba3jlbviyHCQO6zM3aKCqeSRkrsC0oMUtKqj QYYHfOyFXEBoNh0WKlSaYxMbWk1RpoCdDOGc+o/ykxbNyxk+7usCQUpQndOimUJuMQeWq9 Q8AMG7vOuv9fV90foGN0wXz+HvhufYZS6AJbtLBPY0J4FDqsFOdF2QhgJjsov5RaSTU4Kz YV7/IRt+1yGQ06YG9QLTdyIBqBXVRdcX5zp5zXqqOt+gWImv5xFUuU6Nipxdkg== 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=42876a039e2b4b70918aba51a5d96d67219a5295 commit 42876a039e2b4b70918aba51a5d96d67219a5295 Author: John Baldwin AuthorDate: 2022-01-18 22:48:40 +0000 Commit: John Baldwin CommitDate: 2022-01-18 22:48:40 +0000 crypto: Stop compiling in chacha20poly1305 AEAD ciphers from libsodium. These ciphers are now supported via OCF or 'struct enc_xform'. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33889 --- sys/conf/files | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 675cf0a6a2a2..4007d4f16c79 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4948,12 +4948,6 @@ opencrypto/xform_chacha20_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" opencrypto/xform_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ - optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \ - optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"