Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-microblaze.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 94f0fde..15c9c28 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -817,19 +817,6 @@ config CRYPTO_MICHAEL_MIC
          should not be used for other purposes because of the weakness
          of the algorithm.
 
-config CRYPTO_RMD128
-       tristate "RIPEMD-128 digest algorithm"
-       select CRYPTO_HASH
-       help
-         RIPEMD-128 (ISO/IEC 10118-3:2004).
-
-         RIPEMD-128 is a 128-bit cryptographic hash function. It should only
-         be used as a secure replacement for RIPEMD. For other use cases,
-         RIPEMD-160 should be used.
-
-         Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
-         See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
-
 config CRYPTO_RMD160
        tristate "RIPEMD-160 digest algorithm"
        select CRYPTO_HASH
@@ -847,30 +834,6 @@ config CRYPTO_RMD160
          Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
          See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
 
-config CRYPTO_RMD256
-       tristate "RIPEMD-256 digest algorithm"
-       select CRYPTO_HASH
-       help
-         RIPEMD-256 is an optional extension of RIPEMD-128 with a
-         256 bit hash. It is intended for applications that require
-         longer hash-results, without needing a larger security level
-         (than RIPEMD-128).
-
-         Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
-         See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
-
-config CRYPTO_RMD320
-       tristate "RIPEMD-320 digest algorithm"
-       select CRYPTO_HASH
-       help
-         RIPEMD-320 is an optional extension of RIPEMD-160 with a
-         320 bit hash. It is intended for applications that require
-         longer hash-results, without needing a larger security level
-         (than RIPEMD-160).
-
-         Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
-         See <https://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
-
 config CRYPTO_SHA1
        tristate "SHA1 digest algorithm"
        select CRYPTO_HASH
@@ -1046,19 +1009,6 @@ config CRYPTO_STREEBOG
          https://tc26.ru/upload/iblock/fed/feddbb4d26b685903faa2ba11aea43f6.pdf
          https://tools.ietf.org/html/rfc6986
 
-config CRYPTO_TGR192
-       tristate "Tiger digest algorithms"
-       select CRYPTO_HASH
-       help
-         Tiger hash algorithm 192, 160 and 128-bit hashes
-
-         Tiger is a hash function optimized for 64-bit processors while
-         still having decent performance on 32-bit processors.
-         Tiger was developed by Ross Anderson and Eli Biham.
-
-         See also:
-         <https://www.cs.technion.ac.il/~biham/Reports/Tiger/>.
-
 config CRYPTO_WP512
        tristate "Whirlpool digest algorithms"
        select CRYPTO_HASH
@@ -1450,18 +1400,6 @@ config CRYPTO_KHAZAD
          See also:
          <http://www.larc.usp.br/~pbarreto/KhazadPage.html>
 
-config CRYPTO_SALSA20
-       tristate "Salsa20 stream cipher algorithm"
-       select CRYPTO_SKCIPHER
-       help
-         Salsa20 stream cipher algorithm.
-
-         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
-         Stream Cipher Project. See <https://www.ecrypt.eu.org/stream/>
-
-         The Salsa20 stream cipher algorithm is designed by Daniel J.
-         Bernstein <djb@cr.yp.to>. See <https://cr.yp.to/snuffle.html>
-
 config CRYPTO_CHACHA20
        tristate "ChaCha stream cipher algorithms"
        select CRYPTO_LIB_CHACHA_GENERIC
@@ -1522,8 +1460,7 @@ config CRYPTO_SERPENT
          Serpent cipher algorithm, by Anderson, Biham & Knudsen.
 
          Keys are allowed to be from 0 to 256 bits in length, in steps
-         of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
-         variant of Serpent for compatibility with old kerneli.org code.
+         of 8 bits.
 
          See also:
          <https://www.cl.cam.ac.uk/~rja14/serpent.html>