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

a619fe35 · Linus Torvalds <[email protected]> · 2025-12-03 11:28:38 -08:00

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
  ...

Commit: a619fe35ab41fded440d3762d4fbad84ff86a4d4
Parents: c8321831 · 48bc9da3

Merge commit. Changes below are compared with the first parent: c8321831.

Changes

170 files changed · +2028 −1682

File	Status	Add	Del	Content
Documentation/crypto/userspace-if.rst	modified	+3	−4	View file
Documentation/devicetree/bindings/crypto/amd,ccp-seattle-v1a.yaml	modified	+3	−0	View file
Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/crypto/qcom,prng.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/crypto/qcom-qce.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt	deleted	+0	−17	View before deletion
Documentation/devicetree/bindings/rng/microchip,pic32-rng.yaml	added	+40	−0	View file
Documentation/security/keys/trusted-encrypted.rst	modified	+87	−1	View file
MAINTAINERS	modified	+1	−1	View file
arch/arm/configs/axm55xx_defconfig	modified	+0	−1	View file
arch/arm/configs/clps711x_defconfig	modified	+0	−1	View file
arch/arm/configs/dove_defconfig	modified	+0	−1	View file
arch/arm/configs/ep93xx_defconfig	modified	+0	−1	View file
arch/arm/configs/jornada720_defconfig	modified	+0	−1	View file
arch/arm/configs/keystone_defconfig	modified	+0	−1	View file
arch/arm/configs/lpc32xx_defconfig	modified	+0	−1	View file
arch/arm/configs/mmp2_defconfig	modified	+0	−1	View file
arch/arm/configs/mv78xx0_defconfig	modified	+0	−1	View file
arch/arm/configs/omap1_defconfig	modified	+0	−1	View file
arch/arm/configs/orion5x_defconfig	modified	+0	−1	View file
arch/arm/configs/pxa168_defconfig	modified	+0	−1	View file
arch/arm/configs/pxa3xx_defconfig	modified	+0	−1	View file
arch/arm/configs/pxa910_defconfig	modified	+0	−1	View file
arch/arm/configs/spitz_defconfig	modified	+0	−1	View file
arch/arm64/configs/defconfig	modified	+0	−1	View file
arch/hexagon/configs/comet_defconfig	modified	+0	−1	View file
arch/m68k/configs/amcore_defconfig	modified	+0	−1	View file
arch/m68k/configs/amiga_defconfig	modified	+0	−1	View file
arch/m68k/configs/apollo_defconfig	modified	+0	−1	View file
arch/m68k/configs/atari_defconfig	modified	+0	−1	View file
arch/m68k/configs/bvme6000_defconfig	modified	+0	−1	View file
arch/m68k/configs/hp300_defconfig	modified	+0	−1	View file
arch/m68k/configs/mac_defconfig	modified	+0	−1	View file
arch/m68k/configs/multi_defconfig	modified	+0	−1	View file
arch/m68k/configs/mvme147_defconfig	modified	+0	−1	View file
arch/m68k/configs/mvme16x_defconfig	modified	+0	−1	View file
arch/m68k/configs/q40_defconfig	modified	+0	−1	View file
arch/m68k/configs/stmark2_defconfig	modified	+0	−1	View file
arch/m68k/configs/sun3_defconfig	modified	+0	−1	View file
arch/m68k/configs/sun3x_defconfig	modified	+0	−1	View file
arch/mips/configs/decstation_64_defconfig	modified	+0	−1	View file
arch/mips/configs/decstation_defconfig	modified	+0	−1	View file
arch/mips/configs/decstation_r4k_defconfig	modified	+0	−1	View file
arch/s390/configs/debug_defconfig	modified	+0	−1	View file
arch/s390/configs/defconfig	modified	+0	−1	View file
arch/sh/configs/ap325rxa_defconfig	modified	+0	−1	View file
arch/sh/configs/apsh4a3a_defconfig	modified	+0	−1	View file
arch/sh/configs/apsh4ad0a_defconfig	modified	+0	−1	View file
arch/sh/configs/dreamcast_defconfig	modified	+0	−1	View file
arch/sh/configs/ecovec24_defconfig	modified	+0	−1	View file
arch/sh/configs/edosk7760_defconfig	modified	+0	−1	View file
arch/sh/configs/espt_defconfig	modified	+0	−1	View file
arch/sh/configs/hp6xx_defconfig	modified	+0	−1	View file
arch/sh/configs/landisk_defconfig	modified	+0	−1	View file
arch/sh/configs/lboxre2_defconfig	modified	+0	−1	View file
arch/sh/configs/migor_defconfig	modified	+0	−1	View file
arch/sh/configs/r7780mp_defconfig	modified	+0	−1	View file
arch/sh/configs/r7785rp_defconfig	modified	+0	−1	View file
arch/sh/configs/rts7751r2d1_defconfig	modified	+0	−1	View file
arch/sh/configs/rts7751r2dplus_defconfig	modified	+0	−1	View file
arch/sh/configs/sdk7780_defconfig	modified	+0	−1	View file
arch/sh/configs/sdk7786_defconfig	modified	+0	−1	View file
arch/sh/configs/se7206_defconfig	modified	+0	−1	View file
arch/sh/configs/se7343_defconfig	modified	+0	−1	View file
arch/sh/configs/se7705_defconfig	modified	+0	−1	View file
arch/sh/configs/se7712_defconfig	modified	+0	−1	View file
arch/sh/configs/se7721_defconfig	modified	+0	−1	View file
arch/sh/configs/se7722_defconfig	modified	+0	−1	View file
arch/sh/configs/se7724_defconfig	modified	+0	−1	View file
arch/sh/configs/se7750_defconfig	modified	+0	−1	View file
arch/sh/configs/se7751_defconfig	modified	+0	−1	View file
arch/sh/configs/se7780_defconfig	modified	+0	−1	View file
arch/sh/configs/sh03_defconfig	modified	+0	−1	View file
arch/sh/configs/sh2007_defconfig	modified	+0	−1	View file
arch/sh/configs/sh7710voipgw_defconfig	modified	+0	−1	View file
arch/sh/configs/sh7757lcr_defconfig	modified	+0	−1	View file
arch/sh/configs/sh7763rdp_defconfig	modified	+0	−1	View file
arch/sh/configs/sh7785lcr_32bit_defconfig	modified	+0	−1	View file
arch/sh/configs/sh7785lcr_defconfig	modified	+0	−1	View file
arch/sh/configs/shmin_defconfig	modified	+0	−1	View file
arch/sh/configs/shx3_defconfig	modified	+0	−1	View file
arch/sh/configs/titan_defconfig	modified	+0	−1	View file
arch/sh/configs/ul2_defconfig	modified	+0	−1	View file
arch/sh/configs/urquell_defconfig	modified	+0	−1	View file
arch/sparc/configs/sparc32_defconfig	modified	+0	−1	View file
arch/sparc/configs/sparc64_defconfig	modified	+0	−1	View file
arch/x86/crypto/aesni-intel_glue.c	modified	+1	−2	View file
arch/xtensa/configs/audio_kc705_defconfig	modified	+0	−1	View file
arch/xtensa/configs/generic_kc705_defconfig	modified	+0	−1	View file
arch/xtensa/configs/iss_defconfig	modified	+0	−1	View file
arch/xtensa/configs/nommu_kc705_defconfig	modified	+0	−1	View file
arch/xtensa/configs/smp_lx200_defconfig	modified	+0	−1	View file
arch/xtensa/configs/virt_defconfig	modified	+0	−1	View file
arch/xtensa/configs/xip_kc705_defconfig	modified	+0	−1	View file
crypto/Kconfig	modified	+7	−14	View file
crypto/Makefile	modified	+2	−1	View file
crypto/aead.c	modified	+20	−0	View file
crypto/af_alg.c	modified	+2	−3	View file
crypto/ahash.c	modified	+16	−2	View file
crypto/algif_hash.c	modified	+1	−2	View file
crypto/algif_rng.c	modified	+1	−2	View file
crypto/ansi_cprng.c	deleted	+0	−474	View before deletion
crypto/asymmetric_keys/asymmetric_type.c	modified	+10	−4	View file
crypto/asymmetric_keys/restrict.c	modified	+5	−2	View file
crypto/asymmetric_keys/x509_cert_parser.c	modified	+1	−1	View file
crypto/asymmetric_keys/x509_public_key.c	modified	+1	−1	View file
crypto/authenc.c	modified	+50	−25	View file
crypto/deflate.c	modified	+2	−1	View file
crypto/df_sp80090a.c	added	+232	−0	View file
crypto/drbg.c	modified	+13	−253	View file
crypto/fips.c	modified	+4	−1	View file
crypto/scatterwalk.c	modified	+84	−261	View file
crypto/skcipher.c	modified	+255	−6	View file
crypto/tcrypt.c	modified	+0	−8	View file
crypto/tcrypt.h	modified	+0	−18	View file
crypto/testmgr.c	modified	+0	−97	View file
crypto/testmgr.h	modified	+120	−106	View file
crypto/zstd.c	modified	+6	−11	View file
drivers/char/hw_random/bcm2835-rng.c	modified	+3	−8	View file
drivers/char/hw_random/core.c	modified	+7	−4	View file
drivers/crypto/Kconfig	modified	+1	−0	View file
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c	modified	+1	−1	View file
drivers/crypto/atmel-i2c.c	modified	+1	−1	View file
drivers/crypto/axis/artpec6_crypto.c	modified	+3	−6	View file
drivers/crypto/caam/blob_gen.c	modified	+70	−16	View file
drivers/crypto/caam/caamalg.c	modified	+117	−11	View file
drivers/crypto/caam/caamalg_desc.c	modified	+84	−3	View file
drivers/crypto/caam/caamalg_desc.h	modified	+12	−1	View file
drivers/crypto/caam/caamrng.c	modified	+3	−1	View file
drivers/crypto/caam/desc.h	modified	+8	−1	View file
drivers/crypto/caam/desc_constr.h	modified	+7	−1	View file
drivers/crypto/cavium/nitrox/nitrox_mbx.c	modified	+1	−1	View file
drivers/crypto/ccp/ccp-dev.c	modified	+1	−1	View file
drivers/crypto/ccp/sp-dev.h	modified	+1	−1	View file
drivers/crypto/ccp/sp-pci.c	modified	+19	−0	View file
drivers/crypto/ccp/sp-platform.c	modified	+3	−14	View file
drivers/crypto/ccree/cc_buffer_mgr.c	modified	+5	−1	View file
drivers/crypto/hifn_795x.c	modified	+3	−4	View file
drivers/crypto/hisilicon/qm.c	modified	+40	−15	View file
drivers/crypto/hisilicon/sgl.c	modified	+0	−5	View file
drivers/crypto/intel/iaa/iaa_crypto_main.c	modified	+1	−1	View file
drivers/crypto/intel/qat/qat_common/adf_aer.c	modified	+2	−2	View file
drivers/crypto/intel/qat/qat_common/adf_isr.c	modified	+2	−1	View file
drivers/crypto/intel/qat/qat_common/adf_sriov.c	modified	+2	−1	View file
drivers/crypto/intel/qat/qat_common/adf_vf_isr.c	modified	+2	−1	View file
drivers/crypto/intel/qat/qat_common/qat_uclo.c	modified	+5	−13	View file
drivers/crypto/marvell/cesa/cesa.c	modified	+2	−5	View file
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c	modified	+3	−2	View file
drivers/crypto/qce/core.c	modified	+1	−2	View file
drivers/crypto/qce/dma.c	modified	+4	−2	View file
drivers/crypto/rockchip/rk3288_crypto_skcipher.c	modified	+1	−2	View file
drivers/crypto/starfive/jh7110-hash.c	modified	+5	−1	View file
drivers/crypto/ti/Kconfig	modified	+1	−0	View file
drivers/crypto/ti/dthev2-aes.c	modified	+131	−6	View file
drivers/crypto/ti/dthev2-common.h	modified	+9	−1	View file
drivers/crypto/xilinx/xilinx-trng.c	modified	+32	−7	View file
include/crypto/aead.h	modified	+87	−0	View file
include/crypto/algapi.h	modified	+12	−0	View file
include/crypto/df_sp80090a.h	added	+28	−0	View file
include/crypto/drbg.h	modified	+1	−24	View file
include/crypto/internal/drbg.h	added	+54	−0	View file
include/crypto/internal/skcipher.h	modified	+47	−1	View file
include/crypto/rng.h	modified	+5	−6	View file
include/crypto/scatterwalk.h	modified	+33	−84	View file
include/keys/asymmetric-type.h	modified	+1	−1	View file
include/linux/rhashtable.h	modified	+58	−12	View file
include/soc/fsl/caam-blob.h	modified	+26	−0	View file
kernel/padata.c	modified	+4	−8	View file
lib/crypto/mpi/mpicoder.c	modified	+1	−1	View file
security/keys/trusted-keys/trusted_caam.c	modified	+108	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/crypto/userspace-if.rst

