forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/crypto/Kconfig
....@@ -15,6 +15,7 @@
1515 #
1616 menuconfig CRYPTO
1717 	tristate "Cryptographic API"
18
+	select LIB_MEMNEQ
1819 	help
1920 	  This option provides the core Cryptographic API.
2021 
....@@ -27,10 +28,40 @@
2728 	depends on (CRYPTO_ANSI_CPRNG || CRYPTO_DRBG) && !CRYPTO_MANAGER_DISABLE_TESTS
2829 	depends on (MODULE_SIG || !MODULES)
2930 	help
30
-	  This options enables the fips boot option which is
31
-	  required if you want to system to operate in a FIPS 200
31
+	  This option enables the fips boot option which is
32
+	  required if you want the system to operate in a FIPS 200
3233 	  certification.  You should say no unless you know what
3334 	  this is.
35
+
36
+# CRYPTO_FIPS140 just enables the support in the kernel for loading fips140.ko.
37
+# The module still needs to be built and loaded if you need FIPS 140 compliance.
38
+config CRYPTO_FIPS140
39
+	def_bool y
40
+	depends on MODULES && ARM64 && ARM64_MODULE_PLTS
41
+
42
+config CRYPTO_FIPS140_MOD
43
+	bool "Enable FIPS 140 cryptographic module"
44
+	depends on LTO_CLANG && CRYPTO_FIPS140
45
+	help
46
+	  This option enables building a loadable module fips140.ko, which
47
+	  contains various crypto algorithms that are also built into vmlinux.
48
+	  At load time, this module overrides the built-in implementations of
49
+	  these algorithms with its implementations.  It also runs self-tests on
50
+	  these algorithms and verifies the integrity of its code and data.  If
51
+	  either of these steps fails, the kernel will panic.
52
+
53
+	  This module is intended to be loaded at early boot time in order to
54
+	  meet FIPS 140 and NIAP FPT_TST_EXT.1 requirements.  It shouldn't be
55
+	  used if you don't need to meet these requirements.
56
+
57
+config CRYPTO_FIPS140_MOD_EVAL_TESTING
58
+	bool "Enable evaluation testing features in FIPS 140 module"
59
+	depends on CRYPTO_FIPS140_MOD
60
+	help
61
+	  This option adds some features to the FIPS 140 module which are needed
62
+	  for lab evaluation testing of the module, e.g. support for injecting
63
+	  errors and support for a userspace interface to some of the module's
64
+	  services.  This option should not be enabled in production builds.
3465 
3566 config CRYPTO_ALGAPI
3667 	tristate
....@@ -52,16 +83,15 @@
5283 	select CRYPTO_NULL2
5384 	select CRYPTO_RNG2
5485 
55
-config CRYPTO_BLKCIPHER
86
+config CRYPTO_SKCIPHER
5687 	tristate
57
-	select CRYPTO_BLKCIPHER2
88
+	select CRYPTO_SKCIPHER2
5889 	select CRYPTO_ALGAPI
5990 
60
-config CRYPTO_BLKCIPHER2
91
+config CRYPTO_SKCIPHER2
6192 	tristate
6293 	select CRYPTO_ALGAPI2
6394 	select CRYPTO_RNG2
64
-	select CRYPTO_WORKQUEUE
6595 
6696 config CRYPTO_HASH
6797 	tristate
....@@ -113,29 +143,6 @@
113143 	select CRYPTO_ALGAPI
114144 	select CRYPTO_ACOMP2
115145 
116
-config CRYPTO_RSA
117
-	tristate "RSA algorithm"
118
-	select CRYPTO_AKCIPHER
119
-	select CRYPTO_MANAGER
120
-	select MPILIB
121
-	select ASN1
122
-	help
123
-	  Generic implementation of the RSA public key algorithm.
124
-
125
-config CRYPTO_DH
126
-	tristate "Diffie-Hellman algorithm"
127
-	select CRYPTO_KPP
128
-	select MPILIB
129
-	help
130
-	  Generic implementation of the Diffie-Hellman algorithm.
131
-
132
-config CRYPTO_ECDH
133
-	tristate "ECDH algorithm"
134
-	select CRYPTO_KPP
135
-	select CRYPTO_RNG_DEFAULT
136
-	help
137
-	  Generic implementation of the ECDH algorithm
138
-
139146 config CRYPTO_MANAGER
140147 	tristate "Cryptographic algorithm manager"
141148 	select CRYPTO_MANAGER2
....@@ -147,7 +154,7 @@
147154 	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
148155 	select CRYPTO_AEAD2
149156 	select CRYPTO_HASH2
150
-	select CRYPTO_BLKCIPHER2
157
+	select CRYPTO_SKCIPHER2
151158 	select CRYPTO_AKCIPHER2
152159 	select CRYPTO_KPP2
153160 	select CRYPTO_ACOMP2
....@@ -167,14 +174,18 @@
167174 	  Disable run-time self tests that normally take place at
168175 	  algorithm registration.
169176 
170
-config CRYPTO_GF128MUL
171
-	tristate "GF(2^128) multiplication functions"
177
+config CRYPTO_MANAGER_EXTRA_TESTS
178
+	bool "Enable extra run-time crypto self tests"
179
+	depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER
172180 	help
173
-	  Efficient table driven implementation of multiplications in the
174
-	  field GF(2^128).  This is needed by some cypher modes. This
175
-	  option will be selected automatically if you select such a
176
-	  cipher mode.  Only select this option by hand if you expect to load
177
-	  an external module that requires these functions.
181
+	  Enable extra run-time self tests of registered crypto algorithms,
182
+	  including randomized fuzz tests.
183
+
184
+	  This is intended for developer use only, as these tests take much
185
+	  longer to run than the normal self tests.
186
+
187
+config CRYPTO_GF128MUL
188
+	tristate
178189 
179190 config CRYPTO_NULL
180191 	tristate "Null algorithms"
....@@ -185,7 +196,7 @@
185196 config CRYPTO_NULL2
186197 	tristate
187198 	select CRYPTO_ALGAPI2
188
-	select CRYPTO_BLKCIPHER2
199
+	select CRYPTO_SKCIPHER2
189200 	select CRYPTO_HASH2
190201 
191202 config CRYPTO_PCRYPT
....@@ -198,38 +209,20 @@
198209 	  This converts an arbitrary crypto algorithm into a parallel
199210 	  algorithm that executes in kernel threads.
200211 
201
-config CRYPTO_WORKQUEUE
202
-       tristate
203
-
204212 config CRYPTO_CRYPTD
205213 	tristate "Software async crypto daemon"
206
-	select CRYPTO_BLKCIPHER
214
+	select CRYPTO_SKCIPHER
207215 	select CRYPTO_HASH
208216 	select CRYPTO_MANAGER
209
-	select CRYPTO_WORKQUEUE
210217 	help
211218 	  This is a generic software asynchronous crypto daemon that
212219 	  converts an arbitrary synchronous software crypto algorithm
213220 	  into an asynchronous algorithm that executes in a kernel thread.
214221 
215
-config CRYPTO_MCRYPTD
216
-	tristate "Software async multi-buffer crypto daemon"
217
-	select CRYPTO_BLKCIPHER
218
-	select CRYPTO_HASH
219
-	select CRYPTO_MANAGER
220
-	select CRYPTO_WORKQUEUE
221
-	help
222
-	  This is a generic software asynchronous crypto daemon that
223
-	  provides the kernel thread to assist multi-buffer crypto
224
-	  algorithms for submitting jobs and flushing jobs in multi-buffer
225
-	  crypto algorithms.  Multi-buffer crypto algorithms are executed
226
-	  in the context of this kernel thread and drivers can post
227
-	  their crypto request asynchronously to be processed by this daemon.
228
-
229222 config CRYPTO_AUTHENC
230223 	tristate "Authenc support"
231224 	select CRYPTO_AEAD
232
-	select CRYPTO_BLKCIPHER
225
+	select CRYPTO_SKCIPHER
233226 	select CRYPTO_MANAGER
234227 	select CRYPTO_HASH
235228 	select CRYPTO_NULL
....@@ -251,10 +244,69 @@
251244 config CRYPTO_GLUE_HELPER_X86
252245 	tristate
253246 	depends on X86
254
-	select CRYPTO_BLKCIPHER
247
+	select CRYPTO_SKCIPHER
255248 
256249 config CRYPTO_ENGINE
257250 	tristate
251
+
252
+comment "Public-key cryptography"
253
+
254
+config CRYPTO_RSA
255
+	tristate "RSA algorithm"
256
+	select CRYPTO_AKCIPHER
257
+	select CRYPTO_MANAGER
258
+	select MPILIB
259
+	select ASN1
260
+	help
261
+	  Generic implementation of the RSA public key algorithm.
262
+
263
+config CRYPTO_DH
264
+	tristate "Diffie-Hellman algorithm"
265
+	select CRYPTO_KPP
266
+	select MPILIB
267
+	help
268
+	  Generic implementation of the Diffie-Hellman algorithm.
269
+
270
+config CRYPTO_ECC
271
+	tristate
272
+	select CRYPTO_RNG_DEFAULT
273
+
274
+config CRYPTO_ECDH
275
+	tristate "ECDH algorithm"
276
+	select CRYPTO_ECC
277
+	select CRYPTO_KPP
278
+	help
279
+	  Generic implementation of the ECDH algorithm
280
+
281
+config CRYPTO_ECRDSA
282
+	tristate "EC-RDSA (GOST 34.10) algorithm"
283
+	select CRYPTO_ECC
284
+	select CRYPTO_AKCIPHER
285
+	select CRYPTO_STREEBOG
286
+	select OID_REGISTRY
287
+	select ASN1
288
+	help
289
+	  Elliptic Curve Russian Digital Signature Algorithm (GOST R 34.10-2012,
290
+	  RFC 7091, ISO/IEC 14888-3:2018) is one of the Russian cryptographic
291
+	  standard algorithms (called GOST algorithms). Only signature verification
292
+	  is implemented.
293
+
294
+config CRYPTO_SM2
295
+	tristate "SM2 algorithm"
296
+	select CRYPTO_SM3
297
+	select CRYPTO_AKCIPHER
298
+	select CRYPTO_MANAGER
299
+	select MPILIB
300
+	select ASN1
301
+	help
302
+	  Generic implementation of the SM2 public key algorithm. It was
303
+	  published by State Encryption Management Bureau, China.
304
+	  as specified by OSCCA GM/T 0003.1-2012 -- 0003.5-2012.
305
+
306
+	  References:
307
+	  https://tools.ietf.org/html/draft-shen-sm2-ecdsa-02
308
+	  http://www.oscca.gov.cn/sca/xxgk/2010-12/17/content_1002386.shtml
309
+	  http://www.gmbz.org.cn/main/bzlb.html
258310 
259311 config CRYPTO_CURVE25519
260312 	tristate "Curve25519 algorithm"
....@@ -274,6 +326,7 @@
274326 	select CRYPTO_CTR
275327 	select CRYPTO_HASH
276328 	select CRYPTO_AEAD
329
+	select CRYPTO_MANAGER
277330 	help
278331 	  Support for Counter with CBC MAC. Required for IPsec.
279332 
....@@ -283,6 +336,7 @@
283336 	select CRYPTO_AEAD
284337 	select CRYPTO_GHASH
285338 	select CRYPTO_NULL
339
+	select CRYPTO_MANAGER
286340 	help
287341 	  Support for Galois/Counter Mode (GCM) and Galois Message
288342 	  Authentication Code (GMAC). Required for IPSec.
....@@ -292,6 +346,7 @@
292346 	select CRYPTO_CHACHA20
293347 	select CRYPTO_POLY1305
294348 	select CRYPTO_AEAD
349
+	select CRYPTO_MANAGER
295350 	help
296351 	  ChaCha20-Poly1305 AEAD support, RFC7539.
297352 
....@@ -306,106 +361,26 @@
306361 	help
307362 	 Support for the AEGIS-128 dedicated AEAD algorithm.
308363 
309
-config CRYPTO_AEGIS128L
310
-	tristate "AEGIS-128L AEAD algorithm"
311
-	select CRYPTO_AEAD
312
-	select CRYPTO_AES  # for AES S-box tables
313
-	help
314
-	 Support for the AEGIS-128L dedicated AEAD algorithm.
315
-
316
-config CRYPTO_AEGIS256
317
-	tristate "AEGIS-256 AEAD algorithm"
318
-	select CRYPTO_AEAD
319
-	select CRYPTO_AES  # for AES S-box tables
320
-	help
321
-	 Support for the AEGIS-256 dedicated AEAD algorithm.
364
+config CRYPTO_AEGIS128_SIMD
365
+	bool "Support SIMD acceleration for AEGIS-128"
366
+	depends on CRYPTO_AEGIS128 && ((ARM || ARM64) && KERNEL_MODE_NEON)
367
+	default y
322368 
323369 config CRYPTO_AEGIS128_AESNI_SSE2
324370 	tristate "AEGIS-128 AEAD algorithm (x86_64 AESNI+SSE2 implementation)"
325371 	depends on X86 && 64BIT
326372 	select CRYPTO_AEAD
327
-	select CRYPTO_CRYPTD
373
+	select CRYPTO_SIMD
328374 	help
329
-	 AESNI+SSE2 implementation of the AEGSI-128 dedicated AEAD algorithm.
330
-
331
-config CRYPTO_AEGIS128L_AESNI_SSE2
332
-	tristate "AEGIS-128L AEAD algorithm (x86_64 AESNI+SSE2 implementation)"
333
-	depends on X86 && 64BIT
334
-	select CRYPTO_AEAD
335
-	select CRYPTO_CRYPTD
336
-	help
337
-	 AESNI+SSE2 implementation of the AEGSI-128L dedicated AEAD algorithm.
338
-
339
-config CRYPTO_AEGIS256_AESNI_SSE2
340
-	tristate "AEGIS-256 AEAD algorithm (x86_64 AESNI+SSE2 implementation)"
341
-	depends on X86 && 64BIT
342
-	select CRYPTO_AEAD
343
-	select CRYPTO_CRYPTD
344
-	help
345
-	 AESNI+SSE2 implementation of the AEGSI-256 dedicated AEAD algorithm.
346
-
347
-config CRYPTO_MORUS640
348
-	tristate "MORUS-640 AEAD algorithm"
349
-	select CRYPTO_AEAD
350
-	help
351
-	  Support for the MORUS-640 dedicated AEAD algorithm.
352
-
353
-config CRYPTO_MORUS640_GLUE
354
-	tristate
355
-	depends on X86
356
-	select CRYPTO_AEAD
357
-	select CRYPTO_CRYPTD
358
-	help
359
-	  Common glue for SIMD optimizations of the MORUS-640 dedicated AEAD
360
-	  algorithm.
361
-
362
-config CRYPTO_MORUS640_SSE2
363
-	tristate "MORUS-640 AEAD algorithm (x86_64 SSE2 implementation)"
364
-	depends on X86 && 64BIT
365
-	select CRYPTO_AEAD
366
-	select CRYPTO_MORUS640_GLUE
367
-	help
368
-	  SSE2 implementation of the MORUS-640 dedicated AEAD algorithm.
369
-
370
-config CRYPTO_MORUS1280
371
-	tristate "MORUS-1280 AEAD algorithm"
372
-	select CRYPTO_AEAD
373
-	help
374
-	  Support for the MORUS-1280 dedicated AEAD algorithm.
375
-
376
-config CRYPTO_MORUS1280_GLUE
377
-	tristate
378
-	depends on X86
379
-	select CRYPTO_AEAD
380
-	select CRYPTO_CRYPTD
381
-	help
382
-	  Common glue for SIMD optimizations of the MORUS-1280 dedicated AEAD
383
-	  algorithm.
384
-
385
-config CRYPTO_MORUS1280_SSE2
386
-	tristate "MORUS-1280 AEAD algorithm (x86_64 SSE2 implementation)"
387
-	depends on X86 && 64BIT
388
-	select CRYPTO_AEAD
389
-	select CRYPTO_MORUS1280_GLUE
390
-	help
391
-	  SSE2 optimizedimplementation of the MORUS-1280 dedicated AEAD
392
-	  algorithm.
393
-
394
-config CRYPTO_MORUS1280_AVX2
395
-	tristate "MORUS-1280 AEAD algorithm (x86_64 AVX2 implementation)"
396
-	depends on X86 && 64BIT
397
-	select CRYPTO_AEAD
398
-	select CRYPTO_MORUS1280_GLUE
399
-	help
400
-	  AVX2 optimized implementation of the MORUS-1280 dedicated AEAD
401
-	  algorithm.
375
+	 AESNI+SSE2 implementation of the AEGIS-128 dedicated AEAD algorithm.
402376 
403377 config CRYPTO_SEQIV
404378 	tristate "Sequence Number IV Generator"
405379 	select CRYPTO_AEAD
406
-	select CRYPTO_BLKCIPHER
380
+	select CRYPTO_SKCIPHER
407381 	select CRYPTO_NULL
408382 	select CRYPTO_RNG_DEFAULT
383
+	select CRYPTO_MANAGER
409384 	help
410385 	  This IV generator generates an IV based on a sequence number by
411386 	  xoring it with a salt.  This algorithm is mainly useful for CTR
....@@ -415,7 +390,7 @@
415390 	select CRYPTO_AEAD
416391 	select CRYPTO_NULL
417392 	select CRYPTO_RNG_DEFAULT
418
-	default m
393
+	select CRYPTO_MANAGER
419394 	help
420395 	  This IV generator generates an IV based on the encryption of
421396 	  a sequence number xored with a salt.  This is the default
....@@ -425,7 +400,7 @@
425400 
426401 config CRYPTO_CBC
427402 	tristate "CBC support"
428
-	select CRYPTO_BLKCIPHER
403
+	select CRYPTO_SKCIPHER
429404 	select CRYPTO_MANAGER
430405 	help
431406 	  CBC: Cipher Block Chaining mode
....@@ -433,7 +408,7 @@
433408 
434409 config CRYPTO_CFB
435410 	tristate "CFB support"
436
-	select CRYPTO_BLKCIPHER
411
+	select CRYPTO_SKCIPHER
437412 	select CRYPTO_MANAGER
438413 	help
439414 	  CFB: Cipher FeedBack mode
....@@ -441,8 +416,7 @@
441416 
442417 config CRYPTO_CTR
443418 	tristate "CTR support"
444
-	select CRYPTO_BLKCIPHER
445
-	select CRYPTO_SEQIV
419
+	select CRYPTO_SKCIPHER
446420 	select CRYPTO_MANAGER
447421 	help
448422 	  CTR: Counter mode
....@@ -450,18 +424,22 @@
450424 
451425 config CRYPTO_CTS
452426 	tristate "CTS support"
453
-	select CRYPTO_BLKCIPHER
427
+	select CRYPTO_SKCIPHER
428
+	select CRYPTO_MANAGER
454429 	help
455430 	  CTS: Cipher Text Stealing
456431 	  This is the Cipher Text Stealing mode as described by
457
-	  Section 8 of rfc2040 and referenced by rfc3962.
458
-	  (rfc3962 includes errata information in its Appendix A)
432
+	  Section 8 of rfc2040 and referenced by rfc3962
433
+	  (rfc3962 includes errata information in its Appendix A) or
434
+	  CBC-CS3 as defined by NIST in Sp800-38A addendum from Oct 2010.
459435 	  This mode is required for Kerberos gss mechanism support
460436 	  for AES encryption.
461437 
438
+	  See: https://csrc.nist.gov/publications/detail/sp/800-38a/addendum/final
439
+
462440 config CRYPTO_ECB
463441 	tristate "ECB support"
464
-	select CRYPTO_BLKCIPHER
442
+	select CRYPTO_SKCIPHER
465443 	select CRYPTO_MANAGER
466444 	help
467445 	  ECB: Electronic CodeBook mode
....@@ -470,7 +448,7 @@
470448 
471449 config CRYPTO_LRW
472450 	tristate "LRW support"
473
-	select CRYPTO_BLKCIPHER
451
+	select CRYPTO_SKCIPHER
474452 	select CRYPTO_MANAGER
475453 	select CRYPTO_GF128MUL
476454 	help
....@@ -482,7 +460,7 @@
482460 
483461 config CRYPTO_OFB
484462 	tristate "OFB support"
485
-	select CRYPTO_BLKCIPHER
463
+	select CRYPTO_SKCIPHER
486464 	select CRYPTO_MANAGER
487465 	help
488466 	  OFB: the Output Feedback mode makes a block cipher into a synchronous
....@@ -494,7 +472,7 @@
494472 
495473 config CRYPTO_PCBC
496474 	tristate "PCBC support"
497
-	select CRYPTO_BLKCIPHER
475
+	select CRYPTO_SKCIPHER
498476 	select CRYPTO_MANAGER
499477 	help
500478 	  PCBC: Propagating Cipher Block Chaining mode
....@@ -502,7 +480,7 @@
502480 
503481 config CRYPTO_XTS
504482 	tristate "XTS support"
505
-	select CRYPTO_BLKCIPHER
483
+	select CRYPTO_SKCIPHER
506484 	select CRYPTO_MANAGER
507485 	select CRYPTO_ECB
508486 	help
....@@ -512,7 +490,8 @@
512490 
513491 config CRYPTO_KEYWRAP
514492 	tristate "Key wrapping support"
515
-	select CRYPTO_BLKCIPHER
493
+	select CRYPTO_SKCIPHER
494
+	select CRYPTO_MANAGER
516495 	help
517496 	  Support for key wrapping (NIST SP800-38F / RFC3394) without
518497 	  padding.
....@@ -522,11 +501,28 @@
522501 	select CRYPTO_HASH
523502 	select CRYPTO_LIB_POLY1305_GENERIC
524503 
504
+config CRYPTO_NHPOLY1305_SSE2
505
+	tristate "NHPoly1305 hash function (x86_64 SSE2 implementation)"
506
+	depends on X86 && 64BIT
507
+	select CRYPTO_NHPOLY1305
508
+	help
509
+	  SSE2 optimized implementation of the hash function used by the
510
+	  Adiantum encryption mode.
511
+
512
+config CRYPTO_NHPOLY1305_AVX2
513
+	tristate "NHPoly1305 hash function (x86_64 AVX2 implementation)"
514
+	depends on X86 && 64BIT
515
+	select CRYPTO_NHPOLY1305
516
+	help
517
+	  AVX2 optimized implementation of the hash function used by the
518
+	  Adiantum encryption mode.
519
+
525520 config CRYPTO_ADIANTUM
526521 	tristate "Adiantum support"
527522 	select CRYPTO_CHACHA20
528523 	select CRYPTO_LIB_POLY1305_GENERIC
529524 	select CRYPTO_NHPOLY1305
525
+	select CRYPTO_MANAGER
530526 	help
531527 	  Adiantum is a tweakable, length-preserving encryption mode
532528 	  designed for fast and secure disk encryption, especially on
....@@ -544,6 +540,34 @@
544540 	  security than XTS, subject to the security bound.
545541 
546542 	  If unsure, say N.
543
+
544
+config CRYPTO_ESSIV
545
+	tristate "ESSIV support for block encryption"
546
+	select CRYPTO_AUTHENC
547
+	help
548
+	  Encrypted salt-sector initialization vector (ESSIV) is an IV
549
+	  generation method that is used in some cases by fscrypt and/or
550
+	  dm-crypt. It uses the hash of the block encryption key as the
551
+	  symmetric key for a block encryption pass applied to the input
552
+	  IV, making low entropy IV sources more suitable for block
553
+	  encryption.
554
+
555
+	  This driver implements a crypto API template that can be
556
+	  instantiated either as an skcipher or as an AEAD (depending on the
557
+	  type of the first template argument), and which defers encryption
558
+	  and decryption requests to the encapsulated cipher after applying
559
+	  ESSIV to the input IV. Note that in the AEAD case, it is assumed
560
+	  that the keys are presented in the same format used by the authenc
561
+	  template, and that the IV appears at the end of the authenticated
562
+	  associated data (AAD) region (which is how dm-crypt uses it.)
563
+
564
+	  Note that the use of ESSIV is not recommended for new deployments,
565
+	  and so this only needs to be enabled when interoperability with
566
+	  existing encrypted volumes of filesystems is required, or when
567
+	  building for a particular system that requires it (e.g., when
568
+	  the SoC in question has accelerated CBC but not XTS, making CBC
569
+	  combined with ESSIV the only feasible mode for h/w accelerated
570
+	  block encryption)
547571 
548572 comment "Hash modes"
549573 
....@@ -572,7 +596,7 @@
572596 	select CRYPTO_MANAGER
573597 	help
574598 	  XCBC: Keyed-Hashing with encryption algorithm
575
-		http://www.ietf.org/rfc/rfc3566.txt
599
+		https://www.ietf.org/rfc/rfc3566.txt
576600 		http://csrc.nist.gov/encryption/modes/proposedmodes/
577601 		 xcbc-mac/xcbc-mac-spec.pdf
578602 
....@@ -585,7 +609,7 @@
585609 	  very high speed on 64-bit architectures.
586610 
587611 	  See also:
588
-	  <http://fastcrypto.org/vmac>
612
+	  <https://fastcrypto.org/vmac>
589613 
590614 comment "Digest"
591615 
....@@ -647,7 +671,7 @@
647671 	  From Intel Westmere and AMD Bulldozer processor with SSE4.2
648672 	  and PCLMULQDQ supported, the processor will support
649673 	  CRC32 PCLMULQDQ implementation using hardware accelerated PCLMULQDQ
650
-	  instruction. This option will create 'crc32-plcmul' module,
674
+	  instruction. This option will create 'crc32-pclmul' module,
651675 	  which will enable any routine to use the CRC-32-IEEE 802.3 checksum
652676 	  and gain better performance as compared with the table implementation.
653677 
....@@ -659,6 +683,31 @@
659683 	  CRC32c and CRC32 CRC algorithms implemented using mips crypto
660684 	  instructions, when available.
661685 
686
+
687
+config CRYPTO_XXHASH
688
+	tristate "xxHash hash algorithm"
689
+	select CRYPTO_HASH
690
+	select XXHASH
691
+	help
692
+	  xxHash non-cryptographic hash algorithm. Extremely fast, working at
693
+	  speeds close to RAM limits.
694
+
695
+config CRYPTO_BLAKE2B
696
+	tristate "BLAKE2b digest algorithm"
697
+	select CRYPTO_HASH
698
+	help
699
+	  Implementation of cryptographic hash function BLAKE2b (or just BLAKE2),
700
+	  optimized for 64bit platforms and can produce digests of any size
701
+	  between 1 to 64.  The keyed hash is also implemented.
702
+
703
+	  This module provides the following algorithms:
704
+
705
+	  - blake2b-160
706
+	  - blake2b-256
707
+	  - blake2b-384
708
+	  - blake2b-512
709
+
710
+	  See https://blake2.net for further information.
662711 
663712 config CRYPTO_BLAKE2S
664713 	tristate "BLAKE2s digest algorithm"
....@@ -684,23 +733,6 @@
684733 	select CRYPTO_LIB_BLAKE2S_GENERIC
685734 	select CRYPTO_ARCH_HAVE_LIB_BLAKE2S
686735 
687
-config CRYPTO_BLAKE2B
688
-	tristate "BLAKE2b digest algorithm"
689
-	select CRYPTO_HASH
690
-	help
691
-	  Implementation of cryptographic hash function BLAKE2b (or just BLAKE2),
692
-	  optimized for 64bit platforms and can produce digests of any size
693
-	  between 1 to 64.  The keyed hash is also implemented.
694
-
695
-	  This module provides the following algorithms:
696
-
697
-	  - blake2b-160
698
-	  - blake2b-256
699
-	  - blake2b-384
700
-	  - blake2b-512
701
-
702
-	  See https://blake2.net for further information.
703
-
704736 config CRYPTO_CRCT10DIF
705737 	tristate "CRCT10DIF algorithm"
706738 	select CRYPTO_HASH
....@@ -717,7 +749,7 @@
717749 	  For x86_64 processors with SSE4.2 and PCLMULQDQ supported,
718750 	  CRC T10 DIF PCLMULQDQ computation can be hardware
719751 	  accelerated PCLMULQDQ instruction. This option will create
720
-	  'crct10dif-plcmul' module, which is faster when computing the
752
+	  'crct10dif-pclmul' module, which is faster when computing the
721753 	  crct10dif checksum as compared with the generic table implementation.
722754 
723755 config CRYPTO_CRCT10DIF_VPMSUM
....@@ -738,11 +770,12 @@
738770 	  Unless you are testing these algorithms, you don't need this.
739771 
740772 config CRYPTO_GHASH
741
-	tristate "GHASH digest algorithm"
773
+	tristate "GHASH hash function"
742774 	select CRYPTO_GF128MUL
743775 	select CRYPTO_HASH
744776 	help
745
-	  GHASH is message digest algorithm for GCM (Galois/Counter Mode).
777
+	  GHASH is the hash function used in GCM (Galois/Counter Mode).
778
+	  It is not a general-purpose cryptographic hash function.
746779 
747780 config CRYPTO_POLY1305
748781 	tristate "Poly1305 authenticator algorithm"
....@@ -770,7 +803,7 @@
770803 
771804 config CRYPTO_POLY1305_MIPS
772805 	tristate "Poly1305 authenticator algorithm (MIPS optimized)"
773
-	depends on CPU_MIPS32 || (CPU_MIPS64 && 64BIT)
806
+	depends on MIPS
774807 	select CRYPTO_ARCH_HAVE_LIB_POLY1305
775808 
776809 config CRYPTO_MD4
....@@ -831,7 +864,7 @@
831864 	  RIPEMD-160 should be used.
832865 
833866 	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
834
-	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
867
+	  See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
835868 
836869 config CRYPTO_RMD160
837870 	tristate "RIPEMD-160 digest algorithm"
....@@ -848,7 +881,7 @@
848881 	  against RIPEMD-160.
849882 
850883 	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
851
-	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
884
+	  See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
852885 
853886 config CRYPTO_RMD256
854887 	tristate "RIPEMD-256 digest algorithm"
....@@ -860,7 +893,7 @@
860893 	  (than RIPEMD-128).
861894 
862895 	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
863
-	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
896
+	  See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
864897 
865898 config CRYPTO_RMD320
866899 	tristate "RIPEMD-320 digest algorithm"
....@@ -872,7 +905,7 @@
872905 	  (than RIPEMD-160).
873906 
874907 	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
875
-	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
908
+	  See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
876909 
877910 config CRYPTO_SHA1
878911 	tristate "SHA1 digest algorithm"
....@@ -946,57 +979,10 @@
946979 	  SHA-1 secure hash standard (DFIPS 180-4) implemented
947980 	  using powerpc SPE SIMD instruction set.
948981 
949
-config CRYPTO_SHA1_MB
950
-	tristate "SHA1 digest algorithm (x86_64 Multi-Buffer, Experimental)"
951
-	depends on X86 && 64BIT
952
-	select CRYPTO_SHA1
953
-	select CRYPTO_HASH
954
-	select CRYPTO_MCRYPTD
955
-	help
956
-	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
957
-	  using multi-buffer technique.  This algorithm computes on
958
-	  multiple data lanes concurrently with SIMD instructions for
959
-	  better throughput.  It should not be enabled by default but
960
-	  used when there is significant amount of work to keep the keep
961
-	  the data lanes filled to get performance benefit.  If the data
962
-	  lanes remain unfilled, a flush operation will be initiated to
963
-	  process the crypto jobs, adding a slight latency.
964
-
965
-config CRYPTO_SHA256_MB
966
-	tristate "SHA256 digest algorithm (x86_64 Multi-Buffer, Experimental)"
967
-	depends on X86 && 64BIT
968
-	select CRYPTO_SHA256
969
-	select CRYPTO_HASH
970
-	select CRYPTO_MCRYPTD
971
-	help
972
-	  SHA-256 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
973
-	  using multi-buffer technique.  This algorithm computes on
974
-	  multiple data lanes concurrently with SIMD instructions for
975
-	  better throughput.  It should not be enabled by default but
976
-	  used when there is significant amount of work to keep the keep
977
-	  the data lanes filled to get performance benefit.  If the data
978
-	  lanes remain unfilled, a flush operation will be initiated to
979
-	  process the crypto jobs, adding a slight latency.
980
-
981
-config CRYPTO_SHA512_MB
982
-        tristate "SHA512 digest algorithm (x86_64 Multi-Buffer, Experimental)"
983
-        depends on X86 && 64BIT
984
-        select CRYPTO_SHA512
985
-        select CRYPTO_HASH
986
-        select CRYPTO_MCRYPTD
987
-        help
988
-          SHA-512 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
989
-          using multi-buffer technique.  This algorithm computes on
990
-          multiple data lanes concurrently with SIMD instructions for
991
-          better throughput.  It should not be enabled by default but
992
-          used when there is significant amount of work to keep the keep
993
-          the data lanes filled to get performance benefit.  If the data
994
-          lanes remain unfilled, a flush operation will be initiated to
995
-          process the crypto jobs, adding a slight latency.
996
-
997982 config CRYPTO_SHA256
998983 	tristate "SHA224 and SHA256 digest algorithm"
999984 	select CRYPTO_HASH
985
+	select CRYPTO_LIB_SHA256
1000986 	help
1001987 	  SHA256 secure hash standard (DFIPS 180-2).
1002988 
....@@ -1084,6 +1070,18 @@
10841070 	  http://www.oscca.gov.cn/UpFile/20101222141857786.pdf
10851071 	  https://datatracker.ietf.org/doc/html/draft-shen-sm3-hash
10861072 
1073
+config CRYPTO_STREEBOG
1074
+	tristate "Streebog Hash Function"
1075
+	select CRYPTO_HASH
1076
+	help
1077
+	  Streebog Hash Function (GOST R 34.11-2012, RFC 6986) is one of the Russian
1078
+	  cryptographic standard algorithms (called GOST algorithms).
1079
+	  This setting enables two hash algorithms with 256 and 512 bits output.
1080
+
1081
+	  References:
1082
+	  https://tc26.ru/upload/iblock/fed/feddbb4d26b685903faa2ba11aea43f6.pdf
1083
+	  https://tools.ietf.org/html/rfc6986
1084
+
10871085 config CRYPTO_TGR192
10881086 	tristate "Tiger digest algorithms"
10891087 	select CRYPTO_HASH
....@@ -1095,7 +1093,7 @@
10951093 	  Tiger was developed by Ross Anderson and Eli Biham.
10961094 
10971095 	  See also:
1098
-	  <http://www.cs.technion.ac.il/~biham/Reports/Tiger/>.
1096
+	  <https://www.cs.technion.ac.il/~biham/Reports/Tiger/>.
10991097 
11001098 config CRYPTO_WP512
11011099 	tristate "Whirlpool digest algorithms"
....@@ -1110,18 +1108,19 @@
11101108 	  <http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html>
11111109 
11121110 config CRYPTO_GHASH_CLMUL_NI_INTEL
1113
-	tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
1111
+	tristate "GHASH hash function (CLMUL-NI accelerated)"
11141112 	depends on X86 && 64BIT
11151113 	select CRYPTO_CRYPTD
11161114 	help
1117
-	  GHASH is message digest algorithm for GCM (Galois/Counter Mode).
1118
-	  The implementation is accelerated by CLMUL-NI of Intel.
1115
+	  This is the x86_64 CLMUL-NI accelerated implementation of
1116
+	  GHASH, the hash function used in GCM (Galois/Counter mode).
11191117 
11201118 comment "Ciphers"
11211119 
11221120 config CRYPTO_AES
11231121 	tristate "AES cipher algorithms"
11241122 	select CRYPTO_ALGAPI
1123
+	select CRYPTO_LIB_AES
11251124 	help
11261125 	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
11271126 	  algorithm.
....@@ -1142,6 +1141,7 @@
11421141 config CRYPTO_AES_TI
11431142 	tristate "Fixed time AES cipher"
11441143 	select CRYPTO_ALGAPI
1144
+	select CRYPTO_LIB_AES
11451145 	help
11461146 	  This is a generic implementation of AES that attempts to eliminate
11471147 	  data dependent latencies as much as possible without affecting
....@@ -1157,58 +1157,13 @@
11571157 	  block. Interrupts are also disabled to avoid races where cachelines
11581158 	  are evicted when the CPU is interrupted to do something else.
11591159 
1160
-config CRYPTO_AES_586
1161
-	tristate "AES cipher algorithms (i586)"
1162
-	depends on (X86 || UML_X86) && !64BIT
1163
-	select CRYPTO_ALGAPI
1164
-	select CRYPTO_AES
1165
-	help
1166
-	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
1167
-	  algorithm.
1168
-
1169
-	  Rijndael appears to be consistently a very good performer in
1170
-	  both hardware and software across a wide range of computing
1171
-	  environments regardless of its use in feedback or non-feedback
1172
-	  modes. Its key setup time is excellent, and its key agility is
1173
-	  good. Rijndael's very low memory requirements make it very well
1174
-	  suited for restricted-space environments, in which it also
1175
-	  demonstrates excellent performance. Rijndael's operations are
1176
-	  among the easiest to defend against power and timing attacks.
1177
-
1178
-	  The AES specifies three key sizes: 128, 192 and 256 bits
1179
-
1180
-	  See <http://csrc.nist.gov/encryption/aes/> for more information.
1181
-
1182
-config CRYPTO_AES_X86_64
1183
-	tristate "AES cipher algorithms (x86_64)"
1184
-	depends on (X86 || UML_X86) && 64BIT
1185
-	select CRYPTO_ALGAPI
1186
-	select CRYPTO_AES
1187
-	help
1188
-	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
1189
-	  algorithm.
1190
-
1191
-	  Rijndael appears to be consistently a very good performer in
1192
-	  both hardware and software across a wide range of computing
1193
-	  environments regardless of its use in feedback or non-feedback
1194
-	  modes. Its key setup time is excellent, and its key agility is
1195
-	  good. Rijndael's very low memory requirements make it very well
1196
-	  suited for restricted-space environments, in which it also
1197
-	  demonstrates excellent performance. Rijndael's operations are
1198
-	  among the easiest to defend against power and timing attacks.
1199
-
1200
-	  The AES specifies three key sizes: 128, 192 and 256 bits
1201
-
1202
-	  See <http://csrc.nist.gov/encryption/aes/> for more information.
1203
-
12041160 config CRYPTO_AES_NI_INTEL
12051161 	tristate "AES cipher algorithms (AES-NI)"
12061162 	depends on X86
12071163 	select CRYPTO_AEAD
1208
-	select CRYPTO_AES_X86_64 if 64BIT
1209
-	select CRYPTO_AES_586 if !64BIT
1164
+	select CRYPTO_LIB_AES
12101165 	select CRYPTO_ALGAPI
1211
-	select CRYPTO_BLKCIPHER
1166
+	select CRYPTO_SKCIPHER
12121167 	select CRYPTO_GLUE_HELPER_X86 if 64BIT
12131168 	select CRYPTO_SIMD
12141169 	help
....@@ -1232,14 +1187,13 @@
12321187 
12331188 	  In addition to AES cipher algorithm support, the acceleration
12341189 	  for some popular block cipher mode is supported too, including
1235
-	  ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
1190
+	  ECB, CBC, LRW, XTS. The 64 bit version has additional
12361191 	  acceleration for CTR.
12371192 
12381193 config CRYPTO_AES_SPARC64
12391194 	tristate "AES cipher algorithms (SPARC64)"
12401195 	depends on SPARC64
1241
-	select CRYPTO_CRYPTD
1242
-	select CRYPTO_ALGAPI
1196
+	select CRYPTO_SKCIPHER
12431197 	help
12441198 	  Use SPARC64 crypto opcodes for AES algorithm.
12451199 
....@@ -1266,6 +1220,7 @@
12661220 config CRYPTO_AES_PPC_SPE
12671221 	tristate "AES cipher algorithms (PPC SPE)"
12681222 	depends on PPC && SPE
1223
+	select CRYPTO_SKCIPHER
12691224 	help
12701225 	  AES cipher algorithms (FIPS-197). Additionally the acceleration
12711226 	  for popular block cipher modes ECB, CBC, CTR and XTS is supported.
....@@ -1278,6 +1233,7 @@
12781233 
12791234 config CRYPTO_ANUBIS
12801235 	tristate "Anubis cipher algorithm"
1236
+	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
12811237 	select CRYPTO_ALGAPI
12821238 	help
12831239 	  Anubis cipher algorithm.
....@@ -1292,7 +1248,9 @@
12921248 
12931249 config CRYPTO_ARC4
12941250 	tristate "ARC4 cipher algorithm"
1295
-	select CRYPTO_BLKCIPHER
1251
+	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
1252
+	select CRYPTO_SKCIPHER
1253
+	select CRYPTO_LIB_ARC4
12961254 	help
12971255 	  ARC4 cipher algorithm.
12981256 
....@@ -1313,7 +1271,7 @@
13131271 	  designed for use on "large microprocessors".
13141272 
13151273 	  See also:
1316
-	  <http://www.schneier.com/blowfish.html>
1274
+	  <https://www.schneier.com/blowfish.html>
13171275 
13181276 config CRYPTO_BLOWFISH_COMMON
13191277 	tristate
....@@ -1322,12 +1280,12 @@
13221280 	  generic c and the assembler implementations.
13231281 
13241282 	  See also:
1325
-	  <http://www.schneier.com/blowfish.html>
1283
+	  <https://www.schneier.com/blowfish.html>
13261284 
13271285 config CRYPTO_BLOWFISH_X86_64
13281286 	tristate "Blowfish cipher algorithm (x86_64)"
13291287 	depends on X86 && 64BIT
1330
-	select CRYPTO_BLKCIPHER
1288
+	select CRYPTO_SKCIPHER
13311289 	select CRYPTO_BLOWFISH_COMMON
13321290 	help
13331291 	  Blowfish cipher algorithm (x86_64), by Bruce Schneier.
....@@ -1337,7 +1295,7 @@
13371295 	  designed for use on "large microprocessors".
13381296 
13391297 	  See also:
1340
-	  <http://www.schneier.com/blowfish.html>
1298
+	  <https://www.schneier.com/blowfish.html>
13411299 
13421300 config CRYPTO_CAMELLIA
13431301 	tristate "Camellia cipher algorithms"
....@@ -1358,7 +1316,7 @@
13581316 	tristate "Camellia cipher algorithm (x86_64)"
13591317 	depends on X86 && 64BIT
13601318 	depends on CRYPTO
1361
-	select CRYPTO_BLKCIPHER
1319
+	select CRYPTO_SKCIPHER
13621320 	select CRYPTO_GLUE_HELPER_X86
13631321 	help
13641322 	  Camellia cipher algorithm module (x86_64).
....@@ -1375,7 +1333,7 @@
13751333 	tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX)"
13761334 	depends on X86 && 64BIT
13771335 	depends on CRYPTO
1378
-	select CRYPTO_BLKCIPHER
1336
+	select CRYPTO_SKCIPHER
13791337 	select CRYPTO_CAMELLIA_X86_64
13801338 	select CRYPTO_GLUE_HELPER_X86
13811339 	select CRYPTO_SIMD
....@@ -1412,6 +1370,7 @@
14121370 	depends on SPARC64
14131371 	depends on CRYPTO
14141372 	select CRYPTO_ALGAPI
1373
+	select CRYPTO_SKCIPHER
14151374 	help
14161375 	  Camellia cipher algorithm module (SPARC64).
14171376 
....@@ -1440,7 +1399,7 @@
14401399 config CRYPTO_CAST5_AVX_X86_64
14411400 	tristate "CAST5 (CAST-128) cipher algorithm (x86_64/AVX)"
14421401 	depends on X86 && 64BIT
1443
-	select CRYPTO_BLKCIPHER
1402
+	select CRYPTO_SKCIPHER
14441403 	select CRYPTO_CAST5
14451404 	select CRYPTO_CAST_COMMON
14461405 	select CRYPTO_SIMD
....@@ -1462,7 +1421,7 @@
14621421 config CRYPTO_CAST6_AVX_X86_64
14631422 	tristate "CAST6 (CAST-256) cipher algorithm (x86_64/AVX)"
14641423 	depends on X86 && 64BIT
1465
-	select CRYPTO_BLKCIPHER
1424
+	select CRYPTO_SKCIPHER
14661425 	select CRYPTO_CAST6
14671426 	select CRYPTO_CAST_COMMON
14681427 	select CRYPTO_GLUE_HELPER_X86
....@@ -1478,6 +1437,7 @@
14781437 config CRYPTO_DES
14791438 	tristate "DES and Triple DES EDE cipher algorithms"
14801439 	select CRYPTO_ALGAPI
1440
+	select CRYPTO_LIB_DES
14811441 	help
14821442 	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
14831443 
....@@ -1485,7 +1445,8 @@
14851445 	tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"
14861446 	depends on SPARC64
14871447 	select CRYPTO_ALGAPI
1488
-	select CRYPTO_DES
1448
+	select CRYPTO_LIB_DES
1449
+	select CRYPTO_SKCIPHER
14891450 	help
14901451 	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3),
14911452 	  optimized using SPARC64 crypto opcodes.
....@@ -1493,8 +1454,8 @@
14931454 config CRYPTO_DES3_EDE_X86_64
14941455 	tristate "Triple DES EDE cipher algorithm (x86-64)"
14951456 	depends on X86 && 64BIT
1496
-	select CRYPTO_BLKCIPHER
1497
-	select CRYPTO_DES
1457
+	select CRYPTO_SKCIPHER
1458
+	select CRYPTO_LIB_DES
14981459 	help
14991460 	  Triple DES EDE (FIPS 46-3) algorithm.
15001461 
....@@ -1506,12 +1467,13 @@
15061467 config CRYPTO_FCRYPT
15071468 	tristate "FCrypt cipher algorithm"
15081469 	select CRYPTO_ALGAPI
1509
-	select CRYPTO_BLKCIPHER
1470
+	select CRYPTO_SKCIPHER
15101471 	help
15111472 	  FCrypt algorithm used by RxRPC.
15121473 
15131474 config CRYPTO_KHAZAD
15141475 	tristate "Khazad cipher algorithm"
1476
+	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
15151477 	select CRYPTO_ALGAPI
15161478 	help
15171479 	  Khazad cipher algorithm.
....@@ -1525,27 +1487,27 @@
15251487 
15261488 config CRYPTO_SALSA20
15271489 	tristate "Salsa20 stream cipher algorithm"
1528
-	select CRYPTO_BLKCIPHER
1490
+	select CRYPTO_SKCIPHER
15291491 	help
15301492 	  Salsa20 stream cipher algorithm.
15311493 
15321494 	  Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
1533
-	  Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
1495
+	  Stream Cipher Project. See <https://www.ecrypt.eu.org/stream/>
15341496 
15351497 	  The Salsa20 stream cipher algorithm is designed by Daniel J.
1536
-	  Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
1498
+	  Bernstein <djb@cr.yp.to>. See <https://cr.yp.to/snuffle.html>
15371499 
15381500 config CRYPTO_CHACHA20
15391501 	tristate "ChaCha stream cipher algorithms"
15401502 	select CRYPTO_LIB_CHACHA_GENERIC
1541
-	select CRYPTO_BLKCIPHER
1503
+	select CRYPTO_SKCIPHER
15421504 	help
15431505 	  The ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms.
15441506 
15451507 	  ChaCha20 is a 256-bit high-speed stream cipher designed by Daniel J.
15461508 	  Bernstein and further specified in RFC7539 for use in IETF protocols.
15471509 	  This is the portable C implementation of ChaCha20.  See also:
1548
-	  <http://cr.yp.to/chacha/chacha-20080128.pdf>
1510
+	  <https://cr.yp.to/chacha/chacha-20080128.pdf>
15491511 
15501512 	  XChaCha20 is the application of the XSalsa20 construction to ChaCha20
15511513 	  rather than to Salsa20.  XChaCha20 extends ChaCha20's nonce length
....@@ -1560,7 +1522,7 @@
15601522 config CRYPTO_CHACHA20_X86_64
15611523 	tristate "ChaCha stream cipher algorithms (x86_64/SSSE3/AVX2/AVX-512VL)"
15621524 	depends on X86 && 64BIT
1563
-	select CRYPTO_BLKCIPHER
1525
+	select CRYPTO_SKCIPHER
15641526 	select CRYPTO_LIB_CHACHA_GENERIC
15651527 	select CRYPTO_ARCH_HAVE_LIB_CHACHA
15661528 	help
....@@ -1570,11 +1532,12 @@
15701532 config CRYPTO_CHACHA_MIPS
15711533 	tristate "ChaCha stream cipher algorithms (MIPS 32r2 optimized)"
15721534 	depends on CPU_MIPS32_R2
1573
-	select CRYPTO_BLKCIPHER
1535
+	select CRYPTO_SKCIPHER
15741536 	select CRYPTO_ARCH_HAVE_LIB_CHACHA
15751537 
15761538 config CRYPTO_SEED
15771539 	tristate "SEED cipher algorithm"
1540
+	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
15781541 	select CRYPTO_ALGAPI
15791542 	help
15801543 	  SEED cipher algorithm (RFC4269).
....@@ -1598,12 +1561,12 @@
15981561 	  variant of Serpent for compatibility with old kerneli.org code.
15991562 
16001563 	  See also:
1601
-	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
1564
+	  <https://www.cl.cam.ac.uk/~rja14/serpent.html>
16021565 
16031566 config CRYPTO_SERPENT_SSE2_X86_64
16041567 	tristate "Serpent cipher algorithm (x86_64/SSE2)"
16051568 	depends on X86 && 64BIT
1606
-	select CRYPTO_BLKCIPHER
1569
+	select CRYPTO_SKCIPHER
16071570 	select CRYPTO_GLUE_HELPER_X86
16081571 	select CRYPTO_SERPENT
16091572 	select CRYPTO_SIMD
....@@ -1617,12 +1580,12 @@
16171580 	  blocks parallel using SSE2 instruction set.
16181581 
16191582 	  See also:
1620
-	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
1583
+	  <https://www.cl.cam.ac.uk/~rja14/serpent.html>
16211584 
16221585 config CRYPTO_SERPENT_SSE2_586
16231586 	tristate "Serpent cipher algorithm (i586/SSE2)"
16241587 	depends on X86 && !64BIT
1625
-	select CRYPTO_BLKCIPHER
1588
+	select CRYPTO_SKCIPHER
16261589 	select CRYPTO_GLUE_HELPER_X86
16271590 	select CRYPTO_SERPENT
16281591 	select CRYPTO_SIMD
....@@ -1636,12 +1599,12 @@
16361599 	  blocks parallel using SSE2 instruction set.
16371600 
16381601 	  See also:
1639
-	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
1602
+	  <https://www.cl.cam.ac.uk/~rja14/serpent.html>
16401603 
16411604 config CRYPTO_SERPENT_AVX_X86_64
16421605 	tristate "Serpent cipher algorithm (x86_64/AVX)"
16431606 	depends on X86 && 64BIT
1644
-	select CRYPTO_BLKCIPHER
1607
+	select CRYPTO_SKCIPHER
16451608 	select CRYPTO_GLUE_HELPER_X86
16461609 	select CRYPTO_SERPENT
16471610 	select CRYPTO_SIMD
....@@ -1656,7 +1619,7 @@
16561619 	  eight blocks parallel using the AVX instruction set.
16571620 
16581621 	  See also:
1659
-	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
1622
+	  <https://www.cl.cam.ac.uk/~rja14/serpent.html>
16601623 
16611624 config CRYPTO_SERPENT_AVX2_X86_64
16621625 	tristate "Serpent cipher algorithm (x86_64/AVX2)"
....@@ -1672,7 +1635,7 @@
16721635 	  blocks parallel using AVX2 instruction set.
16731636 
16741637 	  See also:
1675
-	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
1638
+	  <https://www.cl.cam.ac.uk/~rja14/serpent.html>
16761639 
16771640 config CRYPTO_SM4
16781641 	tristate "SM4 cipher algorithm"
....@@ -1701,6 +1664,7 @@
17011664 
17021665 config CRYPTO_TEA
17031666 	tristate "TEA, XTEA and XETA cipher algorithms"
1667
+	depends on CRYPTO_USER_API_ENABLE_OBSOLETE
17041668 	select CRYPTO_ALGAPI
17051669 	help
17061670 	  TEA cipher algorithm.
....@@ -1729,7 +1693,7 @@
17291693 	  bits.
17301694 
17311695 	  See also:
1732
-	  <http://www.schneier.com/twofish.html>
1696
+	  <https://www.schneier.com/twofish.html>
17331697 
17341698 config CRYPTO_TWOFISH_COMMON
17351699 	tristate
....@@ -1751,7 +1715,7 @@
17511715 	  bits.
17521716 
17531717 	  See also:
1754
-	  <http://www.schneier.com/twofish.html>
1718
+	  <https://www.schneier.com/twofish.html>
17551719 
17561720 config CRYPTO_TWOFISH_X86_64
17571721 	tristate "Twofish cipher algorithm (x86_64)"
....@@ -1767,12 +1731,12 @@
17671731 	  bits.
17681732 
17691733 	  See also:
1770
-	  <http://www.schneier.com/twofish.html>
1734
+	  <https://www.schneier.com/twofish.html>
17711735 
17721736 config CRYPTO_TWOFISH_X86_64_3WAY
17731737 	tristate "Twofish cipher algorithm (x86_64, 3-way parallel)"
17741738 	depends on X86 && 64BIT
1775
-	select CRYPTO_BLKCIPHER
1739
+	select CRYPTO_SKCIPHER
17761740 	select CRYPTO_TWOFISH_COMMON
17771741 	select CRYPTO_TWOFISH_X86_64
17781742 	select CRYPTO_GLUE_HELPER_X86
....@@ -1788,12 +1752,12 @@
17881752 	  blocks parallel, utilizing resources of out-of-order CPUs better.
17891753 
17901754 	  See also:
1791
-	  <http://www.schneier.com/twofish.html>
1755
+	  <https://www.schneier.com/twofish.html>
17921756 
17931757 config CRYPTO_TWOFISH_AVX_X86_64
17941758 	tristate "Twofish cipher algorithm (x86_64/AVX)"
17951759 	depends on X86 && 64BIT
1796
-	select CRYPTO_BLKCIPHER
1760
+	select CRYPTO_SKCIPHER
17971761 	select CRYPTO_GLUE_HELPER_X86
17981762 	select CRYPTO_SIMD
17991763 	select CRYPTO_TWOFISH_COMMON
....@@ -1811,7 +1775,7 @@
18111775 	  eight blocks parallel using the AVX Instruction Set.
18121776 
18131777 	  See also:
1814
-	  <http://www.schneier.com/twofish.html>
1778
+	  <https://www.schneier.com/twofish.html>
18151779 
18161780 comment "Compression"
18171781 
....@@ -1907,7 +1871,7 @@
19071871 config CRYPTO_DRBG_CTR
19081872 	bool "Enable CTR DRBG"
19091873 	select CRYPTO_AES
1910
-	depends on CRYPTO_CTR
1874
+	select CRYPTO_CTR
19111875 	help
19121876 	  Enable the CTR DRBG variant as defined in NIST SP800-90A.
19131877 
....@@ -1944,7 +1908,7 @@
19441908 config CRYPTO_USER_API_SKCIPHER
19451909 	tristate "User-space interface for symmetric key cipher algorithms"
19461910 	depends on NET
1947
-	select CRYPTO_BLKCIPHER
1911
+	select CRYPTO_SKCIPHER
19481912 	select CRYPTO_USER_API
19491913 	help
19501914 	  This option enables the user-spaces interface for symmetric
....@@ -1959,23 +1923,52 @@
19591923 	  This option enables the user-spaces interface for random
19601924 	  number generator algorithms.
19611925 
1926
+config CRYPTO_USER_API_RNG_CAVP
1927
+	bool "Enable CAVP testing of DRBG"
1928
+	depends on CRYPTO_USER_API_RNG && CRYPTO_DRBG
1929
+	help
1930
+	  This option enables extra API for CAVP testing via the user-space
1931
+	  interface: resetting of DRBG entropy, and providing Additional Data.
1932
+	  This should only be enabled for CAVP testing. You should say
1933
+	  no unless you know what this is.
1934
+
19621935 config CRYPTO_USER_API_AEAD
19631936 	tristate "User-space interface for AEAD cipher algorithms"
19641937 	depends on NET
19651938 	select CRYPTO_AEAD
1966
-	select CRYPTO_BLKCIPHER
1939
+	select CRYPTO_SKCIPHER
19671940 	select CRYPTO_NULL
19681941 	select CRYPTO_USER_API
19691942 	help
19701943 	  This option enables the user-spaces interface for AEAD
19711944 	  cipher algorithms.
19721945 
1946
+config CRYPTO_USER_API_ENABLE_OBSOLETE
1947
+	bool "Enable obsolete cryptographic algorithms for userspace"
1948
+	depends on CRYPTO_USER_API
1949
+	default y
1950
+	help
1951
+	  Allow obsolete cryptographic algorithms to be selected that have
1952
+	  already been phased out from internal use by the kernel, and are
1953
+	  only useful for userspace clients that still rely on them.
1954
+
1955
+config CRYPTO_STATS
1956
+	bool "Crypto usage statistics for User-space"
1957
+	depends on CRYPTO_USER
1958
+	help
1959
+	  This option enables the gathering of crypto stats.
1960
+	  This will collect:
1961
+	  - encrypt/decrypt size and numbers of symmeric operations
1962
+	  - compress/decompress size and numbers of compress operations
1963
+	  - size and numbers of hash operations
1964
+	  - encrypt/decrypt/sign/verify numbers for asymmetric operations
1965
+	  - generate/seed numbers for rng operations
1966
+
19731967 config CRYPTO_HASH_INFO
19741968 	bool
19751969 
1976
-source "lib/crypto/Kconfig"
19771970 source "drivers/crypto/Kconfig"
1978
-source crypto/asymmetric_keys/Kconfig
1979
-source certs/Kconfig
1971
+source "crypto/asymmetric_keys/Kconfig"
1972
+source "certs/Kconfig"
19801973 
19811974 endif	# if CRYPTO