From nobody Mon Jan 24 23:29:14 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 11C181986541; Mon, 24 Jan 2022 23:29:15 +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 4JjR5Q5x1mz4gqg; Mon, 24 Jan 2022 23:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643066954; 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=JfL1LR+/bu27/t0d0+1o1sLxYWg9gbV22DZExEXNEJU=; b=A/k1BZsBdV7LMTkKWUNtxD0AuqdE96bqp0fqitATzv8c2zLO3iVzwiQgs053a1TPJH+WOn QKstRT2q1nc+sDgHkT+l63OQYUaS/4/C6/RIYt7FQBw+LHvgaLWRHSNB8nQBW2u4WXZKJs IpN/4S7Na94lY2haK8PjdWaQBTSBHFSWzYLtwLrVxPxscmfdb92G+4glC7yULUvqsyHY3h JPKoCPtEXV4HH5ZDk2M19XJt+FGNq3K0TIKm4M9fF/sxZDxZ6ljJVVZwv6ORKu37dWt3lk JcfzLePaXyAJr5gafWYPrz+GcV3M5btWT0EffnWeJhKK2O34gYGySue9hoKiog== 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 903E61EC6A; Mon, 24 Jan 2022 23:29:14 +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 20ONTEw2069480; Mon, 24 Jan 2022 23:29:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ONTEiH069479; Mon, 24 Jan 2022 23:29:14 GMT (envelope-from git) Date: Mon, 24 Jan 2022 23:29:14 GMT Message-Id: <202201242329.20ONTEiH069479@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: 16cf646a6fe6 - main - crypto: Remove xform.c and compile xform_*.c standalone. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16cf646a6fe6d55dd372e544692c4bd9836af5c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643066954; 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=JfL1LR+/bu27/t0d0+1o1sLxYWg9gbV22DZExEXNEJU=; b=LR7hcSlS5sw2teY8ufNURpuxSnwSBQNO69ip4AVCq2XzCws+wzFI8FB/IfkR7757hpoNuG z/B6NbOVR964oUvJwub5cLJJKoH2iTv/lA8O5PwLYhDeaO02xOY0xj/E4PhGyhWYrV1igh idkVrbG74w8AMf+7eNZPigaFFF8rDuYmsbfPftr2ZeTCWaNCvFaOpt/9mnRo1GI2y1Hbuh xhC95C1tU0xvqeYjthd5jiVmhELO3VAe7/tdRbRJSx5LMKOHzKGKfECSsI63KzoWzgti3J vLSdaTelnrdcwlYnacCEzNQk6osViaJMXzGjvm3bsNTXkKjF1m41c7gI5NpSdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643066954; a=rsa-sha256; cv=none; b=oAXtU2EHlDnRm+4wF+3T1ceu/vpwJyeNdl4ZufpiSdOgu1fgzp39YGAA0qdJ9SVryzeSAV JFsyIsvtcKBn6rvSoB3h5TiDNogXVtDyEdwl0CFjyMV5fDzKQgsJ2up//IOW0o8C656hyM 30UW47XrOQKwuTWqtcqdnrMHUslnHy4sjVgEkG2bpP4P9iPmoZMU0wnAsUqNtlXRz1RXsn G9flAYVJOJJKn0L+a4BAfN4s+J1rLeDAi2cPRQ58f9li/ppEvcCv6rfipasXKteC49ITaZ f0W1T8PTTonp1knLteqM4wJueVI3+mIzQmrVFZrlvbOXXfNmI/9/BaraFDMxpA== 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=16cf646a6fe6d55dd372e544692c4bd9836af5c4 commit 16cf646a6fe6d55dd372e544692c4bd9836af5c4 Author: John Baldwin AuthorDate: 2022-01-24 23:27:40 +0000 Commit: John Baldwin CommitDate: 2022-01-24 23:27:40 +0000 crypto: Remove xform.c and compile xform_*.c standalone. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33995 --- sys/conf/files | 11 +++++- sys/modules/crypto/Makefile | 5 ++- sys/opencrypto/xform.c | 87 --------------------------------------------- 3 files changed, 14 insertions(+), 89 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 01b08594dc97..5b33d66f3377 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4943,12 +4943,21 @@ opencrypto/gmac.c optional crypto opencrypto/gfmult.c optional crypto opencrypto/ktls_ocf.c optional kern_tls opencrypto/rmd160.c optional crypto -opencrypto/xform.c optional crypto +opencrypto/xform_aes_cbc.c optional crypto +opencrypto/xform_aes_icm.c optional crypto +opencrypto/xform_aes_xts.c optional crypto opencrypto/xform_cbc_mac.c optional crypto opencrypto/xform_chacha20_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" +opencrypto/xform_cml.c optional crypto +opencrypto/xform_deflate.c optional crypto +opencrypto/xform_gmac.c optional crypto +opencrypto/xform_null.c optional crypto opencrypto/xform_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" +opencrypto/xform_rmd160.c optional crypto +opencrypto/xform_sha1.c optional crypto +opencrypto/xform_sha2.c optional crypto contrib/libsodium/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index f0ceeacbd536..63bc81fad99d 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -26,7 +26,10 @@ LIBSODIUM=${SRCTOP}/sys/contrib/libsodium/src/libsodium KMOD = crypto SRCS = crypto.c cryptodev_if.c -SRCS += criov.c cryptosoft.c xform.c +SRCS += criov.c cryptosoft.c +SRCS += xform_aes_cbc.c xform_aes_icm.c xform_aes_xts.c xform_cml.c +SRCS += xform_deflate.c xform_gmac.c xform_null.c xform_rmd160.c +SRCS += xform_sha1.c xform_sha2.c SRCS += cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c rijndael-api-fst.c SRCS += camellia.c camellia-api.c SRCS += des_ecb.c des_enc.c des_setkey.c diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c deleted file mode 100644 index 1f2c2771cf04..000000000000 --- a/sys/opencrypto/xform.c +++ /dev/null @@ -1,87 +0,0 @@ -/* $OpenBSD: xform.c,v 1.16 2001/08/28 12:20:43 ben Exp $ */ -/*- - * The authors of this code are John Ioannidis (ji@tla.org), - * Angelos D. Keromytis (kermit@csd.uch.gr), - * Niels Provos (provos@physnet.uni-hamburg.de) and - * Damien Miller (djm@mindrot.org). - * - * This code was written by John Ioannidis for BSD/OS in Athens, Greece, - * in November 1995. - * - * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996, - * by Angelos D. Keromytis. - * - * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis - * and Niels Provos. - * - * Additional features in 1999 by Angelos D. Keromytis. - * - * AES XTS implementation in 2008 by Damien Miller - * - * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, - * Angelos D. Keromytis and Niels Provos. - * - * Copyright (C) 2001, Angelos D. Keromytis. - * - * Copyright (C) 2008, Damien Miller - * Copyright (c) 2014 The FreeBSD Foundation - * All rights reserved. - * - * Portions of this software were developed by John-Mark Gurney - * under sponsorship of the FreeBSD Foundation and - * Rubicon Communications, LLC (Netgate). - * - * Permission to use, copy, and modify this software with or without fee - * is hereby granted, provided that this entire notice is included in - * all copies of any software which is or includes a copy or - * modification of this software. - * You may use this code under the GNU public license if you so wish. Please - * contribute changes back to the authors under this freer than GPL license - * so that we may further the use of strong encryption without limitations to - * all. - * - * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY - * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE - * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR - * PURPOSE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include -#include - -/* Include the encryption algorithms */ -#include "xform_null.c" -#include "xform_aes_cbc.c" -#include "xform_aes_icm.c" -#include "xform_aes_xts.c" -#include "xform_cml.c" - -/* Include the authentication and hashing algorithms */ -#include "xform_gmac.c" -#include "xform_rmd160.c" -#include "xform_sha1.c" -#include "xform_sha2.c" - -/* Include the compression algorithms */ -#include "xform_deflate.c" -