crypto: rng - Remove old low-level rng interface

[deliverable/linux.git] / include / linux / crypto.h

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 2fa9b05360f7b39c03309cc89950fa602051ae0c..ee14140f8893b9b6f8a04c3fa17834e84d05c876 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -138,7 +138,6 @@ struct crypto_async_request;
 struct crypto_aead;
 struct crypto_blkcipher;
 struct crypto_hash;
-struct crypto_rng;
 struct crypto_tfm;
 struct crypto_type;
 struct aead_givcrypt_request;
@@ -426,40 +425,12 @@ struct compress_alg {
                              unsigned int slen, u8 *dst, unsigned int *dlen);
 };
 
-/**
- * struct old_rng_alg - random number generator definition
- * @rng_make_random: The function defined by this variable obtains a random
- *                  number. The random number generator transform must generate
- *                  the random number out of the context provided with this
- *                  call.
- * @rng_reset: Reset of the random number generator by clearing the entire state.
- *            With the invocation of this function call, the random number
- *             generator shall completely reinitialize its state. If the random
- *            number generator requires a seed for setting up a new state,
- *            the seed must be provided by the consumer while invoking this
- *            function. The required size of the seed is defined with
- *            @seedsize .
- * @seedsize: The seed size required for a random number generator
- *           initialization defined with this variable. Some random number
- *           generators like the SP800-90A DRBG does not require a seed as the
- *           seeding is implemented internally without the need of support by
- *           the consumer. In this case, the seed size is set to zero.
- */
-struct old_rng_alg {
-       int (*rng_make_random)(struct crypto_rng *tfm, u8 *rdata,
-                              unsigned int dlen);
-       int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
-
-       unsigned int seedsize;
-};
-
 
 #define cra_ablkcipher cra_u.ablkcipher
 #define cra_aead       cra_u.aead
 #define cra_blkcipher  cra_u.blkcipher
 #define cra_cipher     cra_u.cipher
 #define cra_compress   cra_u.compress
-#define cra_rng                cra_u.rng
 
 /**
  * struct crypto_alg - definition of a cryptograpic cipher algorithm
@@ -559,7 +530,6 @@ struct crypto_alg {
                struct blkcipher_alg blkcipher;
                struct cipher_alg cipher;
                struct compress_alg compress;
-               struct old_rng_alg rng;
        } cra_u;
 
        int (*cra_init)(struct crypto_tfm *tfm);