The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=16cf646a6fe6d55dd372e544692c4bd9836af5c4
commit 16cf646a6fe6d55dd372e544692c4bd9836af5c4 Author: John Baldwin <[email protected]> AuthorDate: 2022-01-24 23:27:40 +0000 Commit: John Baldwin <[email protected]> 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 ([email protected]), - * Angelos D. Keromytis ([email protected]), - * Niels Provos ([email protected]) and - * Damien Miller ([email protected]). - * - * 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 <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/sysctl.h> -#include <sys/errno.h> -#include <sys/time.h> -#include <sys/kernel.h> -#include <machine/cpu.h> - -#include <crypto/rijndael/rijndael.h> -#include <crypto/camellia/camellia.h> -#include <crypto/sha1.h> - -#include <opencrypto/deflate.h> -#include <opencrypto/rmd160.h> - -#include <opencrypto/cryptodev.h> -#include <opencrypto/xform.h> - -/* 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" -
