diff mbox

[v2,for-2.10,06/18] crypto: hash: add hash driver framework

Message ID 1492392806-53720-7-git-send-email-longpeng2@huawei.com (mailing list archive)
State New, archived
Headers show

Commit Message

Longpeng(Mike) April 17, 2017, 1:33 a.m. UTC 
1) makes the public APIs in hash-nettle/gcrypt/glib static,
   and rename them with "nettle/gcrypt/glib" prefix.

2) introduces hash framework, including QCryptoHashDriver
   and new public APIs.

Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
---
 crypto/hash-gcrypt.c | 19 +++++++++++++------
 crypto/hash-glib.c   | 19 +++++++++++++------
 crypto/hash-nettle.c | 19 +++++++++++++------
 crypto/hash.c        | 13 +++++++++++++
 crypto/hashpriv.h    | 31 +++++++++++++++++++++++++++++++
 5 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 crypto/hashpriv.h

Comments

Gonglei (Arei) April 21, 2017, 12:09 p.m. UTC | #1 
> -----Original Message-----
> From: longpeng
> Sent: Monday, April 17, 2017 9:33 AM
> To: berrange@redhat.com
> Cc: Gonglei (Arei); Huangweidong (C); armbru@redhat.com;
> eblake@redhat.com; mst@redhat.com; qemu-devel@nongnu.org; longpeng
> Subject: [PATCH v2 for-2.10 06/18] crypto: hash: add hash driver framework
> 
> 1) makes the public APIs in hash-nettle/gcrypt/glib static,
>    and rename them with "nettle/gcrypt/glib" prefix.
> 
> 2) introduces hash framework, including QCryptoHashDriver
>    and new public APIs.
> 
> Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
> ---
>  crypto/hash-gcrypt.c | 19 +++++++++++++------
>  crypto/hash-glib.c   | 19 +++++++++++++------
>  crypto/hash-nettle.c | 19 +++++++++++++------
>  crypto/hash.c        | 13 +++++++++++++
>  crypto/hashpriv.h    | 31 +++++++++++++++++++++++++++++++
>  5 files changed, 83 insertions(+), 18 deletions(-)
>  create mode 100644 crypto/hashpriv.h
> 

Reviewed-by: Gonglei <arei.gonglei@huawei.com>