View file

diff --git a/Documentation/crypto/userspace-if.rst b/Documentation/crypto/userspace-if.rst
index f80f243..8158b36 100644
--- a/Documentation/crypto/userspace-if.rst
+++ b/Documentation/crypto/userspace-if.rst
@@ -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

View file

diff --git a/Documentation/devicetree/bindings/crypto/amd,ccp-seattle-v1a.yaml b/Documentation/devicetree/bindings/crypto/amd,ccp-seattle-v1a.yaml
index 32bf3a1..5fb7084 100644
--- a/Documentation/devicetree/bindings/crypto/amd,ccp-seattle-v1a.yaml
+++ b/Documentation/devicetree/bindings/crypto/amd,ccp-seattle-v1a.yaml
@@ -21,6 +21,9 @@ properties:
 
   dma-coherent: true
 
+  iommus:
+    maxItems: 4
+
 required:
   - compatible
   - reg

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

View file

diff --git a/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml b/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
index 08fe6a7..c3408dc 100644
--- a/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
+++ b/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
@@ -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

View file

diff --git a/Documentation/devicetree/bindings/crypto/qcom,prng.yaml b/Documentation/devicetree/bindings/crypto/qcom,prng.yaml
index ed7e16b..597441d 100644
--- a/Documentation/devicetree/bindings/crypto/qcom,prng.yaml
+++ b/Documentation/devicetree/bindings/crypto/qcom,prng.yaml
@@ -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

View file

diff --git a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
index e009cb7..79d5be2 100644
--- a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
+++ b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml
@@ -45,6 +45,7 @@ properties:
 
       - items:
           - enum:
+              - qcom,kaanapali-qce
               - qcom,qcs615-qce
               - qcom,qcs8300-qce
               - qcom,sa8775p-qce

Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt b/Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt
deleted file mode 100644
index c6d1003..0000000
--- a/Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-* Microchip PIC32 Random Number Generator
-
-The PIC32 RNG provides a pseudo random number generator which can be seeded by
-another true random number generator.
-
-Required properties:
-- compatible : should be "microchip,pic32mzda-rng"
-- reg : Specifies base physical address and size of the registers.
-- clocks: clock phandle.
-
-Example:
-
-	rng: rng@1f8e6000 {
-		compatible = "microchip,pic32mzda-rng";
-		reg = <0x1f8e6000 0x1000>;
-		clocks = <&PBCLK5>;
-	};

Documentation/devicetree/bindings/rng/microchip,pic32-rng.yaml

View file

diff --git a/Documentation/devicetree/bindings/rng/microchip,pic32-rng.yaml b/Documentation/devicetree/bindings/rng/microchip,pic32-rng.yaml
new file mode 100644
index 0000000..1f6f6fb
--- /dev/null
+++ b/Documentation/devicetree/bindings/rng/microchip,pic32-rng.yaml
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/rng/microchip,pic32-rng.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Microchip PIC32 Random Number Generator
+
+description: |
+  The PIC32 RNG provides a pseudo random number generator which can be seeded
+  by another true random number generator.
+
+maintainers:
+  - Joshua Henderson <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - microchip,pic32mzda-rng
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - clocks
+
+additionalProperties: false
+
+examples:
+  - |
+    rng: rng@1f8e6000 {
+      compatible = "microchip,pic32mzda-rng";
+      reg = <0x1f8e6000 0x1000>;
+      clocks = <&PBCLK5>;
+    };

