1 files changed, 92 insertions, 10 deletions

diff --git a/include/digest.h b/include/digest.h
index 8563c10128..7f8d696eb6 100644
--- a/include/digest.h
+++ b/include/digest.h
@@ -21,33 +21,115 @@
 
 #include <linux/list.h>
 
-struct digest
-{
+struct digest;
+
+struct crypto_alg {
 	char *name;
+	char *driver_name;
+	int priority;
+#define DIGEST_ALGO_NEED_KEY	(1 << 0)
+	unsigned int flags;
+};
+
+struct digest_algo {
+	struct crypto_alg base;
 
+	int (*alloc)(struct digest *d);
+	void (*free)(struct digest *d);
 	int (*init)(struct digest *d);
 	int (*update)(struct digest *d, const void *data, unsigned long len);
 	int (*final)(struct digest *d, unsigned char *md);
+	int (*digest)(struct digest *d, const void *data,
+		      unsigned int len, u8 *out);
+	int (*set_key)(struct digest *d, const unsigned char *key, unsigned int len);
+	int (*verify)(struct digest *d, const unsigned char *md);
 
 	unsigned int length;
+	unsigned int ctx_length;
 
 	struct list_head list;
 };
 
+struct digest {
+	struct digest_algo *algo;
+	void *ctx;
+	unsigned int length;
+};
+
 /*
  * digest functions
  */
-int digest_register(struct digest *d);
-void digest_unregister(struct digest *d);
+int digest_algo_register(struct digest_algo *d);
+void digest_algo_unregister(struct digest_algo *d);
+void digest_algo_prints(const char *prefix);
 
-struct digest* digest_get_by_name(char* name);
+struct digest *digest_alloc(const char *name);
+void digest_free(struct digest *d);
 
-int digest_file_window(struct digest *d, char *filename,
+int digest_file_window(struct digest *d, const char *filename,
 		       unsigned char *hash,
+		       unsigned char *sig,
 		       ulong start, ulong size);
-int digest_file(struct digest *d, char *filename,
-		       unsigned char *hash);
-int digest_file_by_name(char *algo, char *filename,
-		       unsigned char *hash);
+int digest_file(struct digest *d, const char *filename,
+		       unsigned char *hash,
+		       unsigned char *sig);
+int digest_file_by_name(const char *algo, const char *filename,
+		       unsigned char *hash,
+		       unsigned char *sig);
+
+static inline int digest_init(struct digest *d)
+{
+	return d->algo->init(d);
+}
+
+static inline int digest_update(struct digest *d, const void *data,
+				      unsigned long len)
+{
+	return d->algo->update(d, data, len);
+}
+
+static inline int digest_final(struct digest *d, unsigned char *md)
+{
+	return d->algo->final(d, md);
+}
+
+static inline int digest_digest(struct digest *d, const void *data,
+		      unsigned int len, u8 *md)
+{
+	return d->algo->digest(d, data, len, md);
+}
+
+static inline int digest_verify(struct digest *d, const unsigned char *md)
+{
+	return d->algo->verify(d, md);
+}
+
+static inline int digest_length(struct digest *d)
+{
+	return d->length ? d->length : d->algo->length;
+}
+
+static inline int digest_set_key(struct digest *d, const unsigned char *key,
+		unsigned int len)
+{
+	if (!d->algo->set_key)
+		return -ENOTSUPP;
+	return d->algo->set_key(d, key, len);
+}
+
+static inline int digest_is_flags(struct digest *d, unsigned int flags)
+{
+	return d->algo->base.flags & flags;
+}
+
+static inline const char *digest_name(struct digest *d)
+{
+	return d->algo->base.name;
+}
+
+static inline void* digest_ctx(struct digest *d)
+{
+	return d->ctx;
+}
 
 #endif /* __SH_ST_DEVICES_H__ */