> diff --git a/crypto/hash-gcrypt.c b/crypto/hash-gcrypt.c
> index 7690690..972beaa 100644
> --- a/crypto/hash-gcrypt.c
> +++ b/crypto/hash-gcrypt.c
> @@ -22,6 +22,7 @@
>  #include <gcrypt.h>
>  #include "qapi/error.h"
>  #include "crypto/hash.h"
> +#include "hashpriv.h"
> 
> 
>  static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
> @@ -44,12 +45,13 @@ gboolean
> qcrypto_hash_supports(QCryptoHashAlgorithm alg)
>  }
> 
> 
> -int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
> -                        const struct iovec *iov,
> -                        size_t niov,
> -                        uint8_t **result,
> -                        size_t *resultlen,
> -                        Error **errp)
> +static int
> +qcrypto_gcrypt_hash_bytesv(QCryptoHashAlgorithm alg,
> +                           const struct iovec *iov,
> +                           size_t niov,
> +                           uint8_t **result,
> +                           size_t *resultlen,
> +                           Error **errp)
>  {
>      int i, ret;
>      gcry_md_hd_t md;
> @@ -107,3 +109,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
>      gcry_md_close(md);
>      return -1;
>  }
> +
> +
> +QCryptoHashDriver qcrypto_hash_lib_driver = {
> +    .hash_bytesv = qcrypto_gcrypt_hash_bytesv,
> +};
> diff --git a/crypto/hash-glib.c b/crypto/hash-glib.c
> index ec99ac9..fb16ac0 100644
> --- a/crypto/hash-glib.c
> +++ b/crypto/hash-glib.c
> @@ -21,6 +21,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "crypto/hash.h"
> +#include "hashpriv.h"
> 
> 
>  static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
> @@ -47,12 +48,13 @@ gboolean
> qcrypto_hash_supports(QCryptoHashAlgorithm alg)
>  }
> 
> 
> -int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
> -                        const struct iovec *iov,
> -                        size_t niov,
> -                        uint8_t **result,
> -                        size_t *resultlen,
> -                        Error **errp)
> +static int
> +qcrypto_glib_hash_bytesv(QCryptoHashAlgorithm alg,
> +                            const struct iovec *iov,
> +                            size_t niov,
> +                            uint8_t **result,
> +                            size_t *resultlen,
> +                            Error **errp)
>  {
>      int i, ret;
>      GChecksum *cs;
> @@ -95,3 +97,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
>      g_checksum_free(cs);
>      return -1;
>  }
> +
> +
> +QCryptoHashDriver qcrypto_hash_lib_driver = {
> +    .hash_bytesv = qcrypto_glib_hash_bytesv,
> +};
> diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c
> index 6a206dc..96f186f 100644
> --- a/crypto/hash-nettle.c
> +++ b/crypto/hash-nettle.c
> @@ -21,6 +21,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "crypto/hash.h"
> +#include "hashpriv.h"
>  #include <nettle/md5.h>
>  #include <nettle/sha.h>
>  #include <nettle/ripemd160.h>
> @@ -103,12 +104,13 @@ gboolean
> qcrypto_hash_supports(QCryptoHashAlgorithm alg)
>  }
> 
> 
> -int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
> -                        const struct iovec *iov,
> -                        size_t niov,
> -                        uint8_t **result,
> -                        size_t *resultlen,
> -                        Error **errp)
> +static int
> +qcrypto_nettle_hash_bytesv(QCryptoHashAlgorithm alg,
> +                           const struct iovec *iov,
> +                           size_t niov,
> +                           uint8_t **result,
> +                           size_t *resultlen,
> +                           Error **errp)
>  {
>      int i;
>      union qcrypto_hash_ctx ctx;
> @@ -152,3 +154,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
> 
>      return 0;
>  }
> +
> +
> +QCryptoHashDriver qcrypto_hash_lib_driver = {
> +    .hash_bytesv = qcrypto_nettle_hash_bytesv,
> +};
> diff --git a/crypto/hash.c b/crypto/hash.c
> index 0f1ceac..c43fd87 100644
> --- a/crypto/hash.c
> +++ b/crypto/hash.c
> @@ -21,6 +21,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "crypto/hash.h"
> +#include "hashpriv.h"
> 
>  static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {
>      [QCRYPTO_HASH_ALG_MD5] = 16,
> @@ -38,6 +39,18 @@ size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm
> alg)
>      return qcrypto_hash_alg_size[alg];
>  }
> 
> +int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
> +                        const struct iovec *iov,
> +                        size_t niov,
> +                        uint8_t **result,
> +                        size_t *resultlen,
> +                        Error **errp)
> +{
> +    return qcrypto_hash_lib_driver.hash_bytesv(alg, iov, niov,
> +                                               result, resultlen,
> +                                               errp);
> +}
> +
> 
>  int qcrypto_hash_bytes(QCryptoHashAlgorithm alg,
>                         const char *buf,
> diff --git a/crypto/hashpriv.h b/crypto/hashpriv.h
> new file mode 100644
> index 0000000..5e505e0
> --- /dev/null
> +++ b/crypto/hashpriv.h
> @@ -0,0 +1,31 @@
> +/*
> + * QEMU Crypto hash driver supports
> + *
> + * Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD.
> + *
> + * Authors:
> + *    Longpeng(Mike) <longpeng2@huawei.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * (at your option) any later version.  See the COPYING file in the
> + * top-level directory.
> + *
> + */
> +
> +#ifndef QCRYPTO_HASHPRIV_H
> +#define QCRYPTO_HASHPRIV_H
> +
> +typedef struct QCryptoHashDriver QCryptoHashDriver;
> +
> +struct QCryptoHashDriver {
> +    int (*hash_bytesv)(QCryptoHashAlgorithm alg,
> +                       const struct iovec *iov,
> +                       size_t niov,
> +                       uint8_t **result,
> +                       size_t *resultlen,
> +                       Error **errp);
> +};
> +
> +extern QCryptoHashDriver qcrypto_hash_lib_driver;
> +
> +#endif
> --
> 1.8.3.1
>
diff mbox

Patch

diff --git a/crypto/hash-gcrypt.c b/crypto/hash-gcrypt.c
index 7690690..972beaa 100644
--- a/crypto/hash-gcrypt.c
+++ b/crypto/hash-gcrypt.c
@@ -22,6 +22,7 @@ 
 #include <gcrypt.h>
 #include "qapi/error.h"
 #include "crypto/hash.h"
+#include "hashpriv.h"
 
 
 static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
@@ -44,12 +45,13 @@  gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
 }
 
 
-int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
-                        const struct iovec *iov,
-                        size_t niov,
-                        uint8_t **result,
-                        size_t *resultlen,
-                        Error **errp)
+static int
+qcrypto_gcrypt_hash_bytesv(QCryptoHashAlgorithm alg,
+                           const struct iovec *iov,
+                           size_t niov,
+                           uint8_t **result,
+                           size_t *resultlen,
+                           Error **errp)
 {
     int i, ret;
     gcry_md_hd_t md;
@@ -107,3 +109,8 @@  int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
     gcry_md_close(md);
     return -1;
 }