Documentation/security/keys/trusted-encrypted.rst

View file

diff --git a/Documentation/security/keys/trusted-encrypted.rst b/Documentation/security/keys/trusted-encrypted.rst
index f4d7e16..eae6a36 100644
--- a/Documentation/security/keys/trusted-encrypted.rst
+++ b/Documentation/security/keys/trusted-encrypted.rst
@@ -10,6 +10,37 @@ of a Trust Source for greater security, while Encrypted Keys can be used on any
 system. All user level blobs, are displayed and loaded in hex ASCII for
 convenience, and are integrity verified.
 
+Trusted Keys as Protected key
+=============================
+It is the secure way of keeping the keys in the kernel key-ring as Trusted-Key,
+such that:
+
+- Key-blob, an encrypted key-data, created to be stored, loaded and seen by
+  userspace.
+- Key-data, the plain-key text in the system memory, to be used by
+  kernel space only.
+
+Though key-data is not accessible to the user-space in plain-text, but it is in
+plain-text in system memory, when used in kernel space. Even though kernel-space
+attracts small surface attack, but with compromised kernel or side-channel
+attack accessing the system memory can lead to a chance of the key getting
+compromised/leaked.
+
+In order to protect the key in kernel space, the concept of "protected-keys" is
+introduced which will act as an added layer of protection. The key-data of the
+protected keys is encrypted with Key-Encryption-Key(KEK), and decrypted inside
+the trust source boundary. The plain-key text never available out-side in the
+system memory. Thus, any crypto operation that is to be executed using the
+protected key, can only be done by the trust source, which generated the
+key blob.
+
+Hence, if the protected-key is leaked or compromised, it is of no use to the
+hacker.
+
+Trusted keys as protected keys, with trust source having the capability of
+generating:
+
+- Key-Blob, to be loaded, stored and seen by user-space.
 
 Trust Source
 ============
