ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: hmac: introduce qcrypto_hmac_ctx_new for gcrypt-backend 

1) Fix a handle-leak problem in qcrypto_hmac_new(), didn't free
   ctx->handle if gcry_mac_setkey fails.

2) Extracts qcrypto_hmac_ctx_new() from qcrypto_hmac_new() for
   gcrypt-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:01 -04:00 committed by Daniel P. Berrange
parent 9767b75d92
commit 822d15ded8
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crypto/hmac-gcrypt.c
View File

@ -42,11 +42,11 @@ bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg)
return false; return false;
} }
QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg, static QCryptoHmacGcrypt *
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;
QCryptoHmacGcrypt *ctx; QCryptoHmacGcrypt *ctx;
gcry_error_t err; gcry_error_t err;
@ -56,9 +56,6 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
return NULL; return NULL;
} }
hmac = g_new0(QCryptoHmac, 1);
hmac->alg = alg;
ctx = g_new0(QCryptoHmacGcrypt, 1); ctx = g_new0(QCryptoHmacGcrypt, 1);
err = gcry_mac_open(&ctx->handle, qcrypto_hmac_alg_map[alg], err = gcry_mac_open(&ctx->handle, qcrypto_hmac_alg_map[alg],
@ -73,15 +70,14 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,
if (err != 0) { if (err != 0) {
error_setg(errp, "Cannot set key: %s", error_setg(errp, "Cannot set key: %s",
gcry_strerror(err)); gcry_strerror(err));
gcry_mac_close(ctx->handle);
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;
} }
@ -150,3 +146,22 @@ 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;
QCryptoHmacGcrypt *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;
}