]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'v7.0-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Feb 2026 16:36:42 +0000 (08:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Feb 2026 16:36:42 +0000 (08:36 -0800)
Pull crypto update from Herbert Xu:
 "API:
   - Fix race condition in hwrng core by using RCU

  Algorithms:
   - Allow authenc(sha224,rfc3686) in fips mode
   - Add test vectors for authenc(hmac(sha384),cbc(aes))
   - Add test vectors for authenc(hmac(sha224),cbc(aes))
   - Add test vectors for authenc(hmac(md5),cbc(des3_ede))
   - Add lz4 support in hisi_zip
   - Only allow clear key use during self-test in s390/{phmac,paes}

  Drivers:
   - Set rng quality to 900 in airoha
   - Add gcm(aes) support for AMD/Xilinx Versal device
   - Allow tfms to share device in hisilicon/trng"

* tag 'v7.0-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (100 commits)
  crypto: img-hash - Use unregister_ahashes in img_{un}register_algs
  crypto: testmgr - Add test vectors for authenc(hmac(md5),cbc(des3_ede))
  crypto: cesa - Simplify return statement in mv_cesa_dequeue_req_locked
  crypto: testmgr - Add test vectors for authenc(hmac(sha224),cbc(aes))
  crypto: testmgr - Add test vectors for authenc(hmac(sha384),cbc(aes))
  hwrng: core - use RCU and work_struct to fix race condition
  crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req()
  crypto: xilinx - Fix inconsistant indentation
  crypto: rng - Use unregister_rngs in register_rngs
  crypto: atmel - Use unregister_{aeads,ahashes,skciphers}
  hwrng: optee - simplify OP-TEE context match
  crypto: ccp - Add sysfs attribute for boot integrity
  dt-bindings: crypto: atmel,at91sam9g46-sha: add microchip,lan9691-sha
  dt-bindings: crypto: atmel,at91sam9g46-aes: add microchip,lan9691-aes
  dt-bindings: crypto: qcom,inline-crypto-engine: document the Milos ICE
  crypto: caam - fix netdev memory leak in dpaa2_caam_probe
  crypto: hisilicon/qm - increase wait time for mailbox
  crypto: hisilicon/qm - obtain the mailbox configuration at one time
  crypto: hisilicon/qm - remove unnecessary code in qm_mb_write()
  crypto: hisilicon/qm - move the barrier before writing to the mailbox register
  ...

1  2 
crypto/drbg.c
crypto/testmgr.c
crypto/testmgr.h
drivers/crypto/ccp/sev-dev-tsm.c
drivers/crypto/starfive/jh7110-aes.c

diff --cc crypto/drbg.c
Simple merge
index cbc049d697a1e238ff54763e4351838d7c970316,3d60d9ae9416b77ae401f4a4a99384e1eace3ede..b940721447fa1f1e3db755b958bea9046c0819f8
@@@ -4137,9 -4151,13 +4151,13 @@@ static const struct alg_test_desc alg_t
                .suite = {
                        .aead = __VECS(hmac_sha224_des3_ede_cbc_tv_temp)
                }
+       }, {
+               .alg = "authenc(hmac(sha224),rfc3686(ctr(aes)))",
+               .test = alg_test_null,
+               .fips_allowed = 1,
        }, {
                .alg = "authenc(hmac(sha256),cbc(aes))",
 -              .generic_driver = "authenc(hmac-sha256-lib,cbc(aes-generic))",
 +              .generic_driver = "authenc(hmac-sha256-lib,cbc(aes-lib))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
Simple merge
Simple merge
Simple merge