@@ -252,7 +283,7 @@ in bytes. Trusted Keys can be 32 - 128 bytes (256 - 1024 bits).
 Trusted Keys usage: CAAM
 ------------------------
 
-Usage::
+Trusted Keys Usage::
 
     keyctl add trusted name "new keylen" ring
     keyctl add trusted name "load hex_blob" ring
@@ -262,6 +293,21 @@ Usage::
 CAAM-specific format.  The key length for new keys is always in bytes.
 Trusted Keys can be 32 - 128 bytes (256 - 1024 bits).
 
+Trusted Keys as Protected Keys Usage::
+
+    keyctl add trusted name "new keylen pk [options]" ring
+    keyctl add trusted name "load hex_blob [options]" ring
+    keyctl print keyid
+
+    where, 'pk' is used to direct trust source to generate protected key.
+
+    options:
+       key_enc_algo =      For CAAM, supported enc algo are ECB(2), CCM(1).
+
+"keyctl print" returns an ASCII hex copy of the sealed key, which is in a
+CAAM-specific format.  The key length for new keys is always in bytes.
+Trusted Keys can be 32 - 128 bytes (256 - 1024 bits).
+
 Trusted Keys usage: DCP
 -----------------------
 
@@ -343,6 +389,46 @@ Load a trusted key from the saved blob::
     f1f8fff03ad0acb083725535636addb08d73dedb9832da198081e5deae84bfaf0409c22b
     e4a8aea2b607ec96931e6f4d4fe563ba
 
+Create and save a trusted key as protected key named "kmk" of length 32 bytes.
+
+::
+
+    $ keyctl add trusted kmk "new 32 pk key_enc_algo=1" @u
+    440502848
+
+    $ keyctl show
+    Session Keyring
+           -3 --alswrv    500   500  keyring: _ses
+     97833714 --alswrv    500    -1   \_ keyring: _uid.500
+    440502848 --alswrv    500   500       \_ trusted: kmk
+
+    $ keyctl print 440502848
+    0101000000000000000001005d01b7e3f4a6be5709930f3b70a743cbb42e0cc95e18e915
+    3f60da455bbf1144ad12e4f92b452f966929f6105fd29ca28e4d4d5a031d068478bacb0b
+    27351119f822911b0a11ba3d3498ba6a32e50dac7f32894dd890eb9ad578e4e292c83722
+    a52e56a097e6a68b3f56f7a52ece0cdccba1eb62cad7d817f6dc58898b3ac15f36026fec
+    d568bd4a706cb60bb37be6d8f1240661199d640b66fb0fe3b079f97f450b9ef9c22c6d5d
+    dd379f0facd1cd020281dfa3c70ba21a3fa6fc2471dc6d13ecf8298b946f65345faa5ef0
+    f1f8fff03ad0acb083725535636addb08d73dedb9832da198081e5deae84bfaf0409c22b
+    e4a8aea2b607ec96931e6f4d4fe563ba
+
+    $ keyctl pipe 440502848 > kmk.blob
+
+Load a trusted key from the saved blob::
+
+    $ keyctl add trusted kmk "load `cat kmk.blob` key_enc_algo=1" @u
+    268728824
+
+    $ keyctl print 268728824
+    0101000000000000000001005d01b7e3f4a6be5709930f3b70a743cbb42e0cc95e18e915
+    3f60da455bbf1144ad12e4f92b452f966929f6105fd29ca28e4d4d5a031d068478bacb0b
+    27351119f822911b0a11ba3d3498ba6a32e50dac7f32894dd890eb9ad578e4e292c83722
+    a52e56a097e6a68b3f56f7a52ece0cdccba1eb62cad7d817f6dc58898b3ac15f36026fec
+    d568bd4a706cb60bb37be6d8f1240661199d640b66fb0fe3b079f97f450b9ef9c22c6d5d
+    dd379f0facd1cd020281dfa3c70ba21a3fa6fc2471dc6d13ecf8298b946f65345faa5ef0
+    f1f8fff03ad0acb083725535636addb08d73dedb9832da198081e5deae84bfaf0409c22b
+    e4a8aea2b607ec96931e6f4d4fe563ba
+
 Reseal (TPM specific) a trusted key under new PCR values::
 
     $ keyctl update 268728824 "update pcrinfo=`cat pcr.blob`"

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 472dc58..ff0106c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6613,7 +6613,6 @@ CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
 M:	Neil Horman <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	crypto/ansi_cprng.c
 F:	crypto/rng.c
 
 CS3308 MEDIA DRIVER