+
+
+QCryptoHashDriver qcrypto_hash_lib_driver = {
+    .hash_bytesv = qcrypto_gcrypt_hash_bytesv,
+};
diff --git a/crypto/hash-glib.c b/crypto/hash-glib.c
index ec99ac9..fb16ac0 100644
--- a/crypto/hash-glib.c
+++ b/crypto/hash-glib.c
@@ -21,6 +21,7 @@ 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "crypto/hash.h"
+#include "hashpriv.h"
 
 
 static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
@@ -47,12 +48,13 @@  gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
 }
 
 
-int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
-                        const struct iovec *iov,
-                        size_t niov,
-                        uint8_t **result,
-                        size_t *resultlen,
-                        Error **errp)
+static int
+qcrypto_glib_hash_bytesv(QCryptoHashAlgorithm alg,
+                            const struct iovec *iov,
+                            size_t niov,
+                            uint8_t **result,
+                            size_t *resultlen,
+                            Error **errp)
 {
     int i, ret;
     GChecksum *cs;
@@ -95,3 +97,8 @@  int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
     g_checksum_free(cs);
     return -1;
 }
+
+
+QCryptoHashDriver qcrypto_hash_lib_driver = {
+    .hash_bytesv = qcrypto_glib_hash_bytesv,
+};
diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c
index 6a206dc..96f186f 100644
--- a/crypto/hash-nettle.c
+++ b/crypto/hash-nettle.c
@@ -21,6 +21,7 @@ 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "crypto/hash.h"
+#include "hashpriv.h"
 #include <nettle/md5.h>
 #include <nettle/sha.h>
 #include <nettle/ripemd160.h>
@@ -103,12 +104,13 @@  gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
 }
 
 
-int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
-                        const struct iovec *iov,
-                        size_t niov,
-                        uint8_t **result,
-                        size_t *resultlen,
-                        Error **errp)
+static int
+qcrypto_nettle_hash_bytesv(QCryptoHashAlgorithm alg,
+                           const struct iovec *iov,
+                           size_t niov,
+                           uint8_t **result,
+                           size_t *resultlen,
+                           Error **errp)
 {
     int i;
     union qcrypto_hash_ctx ctx;
@@ -152,3 +154,8 @@  int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
 
     return 0;
 }
+
+
+QCryptoHashDriver qcrypto_hash_lib_driver = {
+    .hash_bytesv = qcrypto_nettle_hash_bytesv,
+};
diff --git a/crypto/hash.c b/crypto/hash.c
index 0f1ceac..c43fd87 100644
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -21,6 +21,7 @@ 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "crypto/hash.h"
+#include "hashpriv.h"
 
 static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {
     [QCRYPTO_HASH_ALG_MD5] = 16,
@@ -38,6 +39,18 @@  size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg)
     return qcrypto_hash_alg_size[alg];
 }
 
+int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
+                        const struct iovec *iov,
+                        size_t niov,
+                        uint8_t **result,
+                        size_t *resultlen,
+                        Error **errp)
+{
+    return qcrypto_hash_lib_driver.hash_bytesv(alg, iov, niov,
+                                               result, resultlen,
+                                               errp);
+}
+
 
 int qcrypto_hash_bytes(QCryptoHashAlgorithm alg,
                        const char *buf,
diff --git a/crypto/hashpriv.h b/crypto/hashpriv.h
new file mode 100644
index 0000000..5e505e0
--- /dev/null
+++ b/crypto/hashpriv.h
@@ -0,0 +1,31 @@ 
+/*
+ * QEMU Crypto hash driver supports
+ *
+ * Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD.
+ *
+ * Authors:
+ *    Longpeng(Mike) <longpeng2@huawei.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.  See the COPYING file in the
+ * top-level directory.
+ *
+ */
+
+#ifndef QCRYPTO_HASHPRIV_H
+#define QCRYPTO_HASHPRIV_H
+
+typedef struct QCryptoHashDriver QCryptoHashDriver;
+
+struct QCryptoHashDriver {
+    int (*hash_bytesv)(QCryptoHashAlgorithm alg,
+                       const struct iovec *iov,
+                       size_t niov,
+                       uint8_t **result,
+                       size_t *resultlen,
+                       Error **errp);
+};
+
+extern QCryptoHashDriver qcrypto_hash_lib_driver;
+
+#endif