| Message ID | 1492392806-53720-10-git-send-email-longpeng2@huawei.com |
|---|---|
| State | New |
| Headers | show |
> -----Original Message----- > From: longpeng > Sent: Monday, April 17, 2017 9:33 AM > To: berrange@redhat.com > Cc: Gonglei (Arei); Huangweidong (C); armbru@redhat.com; > eblake@redhat.com; mst@redhat.com; qemu-devel@nongnu.org; longpeng > Subject: [PATCH v2 for-2.10 09/18] crypto: hmac: introduce > qcrypto_hmac_ctx_new for nettle-backend > > Extracts qcrypto_hmac_ctx_new() from qcrypto_hmac_new() for > nettle-backend impls. > > Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com> > --- > crypto/hmac-nettle.c | 34 ++++++++++++++++++++++++---------- > 1 file changed, 24 insertions(+), 10 deletions(-) > Reviewed-by: Gonglei <arei.gonglei@huawei.com> > diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c > index 4a9e6b2..19fbb4f 100644 > --- a/crypto/hmac-nettle.c > +++ b/crypto/hmac-nettle.c > @@ -97,11 +97,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 QCryptoHmacNettle * > +qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg, > + const uint8_t *key, size_t nkey, > + Error **errp) > { > - QCryptoHmac *hmac; > QCryptoHmacNettle *ctx; > > if (!qcrypto_hmac_supports(alg)) { > @@ -110,16 +110,11 @@ QCryptoHmac > *qcrypto_hmac_new(QCryptoHashAlgorithm alg, > return NULL; > } > > - hmac = g_new0(QCryptoHmac, 1); > - hmac->alg = alg; > - > ctx = g_new0(QCryptoHmacNettle, 1); > > qcrypto_hmac_alg_map[alg].setkey(&ctx->u, nkey, key); > > - hmac->opaque = ctx; > - > - return hmac; > + return ctx; > } > > void qcrypto_hmac_free(QCryptoHmac *hmac) > @@ -173,3 +168,22 @@ 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; > + QCryptoHmacNettle *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; > +} > -- > 1.8.3.1 >
diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c index 4a9e6b2..19fbb4f 100644 --- a/crypto/hmac-nettle.c +++ b/crypto/hmac-nettle.c @@ -97,11 +97,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 QCryptoHmacNettle * +qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg, + const uint8_t *key, size_t nkey, + Error **errp) { - QCryptoHmac *hmac; QCryptoHmacNettle *ctx; if (!qcrypto_hmac_supports(alg)) { @@ -110,16 +110,11 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg, return NULL; } - hmac = g_new0(QCryptoHmac, 1); - hmac->alg = alg; - ctx = g_new0(QCryptoHmacNettle, 1); qcrypto_hmac_alg_map[alg].setkey(&ctx->u, nkey, key); - hmac->opaque = ctx; - - return hmac; + return ctx; } void qcrypto_hmac_free(QCryptoHmac *hmac) @@ -173,3 +168,22 @@ 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; + QCryptoHmacNettle *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; +}
Extracts qcrypto_hmac_ctx_new() from qcrypto_hmac_new() for nettle-backend impls. Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com> --- crypto/hmac-nettle.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)