@@ -12573,6 +12572,7 @@ F:	drivers/dma/ioat*
 INTEL IAA CRYPTO DRIVER
 M:	Kristen Accardi <[email protected]>
 M:	Vinicius Costa Gomes <[email protected]>
+M:	Kanchana P Sridhar <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	Documentation/driver-api/crypto/iaa/iaa-crypto.rst

arch/arm/configs/axm55xx_defconfig

View file

diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig
index 242a612..22b1890 100644
--- a/arch/arm/configs/axm55xx_defconfig
+++ b/arch/arm/configs/axm55xx_defconfig
@@ -232,4 +232,3 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_DEBUG_USER=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/clps711x_defconfig

View file

diff --git a/arch/arm/configs/clps711x_defconfig b/arch/arm/configs/clps711x_defconfig
index 6fa3477..f66d502 100644
--- a/arch/arm/configs/clps711x_defconfig
+++ b/arch/arm/configs/clps711x_defconfig
@@ -75,5 +75,4 @@ CONFIG_MINIX_FS=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set

arch/arm/configs/dove_defconfig

View file

diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index bb6c474..e98c35d 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -126,7 +126,6 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_PRINTK_TIME=y
 # CONFIG_DEBUG_BUGVERBOSE is not set

arch/arm/configs/ep93xx_defconfig

View file

diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig
index 7f3756d..9f3c732 100644
--- a/arch/arm/configs/ep93xx_defconfig
+++ b/arch/arm/configs/ep93xx_defconfig
@@ -119,4 +119,3 @@ CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/jornada720_defconfig

View file

diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig
index e6ec768..d57285c 100644
--- a/arch/arm/configs/jornada720_defconfig
+++ b/arch/arm/configs/jornada720_defconfig
@@ -92,4 +92,3 @@ CONFIG_NLS_UTF8=m
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_LL=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/keystone_defconfig

View file

diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index c1291ca..b0cadd8 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -228,7 +228,6 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_XCBC=y
-CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_DMA_CMA=y

arch/arm/configs/lpc32xx_defconfig

View file

diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
index 9afccd7..2bddb09 100644
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
@@ -177,7 +177,6 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
-CONFIG_CRYPTO_ANSI_CPRNG=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y

arch/arm/configs/mmp2_defconfig

View file

diff --git a/arch/arm/configs/mmp2_defconfig b/arch/arm/configs/mmp2_defconfig
index f67e9cd..a9a212a 100644
--- a/arch/arm/configs/mmp2_defconfig
+++ b/arch/arm/configs/mmp2_defconfig
@@ -78,4 +78,3 @@ CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_DEBUG_MMP_UART3=y
 CONFIG_EARLY_PRINTK=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/mv78xx0_defconfig

View file

diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig
index 55f4ab6..d3a26ef 100644
--- a/arch/arm/configs/mv78xx0_defconfig
+++ b/arch/arm/configs/mv78xx0_defconfig
@@ -121,4 +121,3 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_SCHEDSTATS=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/omap1_defconfig

View file

diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index 24c54bf..dee8204 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -220,7 +220,6 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_PCBC=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y

arch/arm/configs/orion5x_defconfig

View file

diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index c284262..002c914 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -145,4 +145,3 @@ CONFIG_LATENCYTOP=y
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/pxa168_defconfig

View file

