Commit a619fe35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.19-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 "API:
   - Rewrite memcpy_sglist from scratch
   - Add on-stack AEAD request allocation
   - Fix partial block processing in ahash

  Algorithms:
   - Remove ansi_cprng
   - Remove tcrypt tests for poly1305
   - Fix EINPROGRESS processing in authenc
   - Fix double-free in zstd

  Drivers:
   - Use drbg ctr helper when reseeding xilinx-trng
   - Add support for PCI device 0x115A to ccp
   - Add support of paes in caam
   - Add support for aes-xts in dthev2

  Others:
   - Use likely in rhashtable lookup
   - Fix lockdep false-positive in padata by removing a helper"

* tag 'v6.19-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
  crypto: zstd - fix double-free in per-CPU stream cleanup
  crypto: ahash - Zero positive err value in ahash_update_finish
  crypto: ahash - Fix crypto_ahash_import with partial block data
  crypto: lib/mpi - use min() instead of min_t()
  crypto: ccp - use min() instead of min_t()
  hwrng: core - use min3() instead of nested min_t()
  crypto: aesni - ctr_crypt() use min() instead of min_t()
  crypto: drbg - Delete unused ctx from struct sdesc
  crypto: testmgr - Add missing DES weak and semi-weak key tests
  Revert "crypto: scatterwalk - Move skcipher walk and use it for memcpy_sglist"
  crypto: scatterwalk - Fix memcpy_sglist() to always succeed
  crypto: iaa - Request to add Kanchana P Sridhar to Maintainers.
  crypto: tcrypt - Remove unused poly1305 support
  crypto: ansi_cprng - Remove unused ansi_cprng algorithm
  crypto: asymmetric_keys - fix uninitialized pointers with free attribute
  KEYS: Avoid -Wflex-array-member-not-at-end warning
  crypto: ccree - Correctly handle return of sg_nents_for_len
  crypto: starfive - Correctly handle return of sg_nents_for_len
  crypto: iaa - Fix incorrect return value in save_iaa_wq()
  crypto: zstd - Remove unnecessary size_t cast
  ...
parents c8321831 48bc9da3

Documentation/crypto/userspace-if.rst

+3 −4
Original line number Diff line number Diff line
@@ -302,10 +302,9 @@ follows: 




Depending on the RNG type, the RNG must be seeded. The seed is provided

using the setsockopt interface to set the key. For example, the

ansi_cprng requires a seed. The DRBGs do not require a seed, but may be

seeded. The seed is also known as a *Personalization String* in NIST SP 800-90A

standard.

using the setsockopt interface to set the key. The SP800-90A DRBGs do

not require a seed, but may be seeded. The seed is also known as a

*Personalization String* in NIST SP 800-90A standard.



Using the read()/recvmsg() system calls, random numbers can be obtained.

The kernel generates at most 128 bytes in one call. If user space

Documentation/devicetree/bindings/crypto/amd,ccp-seattle-v1a.yaml

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ properties: 


  dma-coherent: true



  iommus:

    maxItems: 4



required:

  - compatible

  - reg

Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,kaanapali-inline-crypto-engine

          - qcom,qcs8300-inline-crypto-engine

          - qcom,sa8775p-inline-crypto-engine

          - qcom,sc7180-inline-crypto-engine

Documentation/devicetree/bindings/crypto/qcom,prng.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
              - qcom,ipq5332-trng

              - qcom,ipq5424-trng

              - qcom,ipq9574-trng

              - qcom,kaanapali-trng

              - qcom,qcs615-trng

              - qcom,qcs8300-trng

              - qcom,sa8255p-trng

Documentation/devicetree/bindings/crypto/qcom-qce.yaml

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ properties: 


      - items:

          - enum:

              - qcom,kaanapali-qce

              - qcom,qcs615-qce

              - qcom,qcs8300-qce

              - qcom,sa8775p-qce