mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: hmac: introduce qcrypto_hmac_ctx_new for glib-backend

Browse Source 
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>
This commit is contained in:
Longpeng(Mike) 2017-07-14 14:04:03 -04:00 committed by Daniel P. Berrange
parent 8c2776d86c
commit d73c04e3ca
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crypto/hmac-glib.c
View File

@ -49,11 +49,11 @@ bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg)
return false; return false;
} }
QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg, static QCryptoHmacGlib *
const uint8_t *key, size_t nkey, qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,
Error **errp) const uint8_t *key, size_t nkey,
Error **errp)
{ {
QCryptoHmac *hmac;
QCryptoHmacGlib *ctx; QCryptoHmacGlib *ctx;
if (!qcrypto_hmac_supports(alg)) { if (!qcrypto_hmac_supports(alg)) {
@ -62,9 +62,6 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
return NULL; return NULL;
} }
hmac = g_new0(QCryptoHmac, 1);
hmac->alg = alg;
ctx = g_new0(QCryptoHmacGlib, 1); ctx = g_new0(QCryptoHmacGlib, 1);
ctx->ghmac = g_hmac_new(qcrypto_hmac_alg_map[alg], ctx->ghmac = g_hmac_new(qcrypto_hmac_alg_map[alg],
@ -74,12 +71,10 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
goto error; goto error;
} }
hmac->opaque = ctx; return ctx;
return hmac;
error: error:
g_free(ctx); g_free(ctx);
g_free(hmac);
return NULL; return NULL;
} }
@ -134,6 +129,25 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac,
return 0; 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 #else
bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg) bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg)