Skip to content

Commit 62606c2

Browse files
torvaldstorvalds
committed
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "API: - Remove VLA usage - Add cryptostat user-space interface - Add notifier for new crypto algorithms Algorithms: - Add OFB mode - Remove speck Drivers: - Remove x86/sha*-mb as they are buggy - Remove pcbc(aes) from x86/aesni - Improve performance of arm/ghash-ce by up to 85% - Implement CTS-CBC in arm64/aes-blk, faster by up to 50% - Remove PMULL based arm64/crc32 driver - Use PMULL in arm64/crct10dif - Add aes-ctr support in s5p-sss - Add caam/qi2 driver Others: - Pick better transform if one becomes available in crc-t10dif" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (124 commits) crypto: chelsio - Update ntx queue received from cxgb4 crypto: ccree - avoid implicit enum conversion crypto: caam - add SPDX license identifier to all files crypto: caam/qi - simplify CGR allocation, freeing crypto: mxs-dcp - make symbols 'sha1_null_hash' and 'sha256_null_hash' static crypto: arm64/aes-blk - ensure XTS mask is always loaded crypto: testmgr - fix sizeof() on COMP_BUF_SIZE crypto: chtls - remove set but not used variable 'csk' crypto: axis - fix platform_no_drv_owner.cocci warnings crypto: x86/aes-ni - fix build error following fpu template removal crypto: arm64/aes - fix handling sub-block CTS-CBC inputs crypto: caam/qi2 - avoid double export crypto: mxs-dcp - Fix AES issues crypto: mxs-dcp - Fix SHA null hashes and output length crypto: mxs-dcp - Implement sha import/export crypto: aegis/generic - fix for big endian systems crypto: morus/generic - fix for big endian systems crypto: lrw - fix rebase error after out of bounds fix crypto: cavium/nitrox - use pci_alloc_irq_vectors() while enabling MSI-X. crypto: cavium/nitrox - NITROX command queue changes. ...
2 parents 24ed334 + a1c6fd4 commit 62606c2

File tree

234 files changed

+11921
-15829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+11921
-15829
lines changed

‎Documentation/filesystems/fscrypt.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,21 +191,11 @@ Currently, the following pairs of encryption modes are supported:
191191

192192
- AES-256-XTS for contents and AES-256-CTS-CBC for filenames
193193
- AES-128-CBC for contents and AES-128-CTS-CBC for filenames
194-
- Speck128/256-XTS for contents and Speck128/256-CTS-CBC for filenames
195194

196195
It is strongly recommended to use AES-256-XTS for contents encryption.
197196
AES-128-CBC was added only for low-powered embedded devices with
198197
crypto accelerators such as CAAM or CESA that do not support XTS.
199198

200-
Similarly, Speck128/256 support was only added for older or low-end
201-
CPUs which cannot do AES fast enough -- especially ARM CPUs which have
202-
NEON instructions but not the Cryptography Extensions -- and for which
203-
it would not otherwise be feasible to use encryption at all. It is
204-
not recommended to use Speck on CPUs that have AES instructions.
205-
Speck support is only available if it has been enabled in the crypto
206-
API via CONFIG_CRYPTO_SPECK. Also, on ARM platforms, to get
207-
acceptable performance CONFIG_CRYPTO_SPECK_NEON must be enabled.
208-
209199
New encryption modes can be added relatively easily, without changes
210200
to individual filesystems. However, authenticated encryption (AE)
211201
modes are not currently supported because of the difficulty of dealing

‎MAINTAINERS

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7578,14 +7578,6 @@ S: Supported
75787578
F: drivers/infiniband/hw/i40iw/
75797579
F: include/uapi/rdma/i40iw-abi.h
75807580

7581-
INTEL SHA MULTIBUFFER DRIVER
7582-
M: Megha Dey <megha.dey@linux.intel.com>
7583-
R: Tim Chen <tim.c.chen@linux.intel.com>
7584-
L: linux-crypto@vger.kernel.org
7585-
S: Supported
7586-
F: arch/x86/crypto/sha*-mb/
7587-
F: crypto/mcryptd.c
7588-
75897581
INTEL TELEMETRY DRIVER
75907582
M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
75917583
L: platform-driver-x86@vger.kernel.org

‎arch/arm/crypto/Kconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ config CRYPTO_GHASH_ARM_CE
9999
depends on KERNEL_MODE_NEON
100100
select CRYPTO_HASH
101101
select CRYPTO_CRYPTD
102+
select CRYPTO_GF128MUL
102103
help
103104
Use an implementation of GHASH (used by the GCM AEAD chaining mode)
104105
that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)
@@ -121,10 +122,4 @@ config CRYPTO_CHACHA20_NEON
121122
select CRYPTO_BLKCIPHER
122123
select CRYPTO_CHACHA20
123124

124-
config CRYPTO_SPECK_NEON
125-
tristate "NEON accelerated Speck cipher algorithms"
126-
depends on KERNEL_MODE_NEON
127-
select CRYPTO_BLKCIPHER
128-
select CRYPTO_SPECK
129-
130125
endif

‎arch/arm/crypto/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o
1010
obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o
1111
obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o
1212
obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha20-neon.o
13-
obj-$(CONFIG_CRYPTO_SPECK_NEON) += speck-neon.o
1413

1514
ce-obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o
1615
ce-obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o
@@ -54,7 +53,6 @@ ghash-arm-ce-y := ghash-ce-core.o ghash-ce-glue.o
5453
crct10dif-arm-ce-y := crct10dif-ce-core.o crct10dif-ce-glue.o
5554
crc32-arm-ce-y:= crc32-ce-core.o crc32-ce-glue.o
5655
chacha20-neon-y := chacha20-neon-core.o chacha20-neon-glue.o
57-
speck-neon-y := speck-neon-core.o speck-neon-glue.o
5856

5957
ifdef REGENERATE_ARM_CRYPTO
6058
quiet_cmd_perl = PERL $@

0 commit comments

Comments
 (0)