[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 10/18] crypto: hmac: introduce qcrypto_hmac_ctx_ne
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 10/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for glib-backend |
Date: |
Tue, 18 Jul 2017 11:25:11 +0100 |
From: "Longpeng(Mike)" <address@hidden>
Extracts qcrypto_hmac_ctx_new() from qcrypto_hmac_new() for
glib-backend impls.
Reviewed-by: Gonglei <address@hidden>
Signed-off-by: Longpeng(Mike) <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
crypto/hmac-glib.c | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/crypto/hmac-glib.c b/crypto/hmac-glib.c
index 08a1fdd10a..f0ccfd6eda 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) {
+ return NULL;
+ }
+
+ hmac = g_new0(QCryptoHmac, 1);
+ hmac->alg = alg;
+ hmac->opaque = ctx;
+
+ return hmac;
+}
+
#else
bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg)
--
2.13.0
- [Qemu-devel] [PULL v1 00/18] Merge crypto 201/07/18, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 01/18] crypto: cipher: introduce context free function, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 02/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for gcrypt-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 03/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for nettle-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 04/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for builtin-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 05/18] crypto: cipher: add cipher driver framework, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 06/18] crypto: hash: add hash driver framework, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 10/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for glib-backend,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 08/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for gcrypt-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 09/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for nettle-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 07/18] crypto: hmac: move crypto/hmac.h into include/crypto/, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 11/18] crypto: hmac: add hmac driver framework, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 13/18] crypto: cipher: add afalg-backend cipher support, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 12/18] crypto: introduce some common functions for af_alg backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 15/18] crypto: hmac: add af_alg-backend hmac support, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 16/18] tests: crypto: add cipher speed benchmark support, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 14/18] crypto: hash: add afalg-backend hash support, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 17/18] tests: crypto: add hash speed benchmark support, Daniel P. Berrange, 2017/07/18