From nobody Mon Feb 9 13:59:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492393746984577.5405329485168; Sun, 16 Apr 2017 18:49:06 -0700 (PDT) Received: from localhost ([::1]:34274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czvmr-00068G-ND for importer@patchew.org; Sun, 16 Apr 2017 21:49:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czvYO-0003sm-Im for qemu-devel@nongnu.org; Sun, 16 Apr 2017 21:34:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1czvYM-0005aF-Oy for qemu-devel@nongnu.org; Sun, 16 Apr 2017 21:34:08 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:3484 helo=dggrg01-dlp.huawei.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1czvYL-0005XW-Oj for qemu-devel@nongnu.org; Sun, 16 Apr 2017 21:34:06 -0400 Received: from 172.30.72.56 (EHLO DGGEML402-HUB.china.huawei.com) ([172.30.72.56]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AMW01834; Mon, 17 Apr 2017 09:34:02 +0800 (CST) Received: from localhost (10.177.246.209) by DGGEML402-HUB.china.huawei.com (10.3.17.38) with Microsoft SMTP Server id 14.3.301.0; Mon, 17 Apr 2017 09:33:52 +0800 From: "Longpeng(Mike)" To: Date: Mon, 17 Apr 2017 09:33:23 +0800 Message-ID: <1492392806-53720-16-git-send-email-longpeng2@huawei.com> X-Mailer: git-send-email 1.8.4.msysgit.0 In-Reply-To: <1492392806-53720-1-git-send-email-longpeng2@huawei.com> References: <1492392806-53720-1-git-send-email-longpeng2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.246.209] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.58F41B8B.002B, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: c0d054c8e22b428de08bcf037514f145 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.187 Subject: [Qemu-devel] [PATCH v2 for-2.10 15/18] crypto: hmac: add af_alg hmac support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: weidong.huang@huawei.com, mst@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, arei.gonglei@huawei.com, "Longpeng\(Mike\)" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds afalg-backend hmac support: introduces some private APIs firstly, and then intergrates them into qcrypto_hmac_afalg_driver. Signed-off-by: Longpeng(Mike) --- crypto/hash-afalg.c | 108 +++++++++++++++++++++++++++++++++++++++++++---= ---- crypto/hmac.c | 27 ++++++++++++- crypto/hmacpriv.h | 9 +++++ include/crypto/hmac.h | 8 ++++ 4 files changed, 136 insertions(+), 16 deletions(-) diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c index 1d0e052..7861e7f 100644 --- a/crypto/hash-afalg.c +++ b/crypto/hash-afalg.c @@ -1,5 +1,5 @@ /* - * QEMU Crypto af_alg-backend hash support + * QEMU Crypto af_alg-backend hash/hmac support * * Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD. * @@ -16,10 +16,13 @@ #include "qemu-common.h" #include "qapi/error.h" #include "crypto/hash.h" +#include "crypto/hmac.h" #include "hashpriv.h" +#include "hmacpriv.h" =20 static char * qcrypto_afalg_hash_format_name(QCryptoHashAlgorithm alg, + bool is_hmac, Error **errp) { char *name; @@ -55,10 +58,14 @@ qcrypto_afalg_hash_format_name(QCryptoHashAlgorithm alg, } =20 name =3D (char *)g_new0(int8_t, SALG_NAME_LEN_MAX); - ret =3D snprintf(name, SALG_NAME_LEN_MAX, "%s", alg_name); + if (is_hmac) { + ret =3D snprintf(name, SALG_NAME_LEN_MAX, "hmac(%s)", alg_name); + } else { /* hash */ + ret =3D snprintf(name, SALG_NAME_LEN_MAX, "%s", alg_name); + } if (ret < 0 || ret >=3D SALG_NAME_LEN_MAX) { - error_setg(errp, "Build hash name(name=3D'%s') failed", - alg_name); + error_setg(errp, "Build %s name(name=3D'%s') failed", + is_hmac ? "hmac" : "hash", alg_name); g_free(name); return NULL; } @@ -67,12 +74,14 @@ qcrypto_afalg_hash_format_name(QCryptoHashAlgorithm alg, } =20 static QCryptoAFAlg * -qcrypto_afalg_hash_ctx_new(QCryptoHashAlgorithm alg, Error **errp) +qcrypto_afalg_hash_hmac_ctx_new(QCryptoHashAlgorithm alg, + const uint8_t *key, size_t nkey, + bool is_hmac, Error **errp) { QCryptoAFAlg *afalg; char *name; =20 - name =3D qcrypto_afalg_hash_format_name(alg, errp); + name =3D qcrypto_afalg_hash_format_name(alg, is_hmac, errp); if (!name) { return NULL; } @@ -82,6 +91,15 @@ qcrypto_afalg_hash_ctx_new(QCryptoHashAlgorithm alg, Err= or **errp) goto error; } =20 + /* HMAC needs setkey */ + if (is_hmac) { + if (qemu_setsockopt(afalg->tfmfd, SOL_ALG, ALG_SET_KEY, + key, nkey) !=3D 0) { + error_setg_errno(errp, errno, "Set hmac key failed"); + goto error; + } + } + /* prepare msg header */ afalg->msg =3D g_new0(struct msghdr, 1); =20 @@ -91,19 +109,37 @@ cleanup: =20 error: qcrypto_afalg_comm_free(afalg); + afalg =3D NULL; goto cleanup; } =20 +static QCryptoAFAlg * +qcrypto_afalg_hash_ctx_new(QCryptoHashAlgorithm alg, + Error **errp) +{ + return qcrypto_afalg_hash_hmac_ctx_new(alg, NULL, 0, false, errp); +} + +QCryptoAFAlg * +qcrypto_afalg_hmac_ctx_new(QCryptoHashAlgorithm alg, + const uint8_t *key, size_t nkey, + Error **errp) +{ + return qcrypto_afalg_hash_hmac_ctx_new(alg, key, nkey, true, errp); +} + static int -qcrypto_afalg_hash_bytesv(QCryptoHashAlgorithm alg, - const struct iovec *iov, - size_t niov, uint8_t **result, - size_t *resultlen, - Error **errp) +qcrypto_afalg_hash_hmac_bytesv(QCryptoAFAlg *hmac, + QCryptoHashAlgorithm alg, + const struct iovec *iov, + size_t niov, uint8_t **result, + size_t *resultlen, + Error **errp) { QCryptoAFAlg *afalg; struct iovec outv; int ret =3D 0; + bool is_hmac =3D (hmac !=3D NULL) ? true : false; const int except_len =3D qcrypto_hash_digest_len(alg); =20 if (*resultlen =3D=3D 0) { @@ -116,9 +152,13 @@ qcrypto_afalg_hash_bytesv(QCryptoHashAlgorithm alg, return -1; } =20 - afalg =3D qcrypto_afalg_hash_ctx_new(alg, errp); - if (afalg =3D=3D NULL) { - return -1; + if (is_hmac) { + afalg =3D hmac; + } else { + afalg =3D qcrypto_afalg_hash_ctx_new(alg, errp); + if (afalg =3D=3D NULL) { + return -1; + } } =20 /* send data to kernel's crypto core */ @@ -142,10 +182,48 @@ qcrypto_afalg_hash_bytesv(QCryptoHashAlgorithm alg, } =20 out: - qcrypto_afalg_comm_free(afalg); + if (!is_hmac) { + qcrypto_afalg_comm_free(afalg); + } return ret; } =20 +static int +qcrypto_afalg_hash_bytesv(QCryptoHashAlgorithm alg, + const struct iovec *iov, + size_t niov, uint8_t **result, + size_t *resultlen, + Error **errp) +{ + return qcrypto_afalg_hash_hmac_bytesv(NULL, alg, iov, niov, result, + resultlen, errp); +} + +static int +qcrypto_afalg_hmac_bytesv(QCryptoHmac *hmac, + const struct iovec *iov, + size_t niov, uint8_t **result, + size_t *resultlen, + Error **errp) +{ + return qcrypto_afalg_hash_hmac_bytesv(hmac->opaque, hmac->alg, + iov, niov, result, resultlen, + errp); +} + +static void qcrypto_afalg_hmac_ctx_free(QCryptoHmac *hmac) +{ + QCryptoAFAlg *afalg; + + afalg =3D hmac->opaque; + qcrypto_afalg_comm_free(afalg); +} + QCryptoHashDriver qcrypto_hash_afalg_driver =3D { .hash_bytesv =3D qcrypto_afalg_hash_bytesv, }; + +QCryptoHmacDriver qcrypto_hmac_afalg_driver =3D { + .hmac_bytesv =3D qcrypto_afalg_hmac_bytesv, + .hmac_free =3D qcrypto_afalg_hmac_ctx_free, +}; diff --git a/crypto/hmac.c b/crypto/hmac.c index d040fbb..0a1a6e7 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -90,16 +90,32 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg, { QCryptoHmac *hmac; void *ctx; + Error *err2 =3D NULL; + QCryptoHmacDriver *drv; + +#ifdef CONFIG_AF_ALG + ctx =3D qcrypto_afalg_hmac_ctx_new(alg, key, nkey, &err2); + if (ctx) { + drv =3D &qcrypto_hmac_afalg_driver; + goto set_hmac; + } +#endif =20 ctx =3D qcrypto_hmac_ctx_new(alg, key, nkey, errp); if (ctx =3D=3D NULL) { return NULL; } =20 + drv =3D &qcrypto_hmac_lib_driver; + error_free(err2); + +#ifdef CONFIG_AF_ALG +set_hmac: +#endif hmac =3D g_new0(QCryptoHmac, 1); hmac->alg =3D alg; hmac->opaque =3D ctx; - hmac->driver =3D (void *)&qcrypto_hmac_lib_driver; + hmac->driver =3D (void *)drv; =20 return hmac; } @@ -114,3 +130,12 @@ void qcrypto_hmac_free(QCryptoHmac *hmac) g_free(hmac); } } + +bool qcrypto_hmac_using_afalg_drv(QCryptoHmac *hmac) +{ +#ifdef CONFIG_AF_ALG + return hmac->driver =3D=3D &qcrypto_hmac_afalg_driver; +#else + return false; +#endif +} diff --git a/crypto/hmacpriv.h b/crypto/hmacpriv.h index 2be389a..2d1900f 100644 --- a/crypto/hmacpriv.h +++ b/crypto/hmacpriv.h @@ -15,6 +15,8 @@ #ifndef QCRYPTO_HMACPRIV_H #define QCRYPTO_HMACPRIV_H =20 +#include "afalgpriv.h" + typedef struct QCryptoHmacDriver QCryptoHmacDriver; =20 struct QCryptoHmacDriver { @@ -33,4 +35,11 @@ extern void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm a= lg, Error **errp); extern QCryptoHmacDriver qcrypto_hmac_lib_driver; =20 + +extern QCryptoAFAlg * +qcrypto_afalg_hmac_ctx_new(QCryptoHashAlgorithm alg, + const uint8_t *key, size_t nkey, + Error **errp); +extern QCryptoHmacDriver qcrypto_hmac_afalg_driver; + #endif diff --git a/include/crypto/hmac.h b/include/crypto/hmac.h index 5e88905..450cdee 100644 --- a/include/crypto/hmac.h +++ b/include/crypto/hmac.h @@ -164,4 +164,12 @@ int qcrypto_hmac_digest(QCryptoHmac *hmac, char **digest, Error **errp); =20 +/** + * qcrypto_cipher_using_afalg_drv: + * @hmac: the hmac object + * + * Returns: True if @hmac using afalg driver, otherwise false. + */ +bool qcrypto_hmac_using_afalg_drv(QCryptoHmac *hmac); + #endif --=20 1.8.3.1