From patchwork Fri Jul 14 11:38:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: long mike X-Patchwork-Id: 9840685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 472B960212 for ; Fri, 14 Jul 2017 11:49:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39BE628755 for ; Fri, 14 Jul 2017 11:49:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E7232876E; Fri, 14 Jul 2017 11:49:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6B85A28755 for ; Fri, 14 Jul 2017 11:49:42 +0000 (UTC) Received: from localhost ([::1]:37213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVz6L-0002Ye-It for patchwork-qemu-devel@patchwork.kernel.org; Fri, 14 Jul 2017 07:49:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVyw4-0001Hw-Bt for qemu-devel@nongnu.org; Fri, 14 Jul 2017 07:39:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVyw3-0007u5-3Y for qemu-devel@nongnu.org; Fri, 14 Jul 2017 07:39:04 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVyw2-0007tV-SF for qemu-devel@nongnu.org; Fri, 14 Jul 2017 07:39:03 -0400 Received: by mail-pf0-x241.google.com with SMTP id z6so10754294pfk.3 for ; Fri, 14 Jul 2017 04:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IqChpPDAxMqZSZ/OXp/szN6Aqd/sjvGub/+s3znB5wc=; b=InQqxedi/WD1sfPTJEj3WgLjlSXhGhm2m+owkXoiZfAONgGi6TOVvJcU7rAorWZhVt S7Ko8U3Tt9WH3wd9QKjiNhEMa0YXuxZhVPDwSS+GAx6ycqP85/IU8lFZTT0iv0UOANlV 6cnDpD3ac9mr5OXEc6dVk/A9aslC91EBPiVYxXUaQ7zlEvsStWqaTAUTBEITySqFHj86 UsmHLVrkuMc9t/FM+xg8Y4Byv9tiVYmLWX4PHL0ND6C674H0acFXzmqGKfsVjz7gSk4N PO4PBYQ3fP+nqFqGp88WQbc3yzFSvWA/PSvndGJ+KE3DugZCWCaAUBM/lE/wuKmnrh6X UUag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IqChpPDAxMqZSZ/OXp/szN6Aqd/sjvGub/+s3znB5wc=; b=FYU0KV5KqutdWqRvg4NKhIWXpyZ+LZ4WWlRSw/UW8wgwyZKr2f7CL/JdYMszzigSKL 88m3kVulMY+uKZc3I+HQ2Bbh0GNUGvId14rZ6c6wdTLuliL5gE/Fi62g0S/LGmebnyEp MzU2v1SlDD7Xg0c0/hAFYYWoSwFeId182Jg2AMCDEcpoAqRVyGjKrGV95x3mc5NSWJd9 kmE6oeI38XYvbDmIQO+f5CkjYP8JQZSu8gJng9PVa6pGuugTXPyi5bxfnha6OQKCLo3T CBCWmFP5HxEWvUJBI2XYMe7Dfb137/7Q9arG2L1kPr6msJAQcdW2bj8N1UMop5/VtcHH wcrg== X-Gm-Message-State: AIVw112lWYahGfLf7gVV3K0UZTAttTB2OiU10e69pg3pOgrYo8ljsjft 6wyRlyrxx9wXARrdnKY= X-Received: by 10.99.227.81 with SMTP id o17mr14040907pgj.41.1500032342042; Fri, 14 Jul 2017 04:39:02 -0700 (PDT) Received: from localhost (45.78.25.254.16clouds.com. [45.78.25.254]) by smtp.gmail.com with ESMTPSA id k67sm15742709pfg.37.2017.07.14.04.39.01 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 14 Jul 2017 04:39:01 -0700 (PDT) From: longpeng.mike@gmail.com To: berrange@redhat.com Date: Fri, 14 Jul 2017 07:38:37 -0400 Message-Id: <1500032321-13951-16-git-send-email-longpeng.mike@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1500032321-13951-1-git-send-email-longpeng.mike@gmail.com> References: <1500032321-13951-1-git-send-email-longpeng.mike@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH v5 15/18] crypto: hmac: add af_alg-backend 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: "Longpeng\(Mike\)" , arei.gonglei@huawei.com, weidong.huang@huawei.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Longpeng(Mike)" 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 | 104 +++++++++++++++++++++++++++++++++++++++++++++------- crypto/hmac.c | 22 +++++++++-- crypto/hmacpriv.h | 12 ++++++ 3 files changed, 121 insertions(+), 17 deletions(-) diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c index 70ab414..cf34c69 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" static char * qcrypto_afalg_hash_format_name(QCryptoHashAlgorithm alg, + bool is_hmac, Error **errp) { char *name; @@ -53,18 +56,24 @@ qcrypto_afalg_hash_format_name(QCryptoHashAlgorithm alg, return NULL; } - name = g_strdup_printf("%s", alg_name); + if (is_hmac) { + name = g_strdup_printf("hmac(%s)", alg_name); + } else { + name = g_strdup_printf("%s", alg_name); + } return name; } 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; - name = qcrypto_afalg_hash_format_name(alg, errp); + name = qcrypto_afalg_hash_format_name(alg, is_hmac, errp); if (!name) { return NULL; } @@ -77,19 +86,46 @@ qcrypto_afalg_hash_ctx_new(QCryptoHashAlgorithm alg, Error **errp) g_free(name); + /* HMAC needs setkey */ + if (is_hmac) { + if (qemu_setsockopt(afalg->tfmfd, SOL_ALG, ALG_SET_KEY, + key, nkey) != 0) { + error_setg_errno(errp, errno, "Set hmac key failed"); + qcrypto_afalg_comm_free(afalg); + return NULL; + } + } + return afalg; } +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 = 0; + bool is_hmac = (hmac != NULL) ? true : false; const int expect_len = qcrypto_hash_digest_len(alg); if (*resultlen == 0) { @@ -102,9 +138,13 @@ qcrypto_afalg_hash_bytesv(QCryptoHashAlgorithm alg, return -1; } - afalg = qcrypto_afalg_hash_ctx_new(alg, errp); - if (!afalg) { - return -1; + if (is_hmac) { + afalg = hmac; + } else { + afalg = qcrypto_afalg_hash_ctx_new(alg, errp); + if (!afalg) { + return -1; + } } /* send data to kernel's crypto core */ @@ -127,10 +167,48 @@ qcrypto_afalg_hash_bytesv(QCryptoHashAlgorithm alg, } out: - qcrypto_afalg_comm_free(afalg); + if (!is_hmac) { + qcrypto_afalg_comm_free(afalg); + } return ret; } +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 = hmac->opaque; + qcrypto_afalg_comm_free(afalg); +} + QCryptoHashDriver qcrypto_hash_afalg_driver = { .hash_bytesv = qcrypto_afalg_hash_bytesv, }; + +QCryptoHmacDriver qcrypto_hmac_afalg_driver = { + .hmac_bytesv = qcrypto_afalg_hmac_bytesv, + .hmac_free = qcrypto_afalg_hmac_ctx_free, +}; diff --git a/crypto/hmac.c b/crypto/hmac.c index a4690e3..37e2af2 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -89,17 +89,31 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg, Error **errp) { QCryptoHmac *hmac; - void *ctx; + void *ctx = NULL; + Error *err2 = NULL; + QCryptoHmacDriver *drv; + +#ifdef CONFIG_AF_ALG + ctx = qcrypto_afalg_hmac_ctx_new(alg, key, nkey, &err2); + if (ctx) { + drv = &qcrypto_hmac_afalg_driver; + } +#endif - ctx = qcrypto_hmac_ctx_new(alg, key, nkey, errp); if (!ctx) { - return NULL; + ctx = qcrypto_hmac_ctx_new(alg, key, nkey, errp); + if (!ctx) { + return NULL; + } + + drv = &qcrypto_hmac_lib_driver; + error_free(err2); } hmac = g_new0(QCryptoHmac, 1); hmac->alg = alg; hmac->opaque = ctx; - hmac->driver = (void *)&qcrypto_hmac_lib_driver; + hmac->driver = (void *)drv; return hmac; } diff --git a/crypto/hmacpriv.h b/crypto/hmacpriv.h index 2be389a..4387ca2 100644 --- a/crypto/hmacpriv.h +++ b/crypto/hmacpriv.h @@ -33,4 +33,16 @@ extern void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg, Error **errp); extern QCryptoHmacDriver qcrypto_hmac_lib_driver; +#ifdef CONFIG_AF_ALG + +#include "afalgpriv.h" + +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 + #endif