Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[platform/kernel/linux-starfive.git] / include / linux / crypto.h

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 9cf8f3c..19ea3a3 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -49,7 +49,6 @@
 #define CRYPTO_ALG_TYPE_SCOMPRESS      0x0000000b
 #define CRYPTO_ALG_TYPE_RNG            0x0000000c
 #define CRYPTO_ALG_TYPE_AKCIPHER       0x0000000d
-#define CRYPTO_ALG_TYPE_DIGEST         0x0000000e
 #define CRYPTO_ALG_TYPE_HASH           0x0000000e
 #define CRYPTO_ALG_TYPE_SHASH          0x0000000e
 #define CRYPTO_ALG_TYPE_AHASH          0x0000000f
@@ -323,6 +322,17 @@ struct cipher_alg {
        void (*cia_decrypt)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
 };
 
+/**
+ * struct compress_alg - compression/decompression algorithm
+ * @coa_compress: Compress a buffer of specified length, storing the resulting
+ *               data in the specified buffer. Return the length of the
+ *               compressed data in dlen.
+ * @coa_decompress: Decompress the source buffer, storing the uncompressed
+ *                 data in the specified buffer. The length of the data is
+ *                 returned in dlen.
+ *
+ * All fields are mandatory.
+ */
 struct compress_alg {
        int (*coa_compress)(struct crypto_tfm *tfm, const u8 *src,
                            unsigned int slen, u8 *dst, unsigned int *dlen);