From patchwork Mon Jul 23 14:46:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shally Verma X-Patchwork-Id: 43274 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C2899325F; Mon, 23 Jul 2018 16:46:43 +0200 (CEST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0051.outbound.protection.outlook.com [104.47.41.51]) by dpdk.org (Postfix) with ESMTP id A52C83238 for ; Mon, 23 Jul 2018 16:46:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3iWtd1P8JJ/vyxm+gy3fxfnvNOzTYk8/PNqM5rkNK00=; b=n3gYNNju6qAHGYHvA+P3hZaz9pRqgbloCQwgNwDbuFGyWwKU/jGcxhftvwrgez27yOem1izKtCgH7J3Ur17JX2+NouJrnFGD6HbphftJiqD/dsnb3igqmlDHDISSEwzJkj3Z0fKiz9pcASBa9gCF0rkWNkiLNFeORXIJ37iB8OY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Shally.Verma@cavium.com; Received: from hyd1sverma-dt.caveonetworks.com (115.113.156.2) by DM5PR0701MB3640.namprd07.prod.outlook.com (2603:10b6:4:7e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Mon, 23 Jul 2018 14:46:37 +0000 From: Shally Verma To: pablo.de.lara.guarch@intel.com Cc: dev@dpdk.org, pathreya@caviumnetworks.com, nmurthy@caviumnetworks.com, Sunila Sahu , Ashish Gupta Date: Mon, 23 Jul 2018 20:16:04 +0530 Message-Id: <1532357165-8575-3-git-send-email-shally.verma@caviumnetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1532357165-8575-1-git-send-email-shally.verma@caviumnetworks.com> References: <1532357165-8575-1-git-send-email-shally.verma@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [115.113.156.2] X-ClientProxiedBy: MA1PR0101CA0020.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::30) To DM5PR0701MB3640.namprd07.prod.outlook.com (2603:10b6:4:7e::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc258282-c52b-41da-70be-08d5f0ab197c X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DM5PR0701MB3640; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3640; 3:+Rq33FCql/FQereQlYbjBwrBoZf4k1dWDQ8rqrQupTR9slowdyi0dR6qydyDyMmu5WxOOBZYdLeSf9R4rb2DlnVVfda0x4THKryweLoyv6E/xU8YgZ00Zj48ZVwtDBwKyuAXRRciVL8vDpwlWWhpOQ5mWJwZ+bMWIU7ybgaPrY9kFwzh+eMdFV0riSNQ18GLtNaUQJ6qPrepDB0Zs18HvljF3B4BwbFKsqKPaGvw850htm+xj0AFaVlV3oPH5gE3; 25:ozaeDGa5TmPrOnaaEuoHYmBk09yDgQxGqfWLjir8rRdBupoPzmA/KxdVRk6AtU9euCIrNkCsva8/CidTNb3UVxbER1tLEZ6+MEWoYdrUxsnyw54mHcV5maNNAT0XPYIl//6MXN+Wk2P/Go6Cb87Rv42cbAOf9BTADp8VWUC+IrvVhURV6cxkZWUHnnDuvOBj03p8AzyzNeemPV8/yNpcWsMvhaq0AlxCcXTQSkh/QyjX4sG1QRojhFXx5L1AjdKHOcc/mLxvp4vdpAzmLe+Rqj95L9lcVoCQhHh9KXPgMk+ytFagX66VL8V4Q+YUjcZvZqsMj1DU6w59H9/LofrTtg==; 31:fepRjBoBuo/7NE9Mwu4wSWy3K0Eo2xPJeN4YPDJj+KTE7SOeWATIRljPxjF9KgwPMWRhEfz7k6lMuly0DsKGpeLsmz7ibm9kLz9dg76WmXGl6LjLIYiGOby60GWBELyir1FC7bw7aYWUDxc+26/0dM3no3u0ODOCf441RKCAomn0nvXTMIBLTGv6cZ3LhKMsLFERneFbGAEhDVp0TelATxSmpM+pn4etoRuYXEsImd4= X-MS-TrafficTypeDiagnostic: DM5PR0701MB3640: X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3640; 20:g+OMMaQYLQBHFYN6ap3L4T4lODQHm9kVkIYgdtltPSUNdTYAYmvczbvye9PnUTZBMMjvWZkKPBh5gQsShzO3xpqtbd+Cfz5sg16MaRtwcZqjlJgAt/+WZFAkAbt0pDZJ+k6wEpDmORd8RJ1v/HOQffRB+e4/cRFXMj/SkuoptIdKKLT6uNDCYNNnoPwycw0U6ibB6BM+6/CA34C19yMsh/kqdAIt1p86GHrSg+FQlGB3HNMfuIeotZeb7UTVtBEdnCISBzRpt/2lkj6r4UYlXBm3cgHcf/0kDkoWibG+33X3484qF/ipv1r/zQSyg1rqmQZBKhcPBRddtEB52xgDu8gW0Wm5ITdpHzgAg113HzLBbs+Lo+qKsAwAiUQ8j/xKlYPB8tEUykyAAkx8iRI7/jawrBMnmW08iTfptZk40KBd2Fmm3tf3+I4JE9Hh/dJAAgI60f4w60gAcWFqPA7DT0xCDNqrCZLOHdZ8V+DGanSTQnhU0RGm7yxU5NCvSs27++pV9axIRuvDG7oMTEBStyQvhVAEjbd/ZBicfHJ2MObhVCn56BKGWtvOACMigTQ1X3wZzQeOhckFQnsLuDBS5+/opAuV3W3oceJv7AjS1Kc=; 4:b2CT3IqGRuUdqKyxRJjrC0RzOOckZABDqC4hE78QWfOIWbWgZsC3KaSIsALjFpa6wvf3VI69pp/YBolIeEaCGr7KZKmxU+dvz2gmaUkyC7uVQ30EuZlEF9tIKddVu+3TvkPkWY9DosY6O2LUFT2EWFU3moyKEaJCvq+M+cNTqWSALV/WZSmyjv5Rh1OFbmeYBhgJsoAc8FGZfxLhgCU5J1FW7+1umIePQ5c5PnYw8MUV+KRA8CQtgLwcN6U4yDnC4Nk49OozEhVCIsV5IjJI4g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR0701MB3640; BCL:0; PCL:0; RULEID:; SRVR:DM5PR0701MB3640; X-Forefront-PRVS: 0742443479 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(396003)(366004)(39860400002)(136003)(189003)(199004)(6486002)(42882007)(16586007)(478600001)(305945005)(446003)(50226002)(50466002)(5660300001)(11346002)(7736002)(476003)(48376002)(36756003)(44832011)(8676002)(486006)(2616005)(956004)(3846002)(14444005)(68736007)(54906003)(47776003)(72206003)(6116002)(97736004)(316002)(69596002)(107886003)(4326008)(2906002)(81166006)(66066001)(81156014)(2361001)(8936002)(25786009)(6512007)(53416004)(26005)(106356001)(6916009)(105586002)(55236004)(186003)(386003)(52116002)(6506007)(53936002)(6666003)(76176011)(51416003)(2351001)(16526019); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR0701MB3640; H:hyd1sverma-dt.caveonetworks.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR0701MB3640; 23:g8nlFxtdDvx9XPbJ4PuwY6YlijpIZx400mn467J?= e8gV1qiEWZyW9rD67T+OYhSnvP65fSRkNczDeTcI39UHfxAorMqQDUs2yjipkCnnN8pAoZULQZu//N4AG6c1y0gJ6s9s7qlS/1BqdfauHNjzId6cwwqSCDuh66cnGGDqaiyqT8mbZ7FKQb2/+CZ/efEWOgUU7KY2Lc2r5c1D88pv4zGIcrVyTyxyzvuA4waaP7xkgMBphMVsJvLeke9/3KjG1wCKllnVbgJLKZ+fZQMXywiZ8+9VkU9WizCFzotzDAGmsmUEQuFVJggXCNcJS0EGPH9YB7g9Oy3mRmsRP5CurMpEoBNfEAgVv8WwFHuwLZomhHBRMX2DTam072WmpUb/2YF9arL7nNcDudCrjkwr8XPaUoyA+46kyXz4VI+D13INOQ1J6ZZ3GQyF4FrvCq8xXulLeWK7lEEc+fWpaOPwVFkI5r1l4br82hoFfx3oLtyvQ6bkjlp9RiZfgXYmwx5kFIct6sOART2OwiA7fjY5FcdWSU04mTNdUfp1lR84Cr+cuVYg/qb0/ietTPgozrOYgt88qxrI5YCykNLDkd3rWsf+IE/FsFf65vmiL5YAxZRR7fuwGJzlTc3e+jOYh0fnowlTdjo8VPzPyujRz1pqb703iEqVSdER6/K/ylrKhjjggf/Al7cEFByPxtU6r9WZxDXjtm5ot10tVLBmD7+vBTAnDaWLO+Ne5pJkBiXCpOmolBKKs9im8IlzpxptIhKuJotVO/Oxh26TpQElWLt7bMhSX1e4b+LJuNkrZVVCz+IISbXGUC+dAYlS8z2lKN8WGaOKqPSqiO1Eud+XEhloTwvLc7TDuF+aPXEIPBFPemSnNtckJtdInMuucbFF0xnf1wXHulloT7Atc1bssya3/TaFa4++dXt16bzrCEHMupCR4PNgyS286XmF1jblvHQOamWH4S6JoEi4bqFn+5qIhFmUJOSYJBow8a96J9qedbBLMuB74ElNOreWL5wN84XpmTc7Y3WbjUSNnqiocT5G1NQUMHd8q18BumCTDD9FyV0MxDtA4twsAx4I6p9b9TOPpJdsxvL5UOgOOLaLpTBnV2WiwK//SxMLlm8Lsfje1QcHdw8Nz4tjxJDS3RrUzL1vL1p//Dm7igxn0Edv+lT43/z44Nr22FepOpCwXKybpKMVdKDZWCbVuVtckqa9IXEOXdZB2U12rSRi7K/3V5C2Abc95JH+oJUMV61EOzm8HrhJyyzekRNyC6xIcVcUAYAU2QN7ntjhbokoOvXxCU+ZtTD+iNy07dHA5d9UIa5prrMV2Il8qdGPJ+H2oZa/lg8QFFwyTJRGNVJH8kqBhr0P1Dqb/z4FZa6TAzizH2Ju1mJw= X-Microsoft-Antispam-Message-Info: KiPL11ka9UBYrr4wwjkfsSgJNPCmW5s0OEvCf5+CPSup8G5K4QPKBXRiG9oxjcjHFZDTigEPJzrbURmTP7htL9IIRvB0Dj7iZ/+rAu/tn39nva1jjgM/amOUU3inGDvqEPq7Vp/2Enuynhi7ugw1chdHv0oU7Gtte0p6PfB4bxVyQ8YfH/pdI4DS5pzaHZeeZtWRUEhnKniNMX2TjCpOAgQBQsb5tUagRLKlE8LaaLKJJD01XOdhUb6KKpspGtj2OiLAgBlBmUC2b297UClJ1UrhhnDYDSqHoFC3J8FbRVfeq2n4plWcS2PJJue+exvAOxJrv1VEM9sP1NM+kfjH1yg50tJsymTWGpjZ5+pIAa4= X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3640; 6:/7j9OVmu3L1MY4ha8rl98iEHr8dlPd1lgnMLYM6ANy2acjz9I0Fw8k/dq+B/+RXMzVeE7BMSGH3aIYiVgEoX8eawA07zuEFS4F/EwZcbG+zDqp8DGw+Rl3txoNcS/jWg/r61PncEFJ3Kaywjk+ifI5konO7Endidrv3Ft2vR1Spos3cCR+NdzoOPSfBtj8/s/pcZZNLgswMOky7VBbL1sP0juIAi9dgsvFLpyEwhD+GZfNkbC/hLgnu6qYqSFDg5m9JstfqDlcChHHAzoAo7vVdsGjbAKMWb+fcN0W/8VZBZ2SW38AXTGCjrlfQG/5+BOz6awEkmT5QeyP+IdeaHehy8JMBLed/MHjSp1W7DkI3KRqAr9919BSkaYAItH92iM6vk3inZEK92r0PlkgXYsQTcvyY+x2dgLlTEBvyvT6LzNI0grU6aCSGDRYXQikYhBzotBe9PpPGXYHtYVbK8bQ==; 5:tagmxTQ8iWBMiPYdnxPfjjXet2YZxHGN6lGxxAW0kwNQ44DTsGm6Vikl8cZP2LQkrKtmkSb1KbImVX2T62U4UQPCH/ZO53JaYETCjxSZ0ahSIUdwb84ll2EZtMBsayGPlX5wuejqjvcesI0zYzsW6Ohy8djdmkj/FoE8hMO2VNM=; 7:x6Rwsmdj+JC0bfpGOoAx515eRDhafgL8fLsFAbIgp2IyP8sGteCSx/s0R1iHSxLG+kYj0EA3eNsg80Ykj+Sz21k6cEnqRViNyUoygQX/iAoxnMJi54bBekrZMy0KIeT/DgAGUjIGMzlBzAd5zYyMJWYbl/Cz5MoFW84WdAigL/iiGgeWErRmApCh1wXrnA75KenrkDuBxLHErEpEdc9CTwPDsyE/3rbBuAlD8AQKfXCtrzTKKsQdP17kZvmXo01i SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2018 14:46:37.9027 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc258282-c52b-41da-70be-08d5f0ab197c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR0701MB3640 Subject: [dpdk-dev] [PATCH v5 2/3] crypto/openssl: add dh and dsa asym op X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Sunila Sahu - Add dh key generation and shared compute - Add dsa sign and verify operation Signed-off-by: Sunila Sahu Signed-off-by: Shally Verma Signed-off-by: Ashish Gupta --- drivers/crypto/openssl/compat.h | 68 +++++++ drivers/crypto/openssl/rte_openssl_pmd.c | 237 +++++++++++++++++++++++ drivers/crypto/openssl/rte_openssl_pmd_ops.c | 194 ++++++++++++++++++- drivers/crypto/openssl/rte_openssl_pmd_private.h | 9 + 4 files changed, 507 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/openssl/compat.h b/drivers/crypto/openssl/compat.h index 8ece808..45f9a33 100644 --- a/drivers/crypto/openssl/compat.h +++ b/drivers/crypto/openssl/compat.h @@ -23,6 +23,41 @@ rsa->n = n; rsa->e = e; rsa->d = d; ret = 0; \ } while (0) +#define set_dh_params(dh, p, g, ret) \ + do { \ + dh->p = p; \ + dh->q = NULL; \ + dh->g = g; \ + ret = 0; \ + } while (0) + +#define set_dh_priv_key(dh, priv_key, ret) \ + do { dh->priv_key = priv_key; ret = 0; } while (0) + +#define set_dsa_params(dsa, p, q, g, ret) \ + do { dsa->p = p; dsa->q = q; dsa->g = g; ret = 0; } while (0) + +#define get_dh_pub_key(dh, pub_key) \ + (pub_key = dh->pub_key) + +#define get_dh_priv_key(dh, priv_key) \ + (priv_key = dh->priv_key) + +#define set_dsa_sign(sign, r, s) \ + do { sign->r = r; sign->s = s; } while (0) + +#define get_dsa_sign(sign, r, s) \ + do { r = sign->r; s = sign->s; } while (0) + +#define set_dsa_keys(dsa, pub, priv, ret) \ + do { dsa->pub_key = pub; dsa->priv_key = priv; ret = 0; } while (0) + +#define set_dsa_pub_key(dsa, pub_key) \ + (dsa->pub_key = pub_key) + +#define get_dsa_priv_key(dsa, priv_key) \ + (priv_key = dsa->priv_key) + #else #define set_rsa_params(rsa, p, q, ret) \ @@ -35,6 +70,39 @@ #define set_rsa_keys(rsa, n, e, d, ret) \ (ret = !RSA_set0_key(rsa, n, e, d)) +#define set_dh_params(dh, p, g, ret) \ + (ret = !DH_set0_pqg(dh, p, NULL, g)) + +#define set_dh_priv_key(dh, priv_key, ret) \ + (ret = !DH_set0_key(dh, NULL, priv_key)) + +#define get_dh_pub_key(dh, pub_key) \ + (DH_get0_key(dh_key, &pub_key, NULL)) + +#define get_dh_priv_key(dh, priv_key) \ + (DH_get0_key(dh_key, NULL, &priv_key)) + +#define set_dsa_params(dsa, p, q, g, ret) \ + (ret = !DSA_set0_pqg(dsa, p, q, g)) + +#define set_dsa_priv_key(dsa, priv_key) \ + (DSA_set0_key(dsa, NULL, priv_key)) + +#define set_dsa_sign(sign, r, s) \ + (DSA_SIG_set0(sign, r, s)) + +#define get_dsa_sign(sign, r, s) \ + (DSA_SIG_get0(sign, &r, &s)) + +#define set_dsa_keys(dsa, pub, priv, ret) \ + (ret = !DSA_set0_key(dsa, pub, priv)) + +#define set_dsa_pub_key(dsa, pub_key) \ + (DSA_set0_key(dsa, pub_key, NULL)) + +#define get_dsa_priv_key(dsa, priv_key) \ + (DSA_get0_key(dsa, NULL, &priv_key)) + #endif /* version < 10100000 */ #endif /* __RTA_COMPAT_H__ */ diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 9d18e67..dd095a8 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1546,6 +1546,230 @@ process_openssl_auth_op(struct openssl_qp *qp, struct rte_crypto_op *op, op->status = RTE_CRYPTO_OP_STATUS_ERROR; } +/* process dsa sign operation */ +static int +process_openssl_dsa_sign_op(struct rte_crypto_op *cop, + struct openssl_asym_session *sess) +{ + struct rte_crypto_dsa_op_param *op = &cop->asym->dsa; + DSA *dsa = sess->u.s.dsa; + DSA_SIG *sign = NULL; + + sign = DSA_do_sign(op->message.data, + op->message.length, + dsa); + + if (sign == NULL) { + OPENSSL_LOG(ERR, "%s:%d\n", __func__, __LINE__); + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + } else { + const BIGNUM *r = NULL, *s = NULL; + get_dsa_sign(sign, r, s); + + op->r.length = BN_bn2bin(r, op->r.data); + op->s.length = BN_bn2bin(s, op->s.data); + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + } + + DSA_SIG_free(sign); + + return 0; +} + +/* process dsa verify operation */ +static int +process_openssl_dsa_verify_op(struct rte_crypto_op *cop, + struct openssl_asym_session *sess) +{ + struct rte_crypto_dsa_op_param *op = &cop->asym->dsa; + DSA *dsa = sess->u.s.dsa; + int ret; + DSA_SIG *sign = DSA_SIG_new(); + BIGNUM *r = NULL, *s = NULL; + BIGNUM *pub_key = NULL; + + if (sign == NULL) { + OPENSSL_LOG(ERR, " %s:%d\n", __func__, __LINE__); + cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return -1; + } + + r = BN_bin2bn(op->r.data, + op->r.length, + r); + s = BN_bin2bn(op->s.data, + op->s.length, + s); + pub_key = BN_bin2bn(op->y.data, + op->y.length, + pub_key); + if (!r || !s || !pub_key) { + if (r) + BN_free(r); + if (s) + BN_free(s); + if (pub_key) + BN_free(pub_key); + + cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return -1; + } + set_dsa_sign(sign, r, s); + set_dsa_pub_key(dsa, pub_key); + + ret = DSA_do_verify(op->message.data, + op->message.length, + sign, + dsa); + + if (ret != 1) + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + else + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + + DSA_SIG_free(sign); + + return 0; +} + +/* process dh operation */ +static int +process_openssl_dh_op(struct rte_crypto_op *cop, + struct openssl_asym_session *sess) +{ + struct rte_crypto_dh_op_param *op = &cop->asym->dh; + DH *dh_key = sess->u.dh.dh_key; + BIGNUM *priv_key = NULL; + int ret = 0; + + if (sess->u.dh.key_op & + (1 << RTE_CRYPTO_ASYM_OP_SHARED_SECRET_COMPUTE)) { + /* compute shared secret using peer public key + * and current private key + * shared secret = peer_key ^ priv_key mod p + */ + BIGNUM *peer_key = NULL; + + /* copy private key and peer key and compute shared secret */ + peer_key = BN_bin2bn(op->pub_key.data, + op->pub_key.length, + peer_key); + if (peer_key == NULL) { + cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return -1; + } + priv_key = BN_bin2bn(op->priv_key.data, + op->priv_key.length, + priv_key); + if (priv_key == NULL) { + BN_free(peer_key); + cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return -1; + } + set_dh_priv_key(dh_key, priv_key, ret); + if (ret) { + OPENSSL_LOG(ERR, "Failed to set private key\n"); + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + BN_free(peer_key); + BN_free(priv_key); + return 0; + } + + ret = DH_compute_key( + op->shared_secret.data, + peer_key, dh_key); + if (ret < 0) { + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + BN_free(peer_key); + /* priv key is already loaded into dh, + * let's not free that directly here. + * DH_free() will auto free it later. + */ + return 0; + } + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + op->shared_secret.length = ret; + BN_free(peer_key); + return 0; + } + + /* + * other options are public and private key generations. + * + * if user provides private key, + * then first set DH with user provided private key + */ + if ((sess->u.dh.key_op & + (1 << RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE)) && + !(sess->u.dh.key_op & + (1 << RTE_CRYPTO_ASYM_OP_PRIVATE_KEY_GENERATE))) { + /* generate public key using user-provided private key + * pub_key = g ^ priv_key mod p + */ + + /* load private key into DH */ + priv_key = BN_bin2bn(op->priv_key.data, + op->priv_key.length, + priv_key); + if (priv_key == NULL) { + cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return -1; + } + set_dh_priv_key(dh_key, priv_key, ret); + if (ret) { + OPENSSL_LOG(ERR, "Failed to set private key\n"); + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + BN_free(priv_key); + return 0; + } + } + + /* generate public and private key pair. + * + * if private key already set, generates only public key. + * + * if private key is not already set, then set it to random value + * and update internal private key. + */ + if (!DH_generate_key(dh_key)) { + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + return 0; + } + + if (sess->u.dh.key_op & (1 << RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE)) { + const BIGNUM *pub_key = NULL; + + OPENSSL_LOG(DEBUG, "%s:%d update public key\n", + __func__, __LINE__); + + /* get the generated keys */ + get_dh_pub_key(dh_key, pub_key); + + /* output public key */ + op->pub_key.length = BN_bn2bin(pub_key, + op->pub_key.data); + } + + if (sess->u.dh.key_op & + (1 << RTE_CRYPTO_ASYM_OP_PRIVATE_KEY_GENERATE)) { + const BIGNUM *priv_key = NULL; + + OPENSSL_LOG(DEBUG, "%s:%d updated priv key\n", + __func__, __LINE__); + + /* get the generated keys */ + get_dh_priv_key(dh_key, priv_key); + + /* provide generated private key back to user */ + op->priv_key.length = BN_bn2bin(priv_key, + op->priv_key.data); + } + + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + + return 0; +} + /* process modinv operation */ static int process_openssl_modinv_op(struct rte_crypto_op *cop, struct openssl_asym_session *sess) @@ -1718,6 +1942,19 @@ process_asym_op(struct openssl_qp *qp, struct rte_crypto_op *op, case RTE_CRYPTO_ASYM_XFORM_MODINV: retval = process_openssl_modinv_op(op, sess); break; + case RTE_CRYPTO_ASYM_XFORM_DH: + retval = process_openssl_dh_op(op, sess); + break; + case RTE_CRYPTO_ASYM_XFORM_DSA: + if (op->asym->dsa.op_type == RTE_CRYPTO_ASYM_OP_SIGN) + retval = process_openssl_dsa_sign_op(op, sess); + else if (op->asym->dsa.op_type == + RTE_CRYPTO_ASYM_OP_VERIFY) + retval = + process_openssl_dsa_verify_op(op, sess); + else + op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; + break; default: op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; break; diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index bbc203e..de22843 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -527,6 +527,48 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { }, } }, + { /* dh */ + .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC, + {.asym = { + .xform_capa = { + .xform_type = RTE_CRYPTO_ASYM_XFORM_DH, + .op_types = + ((1<next != NULL) { + if ((xform->xform_type != RTE_CRYPTO_ASYM_XFORM_DH) && + (xform->next != NULL)) { OPENSSL_LOG(ERR, "chained xfrms are not supported on %s", rte_crypto_asym_xform_strings[xform->xform_type]); return -1; @@ -940,6 +983,147 @@ static int openssl_set_asym_session_parameters( asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_MODINV; break; } + case RTE_CRYPTO_ASYM_XFORM_DH: + { + BIGNUM *p = NULL; + BIGNUM *g = NULL; + + p = BN_bin2bn((const unsigned char *) + xform->dh.p.data, + xform->dh.p.length, + p); + g = BN_bin2bn((const unsigned char *) + xform->dh.g.data, + xform->dh.g.length, + g); + if (!p || !g) + goto err_dh; + + DH *dh = DH_new(); + if (dh == NULL) { + OPENSSL_LOG(ERR, + "failed to allocate resources\n"); + goto err_dh; + } + set_dh_params(dh, p, g, ret); + if (ret) { + DH_free(dh); + goto err_dh; + } + + /* + * setup xfrom for + * public key generate, or + * DH Priv key generate, or both + * public and private key generate + */ + asym_session->u.dh.key_op = (1 << xform->dh.type); + + if (xform->dh.type == + RTE_CRYPTO_ASYM_OP_PRIVATE_KEY_GENERATE) { + /* check if next is pubkey */ + if ((xform->next != NULL) && + (xform->next->xform_type == + RTE_CRYPTO_ASYM_XFORM_DH) && + (xform->next->dh.type == + RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE) + ) { + /* + * setup op as pub/priv key + * pair generationi + */ + asym_session->u.dh.key_op |= + (1 << + RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE); + } + } + asym_session->u.dh.dh_key = dh; + asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_DH; + break; + +err_dh: + OPENSSL_LOG(ERR, " failed to set dh params\n"); + if (p) + BN_free(p); + if (g) + BN_free(g); + return -1; + } + case RTE_CRYPTO_ASYM_XFORM_DSA: + { + BIGNUM *p = NULL, *g = NULL; + BIGNUM *q = NULL, *priv_key = NULL; + BIGNUM *pub_key = BN_new(); + BN_zero(pub_key); + + p = BN_bin2bn((const unsigned char *) + xform->dsa.p.data, + xform->dsa.p.length, + p); + + g = BN_bin2bn((const unsigned char *) + xform->dsa.g.data, + xform->dsa.g.length, + g); + + q = BN_bin2bn((const unsigned char *) + xform->dsa.q.data, + xform->dsa.q.length, + q); + if (!p || !q || !g) + goto err_dsa; + + priv_key = BN_bin2bn((const unsigned char *) + xform->dsa.x.data, + xform->dsa.x.length, + priv_key); + if (priv_key == NULL) + goto err_dsa; + + DSA *dsa = DSA_new(); + if (dsa == NULL) { + OPENSSL_LOG(ERR, + " failed to allocate resources\n"); + goto err_dsa; + } + + set_dsa_params(dsa, p, q, g, ret); + if (ret) { + DSA_free(dsa); + OPENSSL_LOG(ERR, "Failed to dsa params\n"); + goto err_dsa; + } + + /* + * openssl 1.1.0 mandate that public key can't be + * NULL in very first call. so set a dummy pub key. + * to keep consistency, lets follow same approach for + * both versions + */ + /* just set dummy public for very 1st call */ + set_dsa_keys(dsa, pub_key, priv_key, ret); + if (ret) { + DSA_free(dsa); + OPENSSL_LOG(ERR, "Failed to set keys\n"); + return -1; + } + asym_session->u.s.dsa = dsa; + asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_DSA; + break; + +err_dsa: + if (p) + BN_free(p); + if (q) + BN_free(q); + if (g) + BN_free(g); + if (priv_key) + BN_free(priv_key); + if (pub_key) + BN_free(pub_key); + return -1; + } default: return -1; } @@ -1021,6 +1205,14 @@ static void openssl_reset_asym_session(struct openssl_asym_session *sess) BN_CTX_free(sess->u.m.ctx); } break; + case RTE_CRYPTO_ASYM_XFORM_DH: + if (sess->u.dh.dh_key) + DH_free(sess->u.dh.dh_key); + break; + case RTE_CRYPTO_ASYM_XFORM_DSA: + if (sess->u.s.dsa) + DSA_free(sess->u.s.dsa); + break; default: break; } diff --git a/drivers/crypto/openssl/rte_openssl_pmd_private.h b/drivers/crypto/openssl/rte_openssl_pmd_private.h index 0ebe596..a8f2c84 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_private.h +++ b/drivers/crypto/openssl/rte_openssl_pmd_private.h @@ -9,6 +9,8 @@ #include #include #include +#include +#include #define CRYPTODEV_NAME_OPENSSL_PMD crypto_openssl /**< Open SSL Crypto PMD device name */ @@ -159,6 +161,13 @@ struct openssl_asym_session { BIGNUM *modulus; BN_CTX *ctx; } m; + struct dh { + DH *dh_key; + uint32_t key_op; + } dh; + struct { + DSA *dsa; + } s; } u; } __rte_cache_aligned; /** Set and validate OPENSSL crypto session parameters */