These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / crypto / hash.h

diff --git a/kernel/include/crypto/hash.h b/kernel/include/crypto/hash.h
index 98abda9..6361892 100644 (file)
--- a/kernel/include/crypto/hash.h
+++ b/kernel/include/crypto/hash.h
@@ -63,10 +63,15 @@ struct ahash_request {
        void *__ctx[] CRYPTO_MINALIGN_ATTR;
 };
 
+#define AHASH_REQUEST_ON_STACK(name, ahash) \
+       char __##name##_desc[sizeof(struct ahash_request) + \
+               crypto_ahash_reqsize(ahash)] CRYPTO_MINALIGN_ATTR; \
+       struct ahash_request *name = (void *)__##name##_desc
+
 /**
  * struct ahash_alg - asynchronous message digest definition
  * @init: Initialize the transformation context. Intended only to initialize the
- *       state of the HASH transformation at the begining. This shall fill in
+ *       state of the HASH transformation at the beginning. This shall fill in
  *       the internal structures used during the entire duration of the whole
  *       transformation. No data processing happens at this point.
  * @update: Push a chunk of data into the driver for transformation. This
@@ -199,6 +204,7 @@ struct crypto_ahash {
                      unsigned int keylen);
 
        unsigned int reqsize;
+       bool has_setkey;
        struct crypto_tfm base;
 };
 
@@ -259,6 +265,20 @@ static inline unsigned int crypto_ahash_alignmask(
        return crypto_tfm_alg_alignmask(crypto_ahash_tfm(tfm));
 }
 
+/**
+ * crypto_ahash_blocksize() - obtain block size for cipher
+ * @tfm: cipher handle
+ *
+ * The block size for the message digest cipher referenced with the cipher
+ * handle is returned.
+ *
+ * Return: block size of cipher
+ */
+static inline unsigned int crypto_ahash_blocksize(struct crypto_ahash *tfm)
+{
+       return crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm));
+}
+
 static inline struct hash_alg_common *__crypto_hash_alg_common(
        struct crypto_alg *alg)
 {
@@ -356,6 +376,11 @@ static inline void *ahash_request_ctx(struct ahash_request *req)
 int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key,
                        unsigned int keylen);
 
+static inline bool crypto_ahash_has_setkey(struct crypto_ahash *tfm)
+{
+       return tfm->has_setkey;
+}
+
 /**
  * crypto_ahash_finup() - update and finalize message digest
  * @req: reference to the ahash_request handle that holds all information