diff --git a/arch/arm/configs/pxa168_defconfig b/arch/arm/configs/pxa168_defconfig
index 4748c7d..8cbca84 100644
--- a/arch/arm/configs/pxa168_defconfig
+++ b/arch/arm/configs/pxa168_defconfig
@@ -48,4 +48,3 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/pxa3xx_defconfig

View file

diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig
index 381356f..07d422f 100644
--- a/arch/arm/configs/pxa3xx_defconfig
+++ b/arch/arm/configs/pxa3xx_defconfig
@@ -106,5 +106,4 @@ CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_USER=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set

arch/arm/configs/pxa910_defconfig

View file

diff --git a/arch/arm/configs/pxa910_defconfig b/arch/arm/configs/pxa910_defconfig
index 49b59c6..71ed0d7 100644
--- a/arch/arm/configs/pxa910_defconfig
+++ b/arch/arm/configs/pxa910_defconfig
@@ -59,4 +59,3 @@ CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_DEBUG_MMP_UART2=y
 CONFIG_EARLY_PRINTK=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/spitz_defconfig

View file

diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig
index 395df2f..c130af6 100644
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
@@ -228,7 +228,6 @@ CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MICHAEL_MIC=m

arch/arm64/configs/defconfig

View file

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 997fa7c..94d372e 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1784,7 +1784,6 @@ CONFIG_CRYPTO_BENCHMARK=m
 CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_SM3_ARM64_CE=m

arch/hexagon/configs/comet_defconfig

View file

diff --git a/arch/hexagon/configs/comet_defconfig b/arch/hexagon/configs/comet_defconfig
index 22d7f8a..83b7626 100644
--- a/arch/hexagon/configs/comet_defconfig
+++ b/arch/hexagon/configs/comet_defconfig
@@ -69,7 +69,6 @@ CONFIG_INET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
 CONFIG_FRAME_WARN=0
 CONFIG_MAGIC_SYSRQ=y

arch/m68k/configs/amcore_defconfig

View file

diff --git a/arch/m68k/configs/amcore_defconfig b/arch/m68k/configs/amcore_defconfig
index 6076781..88832e9 100644
--- a/arch/m68k/configs/amcore_defconfig
+++ b/arch/m68k/configs/amcore_defconfig
@@ -86,5 +86,4 @@ CONFIG_PANIC_ON_OOPS=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_CRYPTO_ECHAINIV is not set
-CONFIG_CRYPTO_ANSI_CPRNG=y
 # CONFIG_CRYPTO_HW is not set

arch/m68k/configs/amiga_defconfig

View file

diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index e717099..bfc1ee7 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -590,7 +590,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/apollo_defconfig

View file

diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 6b0bab7..d9d1f3c 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -547,7 +547,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/atari_defconfig

View file

diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index bb59e3f..523205a 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -567,7 +567,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/bvme6000_defconfig

View file

diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index ed85517..7b0a4ef 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -539,7 +539,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/hp300_defconfig

View file

diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 0217a69..089c5c3 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -549,7 +549,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/mac_defconfig

View file

diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index a9ba431..5f2484c 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -566,7 +566,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/multi_defconfig

View file

diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index f0d0d12..74f0a1f 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -653,7 +653,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/mvme147_defconfig

View file

diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index baf0fc7..4bee18c 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -539,7 +539,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/mvme16x_defconfig

View file

diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 9cb732f..322c17e 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -540,7 +540,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/q40_defconfig

View file

diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 6b3295e..82f9baa 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -556,7 +556,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=m
-CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=m

arch/m68k/configs/stmark2_defconfig

View file

diff --git a/arch/m68k/configs/stmark2_defconfig b/arch/m68k/configs/stmark2_defconfig
index f3268fe..f9ecb1d 100644
--- a/arch/m68k/configs/stmark2_defconfig
+++ b/arch/m68k/configs/stmark2_defconfig
@@ -84,7 +84,6 @@ CONFIG_FSCACHE=y
 CONFIG_CRAMFS=y
 CONFIG_SQUASHFS=y
 CONFIG_ROMFS_FS=y
-CONFIG_CRYPTO_ANSI_CPRNG=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_PRINTK_TIME=y
 # CONFIG_DEBUG_BUGVERBOSE is not set

arch/m68k/configs/sun3_defconfig

View file

diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 1f3a2fa..f94ad22 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -537,7 +537,6 @@ CONFIG_CRYPTO_842=m

This diff is incomplete. Download the complete patch.