Skip to content

Commit

Permalink
crypto: hmac: introduce qcrypto_hmac_ctx_new for glib-backend
Browse files Browse the repository at this point in the history
Extracts qcrypto_hmac_ctx_new() from qcrypto_hmac_new() for
glib-backend impls.

Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
  • Loading branch information
Longpeng(Mike) authored and berrange committed Jul 19, 2017
1 parent 8c2776d commit d73c04e
Showing 1 changed file with 24 additions and 10 deletions.
34 changes: 24 additions & 10 deletions crypto/hmac-glib.c
Expand Up @@ -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)) {
Expand All @@ -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],
Expand All @@ -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;
}

Expand Down Expand Up @@ -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) {
return NULL;
}

hmac = g_new0(QCryptoHmac, 1);
hmac->alg = alg;
hmac->opaque = ctx;

return hmac;
}

#else

bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg)
Expand Down

0 comments on commit d73c04e

Please sign in to comment.