> -----Original Message-----
> From: longpeng
> Sent: Monday, April 17, 2017 9:33 AM
> To: berra...@redhat.com
> Cc: Gonglei (Arei); Huangweidong (C); arm...@redhat.com;
> ebl...@redhat.com; m...@redhat.com; qemu-devel@nongnu.org; longpeng
> Subject: [PATCH v2 for-2.10 10/18] crypto: hmac: introduce
> qcrypto_hmac_ctx_new for glib-backend
>
> Extracts qcrypto_hmac_ctx_new() from qcrypto_hmac_new() for
> glib-backend impls.
>
> Signed-off-by: Longpeng(Mike) <longpe...@huawei.com>
> ---
> crypto/hmac-glib.c | 34 ++++++++++++++++++++++++----------
> 1 file changed, 24 insertions(+), 10 deletions(-)
>
Reviewed-by: Gonglei <arei.gong...@huawei.com>
> diff --git a/crypto/hmac-glib.c b/crypto/hmac-glib.c
> index 08a1fdd..d9f88d8 100644
> --- a/crypto/hmac-glib.c
> +++ b/crypto/hmac-glib.c
> @@ -49,11 +49,11 @@ bool qcrypto_hmac_supports(QCryptoHashAlgorithm
> alg)
> return false;
> }
>
> -QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
> - const uint8_t *key, size_t nkey,
> - Error **errp)
> +static QCryptoHmacGlib *
> +qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,
> + const uint8_t *key, size_t nkey,
> + Error **errp)
> {
> - QCryptoHmac *hmac;
> QCryptoHmacGlib *ctx;
>
> if (!qcrypto_hmac_supports(alg)) {
> @@ -62,9 +62,6 @@ QCryptoHmac
> *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
> return NULL;
> }
>
> - hmac = g_new0(QCryptoHmac, 1);
> - hmac->alg = alg;
> -
> ctx = g_new0(QCryptoHmacGlib, 1);
>
> ctx->ghmac = g_hmac_new(qcrypto_hmac_alg_map[alg],
> @@ -74,12 +71,10 @@ QCryptoHmac
> *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
> goto error;
> }
>
> - hmac->opaque = ctx;
> - return hmac;
> + return ctx;
>
> error:
> g_free(ctx);
> - g_free(hmac);
> return NULL;
> }
>
> @@ -134,6 +129,25 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac,
> return 0;
> }
>
> +QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
> + const uint8_t *key, size_t nkey,
> + Error **errp)
> +{
> + QCryptoHmac *hmac;
> + QCryptoHmacGlib *ctx;
> +
> + ctx = qcrypto_hmac_ctx_new(alg, key, nkey, errp);
> + if (ctx == NULL) {
> + return NULL;
> + }
> +
> + hmac = g_new0(QCryptoHmac, 1);
> + hmac->alg = alg;
> + hmac->opaque = ctx;
> +
> + return hmac;
> +}
> +
> #else
>
> bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg)
> --
> 1.8.3.1
>
