From patchwork Thu Jul 12 14:08:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shally Verma X-Patchwork-Id: 42979 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 5DB611B472; Thu, 12 Jul 2018 16:09:21 +0200 (CEST) Received: from NAM05-DM3-obe.outbound.protection.outlook.com (mail-eopbgr730078.outbound.protection.outlook.com [40.107.73.78]) by dpdk.org (Postfix) with ESMTP id 61AF81B464 for ; Thu, 12 Jul 2018 16:09:18 +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=vbKAJlpUgUIe7jlRZUObpeZX+HilIlxPALkW52Z8G6c=; b=ju4kyypvFT8J4CXjHkGGuBpndWC+8JVfn2FLwXJ8sRseKyRum1CIzj8EIB/J3KQOv6y5SSDHF+/DgorJJ7elsUluLCnP/km0KxN+O3xYRYyjhMyFWd1L8vUkgrHncNR4O4o1AgNWi3zmuejYXwjs6IgZhFZ6Ol8rWzjGmyvmgis= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Shally.Verma@cavium.com; Received: from hyd1sverma-dt.caveonetworks.com (115.113.156.2) by DM5PR0701MB3637.namprd07.prod.outlook.com (2603:10b6:4:7d::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.18; Thu, 12 Jul 2018 14:09:14 +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: Thu, 12 Jul 2018 19:38:44 +0530 Message-Id: <1531404526-17984-2-git-send-email-shally.verma@caviumnetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1531404526-17984-1-git-send-email-shally.verma@caviumnetworks.com> References: <1531404526-17984-1-git-send-email-shally.verma@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [115.113.156.2] X-ClientProxiedBy: MAXPR0101CA0029.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::15) To DM5PR0701MB3637.namprd07.prod.outlook.com (2603:10b6:4:7d::38) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc61757a-4862-45c8-0790-08d5e8010d93 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:DM5PR0701MB3637; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3637; 3:u9jC86K+yWgabP9BNOuzuvBYAyD4jy9Ra3KwhKtjAAEWrgM0ub06SqIl3iIKpcCb1VESybdQvgplz573RsgiH1LUcB1In34R+LMKpVaKPHFdshlgNT+n/BTQZJ8X+OqHWj6fZlzlovAzn6Rebz14js5Kbhw7SBp0b+w3ceu0uKvNrnTPW5syfzUrI+jlyYVtUqEjHH1DtWmEkoBDykkBkdd4BMMkh+j7FLtYErKSU39dMbo0XBRB9fIXQNI0Jg3Z; 25:zySobmT57bIw/XZYJMa8nC8QsmvVWVVAjCcwYGsRAR1mh7FowJhCcsfMFJZA3O9zJNI5q2OsemNYC/p6dm9lmbVTmXlCp0cZLAKJI/36Or58h/OYjbTxiyictWRT+HUBubyVOg/2pVtd9pSLORVdwkHCLFh5/xex+EKzrtuscd1EqPxr9BINOJQfF98a2cF02la2v0CMzcdt4WPK2S2fUeU5ujENcGC3WrKenM5AypRH2hP0w1eOKU81L1Qgx2CjdQ4z6MhK8RtF1E/q9t86dQGtEfOY2pHGbH6hQwRm3O+swP3fI8gQRI8WQGu4EhtPVBbHjw0QkhbXknv9logTQQ==; 31:KqhIb5T3NZQEBRtmNf17nBbmt15pIblP3a7654QVIK3PdMFN46KVx2DKSchyHtccw0Gc/evBepPtfRsTw473FzcoQjYhXBubFrfxm1yWNKBmjICn1EubDJ6acxad2MI010cze/0exUR60CM54vFju5V6NAcz9s88BB5CWzbeIfRxB21VYK8lXLEoMAON7VjXCtIvtP9/v4EcoyKEgelPtvtBkhtqjXCGeyH0B1iEyNo= X-MS-TrafficTypeDiagnostic: DM5PR0701MB3637: X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3637; 20:QR2BvyfuKzCSCN0GJy+G7/dybO2LrkrObXm/gRVQaJVJf/BmojYzbCDq1xknK3em6cj34QPEYFdL3epu7suhhanTS3JVeoyTSiNIbqa7d+LbOq+SrU0p4W9m4OSaOCy4jiqyTAVKpDsV8Nn9PxH8LYdsq+k9fLQ5/Tmt+ZWbDihtP1qCmtOEg9iUX3JkefmnpUOsk01nS41fUXWfSlGz2zg3n5nEyIv8dJzsNqbLUcBH9AgA46NX1yNkpv0CeU7YNjbB2IgE6OgPwAU3bGfrE+ePEI977GVaRHhsujIJwujivi7HVd31GQC5HVWQKIUasCXdtbbPydt1VkX/AidjD+5/HetFQPjRGfLVZ1bvjN3e5A1+R/P+4n3AdvmXMjnu0H6p4K9g4oYmkSGNyLvk5h2FMOSTtE29QNdBfZSpHx4ZG4PU5gN9pHvHt0saSs0r9g2x2MQSr+J0YuhXyZUJlAnKTkQlxfSGWMv26OofoCcN+95+1nAbIY5FYxC7eDVo1Wxo7GvksYMAyBtxhr1cRA3DzojHWmhOXPxWiBQS8GlJ6/MZbJJVfwAM1+amAKvU2jKibKohiuash5x1fBQ/HKOYr/qSaLz4c0IEUmhlAgk=; 4:SkV+xtWLgDJ2PfAOu4PbR3pET3UDRslr5qvEc2H/cSDZMbR60MJrQaMVHoCqhp4LA+jm9OLgWG9gzgKj8drK247B5uzB47Io7zIBsK9QtGlB5psjmkX5/vmzCUmaHnA2ZGn8imV8aPlrOmY9t0wyMBWT7gtn0x6oHLDy85tEdKmGqu2E+f73vmGf6CVgYOsUMIXtKsB8VwCf3ZTIAChNWlfi5UscIJxbQMQi1t2HTRRLjxqbu3AvkRYtDdk7Y3cP77BaOchIGxoh4gBJSeNBMw== 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)(8121501046)(5005006)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:DM5PR0701MB3637; BCL:0; PCL:0; RULEID:; SRVR:DM5PR0701MB3637; X-Forefront-PRVS: 0731AA2DE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(396003)(366004)(39860400002)(376002)(346002)(189003)(199004)(25786009)(6116002)(3846002)(81166006)(2351001)(8936002)(81156014)(8676002)(7736002)(305945005)(53416004)(2906002)(105586002)(106356001)(97736004)(6916009)(6666003)(69596002)(6486002)(36756003)(53936002)(47776003)(6512007)(50226002)(66066001)(4326008)(72206003)(446003)(2616005)(316002)(956004)(54906003)(2361001)(478600001)(14444005)(26005)(107886003)(486006)(16526019)(50466002)(11346002)(76176011)(476003)(44832011)(386003)(52116002)(42882007)(186003)(51416003)(55236004)(6506007)(48376002)(68736007)(5660300001)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR0701MB3637; 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; DM5PR0701MB3637; 23:Wnj/vYbyGKerVd5Ot1iOceMsqiFdcZ6GhDMVRIC?= tuEJEtAU7+J6BhIogmaga5SDFPU+Zbeq6+sxfhUlmOwOA/ubZ3jV/tyiAj/2EOUgOb31ZPW5nkfao2oTVf3tRh2E5D5/74u6e51h6/rDrEovJ2jYibYs4fEQsymKuopHyjWwGU+Ky/1VARGbVgXfedI1k39OggaoE5UaMfngr5cTXc6g67aoYge30ZnxME4WCk3mOwiATNm1VWvUUPxnOlnbRHPHJ4xo9kz2xLkhbxBW4Qa2l/QiGpQwZ4ktqfJ4EkHyfWpPy9faZl7jR+GhhWwYFjYdps7/ujGmFzfumSQeadyOU+KNHKxejGrBIAHVNIHmn3XpegB3rkMeLPog5RUGWTWXQRE8MSBug8LeQiAOhg5GGP+FqnNrKnUr3JWU1iPHa1irbSHcaLz4XyUfeN6uMRtNMwYJi93eEzz9Y48JfMEuq0Kit2TlfEWqJs5nNS9aH+ZwrcWJmH+JQCDP/IfplN3WKf6R/IHDTgsWgocxPfFmLd8kwaXXxGZ53DrKi27EmEhLivJF89tojsmWHzFrw7L6z6Ht8zTmrX+FVyNnalTL4b5OfWYkqLAa9tbfDrOM5comEeQgfGk4tAhX2rPd2QpW++ZX6soIsbBrvSCfWSILQVbxw1uKp9RkkJ7IA2f6X7vNovLNzYgVAHQoFaNcLC8tX4JzDsQ1bz3wfHvyHEg6BJ0rG/S5eqbl39oPEpV1iFew38qB+w8NcP1EW09UyTgaR+9FnbsIAA9AnwP5M6QeMpVCcQDUPZ3hlE8OxuK2sTsm4rc4FzR/jX8Jui23F7sZoKFgMvPh9PAoeYKJjiCj5CE3UKrYbkxHE/n+JvBdy8u1VvlSaW3ddW2xy2pRmWvGT2G6jVEleAjXU+2HSHkyn0Z0YaTHRpHPD2OtiiJ5pjiCA+WfPt9dLueHNtAqlXlsRDxcrIsaRSj+m/DGUdGpHRiqe5y8QKEdRrgKQlG8LpiMvLsxhS56BY5GOgw0Fm9+8Hbtz3HJsSL6DR7hswTwDwNaVtgAPrJ7TMG/vMihPcDPoOkUUeSRc3OFeYhpuvVD7ixP31vM3ElS6kHnScvnUymvpRFDVJ+/xeKdZLRI2824cmXQZotcLctSaNvNvHAMEyIWujTj6nGwao1mXhIi1nn+aWraKhQxFkwHkC2GOBmmEdjeTSb4zxNzIT6fhhcOKh/dSPfHlPBddTrNBFkQF26akso9H6wpRLmY82BD5elTrsHBVVOiuAND21x/VLef7DcDVCOo0jKPXTLefIEV0D0gK2+sMAvZAy7ckND3TYXsXnXXYn4sn4LNhC/qHTw0ajstLL2Jc0D9lF34URRqT2GyEAZ2iazeKvzmkxjY= X-Microsoft-Antispam-Message-Info: V4LvfuIFSjfH33ww+THBziycNa2oGWB4Prywon8tbW3J9giyAzPQJdUqthroNdUX9YQ+P4LzIbmXpEpSr2LIafacHOV+7Ce90n43i6qmZ+V4n/JLYIy8FqXyMXCparYSnM8WhY6mlDPlZ5jqyXcfTNsbIzSShgQzNRe7QVzaN3whZcY+yRMwwqP12lhgPecgZewGFhK4jkBf+110zudXAR/NG3hFzOdZygZdMDNQeBEhmeiQgxereL4GKvFW/1TDRPQQY9QczGp+RYp0wK/BSqxS2LvDpNqfzQwZnRNaWXcM1MpP0uBDPG/6Us/c2rsfY3RofsHWjnxFZxKC8dN3464FRVudAnj4IFMaujKwvdA= X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3637; 6:+pg8B2Qi6/7O6ooNGaD7q8AB2ZT4HVan9jaQMK1+DsxWMbmHybMh4iKTqnN2xNYn39VOOEIf/GiBfjojUDlJOhsA6PS4DZ8x5Z6aj0RlXizyf+eA/XtV4gzQ+tEwXfvdCwAtnkqXyUZLXaA2P+HdjGeTrqv9NJpZVW7zBkmJk3EQGtqWG6GwqKi5aYK8TY/+NmzkfFzCq5AIDrtEHKAI/fmda3KvgDnLSoDBlR4WaUZBjf4hugKFIZEpY+XZ2tAusjEY5nlEBOQZOS6EimEjXmGKGY8HW6QWBCCxUgPoN0cyniwpUQpyGkfmCAETaFRFnJ3KZLbae9/ZnKZKiPGbEQ/jla/4Jb0Qzy4fu+O0dCmLgFylxvnFcZl23DoBywAOtpOm3ytzFfBQIQOT66IAngsHG3D/KVEofW1hmS9j6GebcDZPlgsC79+B5jjw6aGGIKtwPG4w60gjY5MhjeZXVg==; 5:lQQqlj6aorX8NLl44hFvSEJ5cMMRwmb+n+ybmjPDpJuTL9kKW2iIJ7VArSAYL7gEXKHeUEfrG80jF0nwqQMQCPHSjFf20+txZrmCoZYV6o4l0XxdallN1+mndZJeNK/XKFsjpCXP0Ox7Z/wsOd0Df3HQyMM+wHzbm9qNUcDVobU=; 24:zkFXOtDwQL7f40YbTjWy7NItNQGW97ydd5l45cfG+i1ytLDsxsZkVj+gNM9fASMjWd4BJkKTv7kfn/tTx1ZXyObZY4ssYhZCdBlic4H7/Co= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3637; 7:qPSqXIFFJcilgU0t2+MFCvCspJY8f7NuADcrMZDOvoB5wxouLNreH2CcJMqxVTwk5OSRsmrG9qLGlfXDLZxqHfzbogKPkgRzrTvrSZaRsA7oh6b42xTl2IsKdhfYmc/A5qnXzTb8MoeHyiWyHX1iyMKUcFW4ulxS26C+SBa1uckhwGyNgEyAwArcOTzYeG3vCmQpQvSLYN1dlfW/SK6N5L6kazPpBDVBNC5IMvkAMvjt/cH7ZrVmqs1L6Y+fYhga X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2018 14:09:14.1425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc61757a-4862-45c8-0790-08d5e8010d93 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR0701MB3637 Subject: [dpdk-dev] [PATCH v4 1/3] crypto/openssl: add rsa and mod 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 compat.h to make pmd compatible to openssl-1.1.0 and backward version - Add rsa sign/verify/encrypt/decrypt and modular operation support Signed-off-by: Sunila Sahu Signed-off-by: Shally Verma Signed-off-by: Ashish Gupta --- drivers/crypto/openssl/compat.h | 40 +++ drivers/crypto/openssl/rte_openssl_pmd.c | 229 ++++++++++++++- drivers/crypto/openssl/rte_openssl_pmd_ops.c | 336 ++++++++++++++++++++++- drivers/crypto/openssl/rte_openssl_pmd_private.h | 19 ++ 4 files changed, 612 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/openssl/compat.h b/drivers/crypto/openssl/compat.h new file mode 100644 index 0000000..8ece808 --- /dev/null +++ b/drivers/crypto/openssl/compat.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Cavium Networks + */ + +#ifndef __RTA_COMPAT_H__ +#define __RTA_COMPAT_H__ + +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + +#define set_rsa_params(rsa, p, q, ret) \ + do {rsa->p = p; rsa->q = q; ret = 0; } while (0) + +#define set_rsa_crt_params(rsa, dmp1, dmq1, iqmp, ret) \ + do { \ + rsa->dmp1 = dmp1; \ + rsa->dmq1 = dmq1; \ + rsa->iqmp = iqmp; \ + ret = 0; \ + } while (0) + +#define set_rsa_keys(rsa, n, e, d, ret) \ + do { \ + rsa->n = n; rsa->e = e; rsa->d = d; ret = 0; \ + } while (0) + +#else + +#define set_rsa_params(rsa, p, q, ret) \ + (ret = !RSA_set0_factors(rsa, p, q)) + +#define set_rsa_crt_params(rsa, dmp1, dmq1, iqmp, ret) \ + (ret = !RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp)) + +/* n, e must be non-null, d can be NULL */ +#define set_rsa_keys(rsa, n, e, d, ret) \ + (ret = !RSA_set0_key(rsa, n, e, d)) + +#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 5228b92..e21a6a1 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -14,6 +14,7 @@ #include #include "rte_openssl_pmd_private.h" +#include "compat.h" #define DES_BLOCK_SIZE 8 @@ -727,19 +728,36 @@ openssl_reset_session(struct openssl_session *sess) } /** Provide session for operation */ -static struct openssl_session * +static void * get_session(struct openssl_qp *qp, struct rte_crypto_op *op) { struct openssl_session *sess = NULL; + struct openssl_asym_session *asym_sess = NULL; if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { - /* get existing session */ - if (likely(op->sym->session != NULL)) - sess = (struct openssl_session *) - get_sym_session_private_data( - op->sym->session, - cryptodev_driver_id); + if (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) { + /* get existing session */ + if (likely(op->sym->session != NULL)) + sess = (struct openssl_session *) + get_sym_session_private_data( + op->sym->session, + cryptodev_driver_id); + } else { + if (likely(op->asym->session != NULL)) + asym_sess = (struct openssl_asym_session *) + get_asym_session_private_data( + op->asym->session, + cryptodev_driver_id); + if (asym_sess == NULL) + op->status = + RTE_CRYPTO_OP_STATUS_INVALID_SESSION; + return asym_sess; + } } else { + /* sessionless asymmetric not supported */ + if (op->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) + return NULL; + /* provide internal session */ void *_sess = NULL; void *_sess_private_data = NULL; @@ -1525,6 +1543,191 @@ process_openssl_auth_op(struct openssl_qp *qp, struct rte_crypto_op *op, op->status = RTE_CRYPTO_OP_STATUS_ERROR; } +/* process modinv operation */ +static int process_openssl_modinv_op(struct rte_crypto_op *cop, + struct openssl_asym_session *sess) +{ + struct rte_crypto_asym_op *op = cop->asym; + BIGNUM *base = BN_CTX_get(sess->u.m.ctx); + BIGNUM *res = BN_CTX_get(sess->u.m.ctx); + + if (unlikely(base == NULL || res == NULL)) { + if (base) + BN_free(base); + if (res) + BN_free(res); + cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return -1; + } + + base = BN_bin2bn((const unsigned char *)op->modinv.base.data, + op->modinv.base.length, base); + + if (BN_mod_inverse(res, base, sess->u.m.modulus, sess->u.m.ctx)) { + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + op->modinv.base.length = BN_bn2bin(res, op->modinv.base.data); + } else { + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + } + + return 0; +} + +/* process modexp operation */ +static int process_openssl_modexp_op(struct rte_crypto_op *cop, + struct openssl_asym_session *sess) +{ + struct rte_crypto_asym_op *op = cop->asym; + BIGNUM *base = BN_CTX_get(sess->u.e.ctx); + BIGNUM *res = BN_CTX_get(sess->u.e.ctx); + + if (unlikely(base == NULL || res == NULL)) { + if (base) + BN_free(base); + if (res) + BN_free(res); + cop->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return -1; + } + + base = BN_bin2bn((const unsigned char *)op->modinv.base.data, + op->modinv.base.length, base); + + if (BN_mod_exp(res, base, sess->u.e.exp, + sess->u.e.mod, sess->u.e.ctx)) { + op->modinv.base.length = BN_bn2bin(res, op->modinv.base.data); + cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; + } else { + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + } + + return 0; +} + +/* process rsa operations */ +static int process_openssl_rsa_op(struct rte_crypto_op *cop, + struct openssl_asym_session *sess) +{ + int ret = 0; + struct rte_crypto_asym_op *op = cop->asym; + RSA *rsa = sess->u.r.rsa; + uint32_t pad = (op->rsa.pad); + + switch (pad) { + case RTE_CRYPTO_RSA_PKCS1_V1_5_BT0: + case RTE_CRYPTO_RSA_PKCS1_V1_5_BT1: + case RTE_CRYPTO_RSA_PKCS1_V1_5_BT2: + pad = RSA_PKCS1_PADDING; + break; + case RTE_CRYPTO_RSA_PADDING_NONE: + pad = RSA_NO_PADDING; + break; + default: + cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; + OPENSSL_LOG(ERR, + "rsa pad type not supported %d\n", pad); + return 0; + } + + switch (op->rsa.op_type) { + case RTE_CRYPTO_ASYM_OP_ENCRYPT: + ret = RSA_public_encrypt(op->rsa.message.length, + op->rsa.message.data, + op->rsa.message.data, + rsa, + pad); + + if (ret > 0) + op->rsa.message.length = ret; + OPENSSL_LOG(DEBUG, + "length of encrypted text %d\n", ret); + break; + + case RTE_CRYPTO_ASYM_OP_DECRYPT: + ret = RSA_private_decrypt(op->rsa.message.length, + op->rsa.message.data, + op->rsa.message.data, + rsa, + pad); + if (ret > 0) + op->rsa.message.length = ret; + break; + + case RTE_CRYPTO_ASYM_OP_SIGN: + ret = RSA_private_encrypt(op->rsa.message.length, + op->rsa.message.data, + op->rsa.sign.data, + rsa, + pad); + if (ret > 0) + op->rsa.sign.length = ret; + break; + + case RTE_CRYPTO_ASYM_OP_VERIFY: + ret = RSA_public_decrypt(op->rsa.sign.length, + op->rsa.sign.data, + op->rsa.sign.data, + rsa, + pad); + + OPENSSL_LOG(DEBUG, + "Length of public_decrypt %d " + "length of message %zd\n", + ret, op->rsa.message.length); + + if (memcmp(op->rsa.sign.data, op->rsa.message.data, + op->rsa.message.length)) { + OPENSSL_LOG(ERR, + "RSA sign Verification failed"); + return -1; + } + default: + /* allow ops with invalid args to be pushed to + * completion queue + */ + cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; + break; + } + + if (ret < 0) + cop->status = RTE_CRYPTO_OP_STATUS_ERROR; + + return 0; +} + +static int +process_asym_op(struct openssl_qp *qp, struct rte_crypto_op *op, + struct openssl_asym_session *sess) +{ + int retval = 0; + + op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + + switch (sess->xfrm_type) { + case RTE_CRYPTO_ASYM_XFORM_RSA: + retval = process_openssl_rsa_op(op, sess); + break; + case RTE_CRYPTO_ASYM_XFORM_MODEX: + retval = process_openssl_modexp_op(op, sess); + break; + case RTE_CRYPTO_ASYM_XFORM_MODINV: + retval = process_openssl_modinv_op(op, sess); + break; + default: + op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS; + break; + } + if (!retval) { + /* op processed so push to completion queue as processed */ + retval = rte_ring_enqueue(qp->processed_ops, (void *)op); + if (retval) + /* return error if failed to put in completion queue */ + retval = -1; + } + + return retval; +} + /** Process crypto operation for mbuf */ static int process_op(struct openssl_qp *qp, struct rte_crypto_op *op, @@ -1597,7 +1800,7 @@ static uint16_t openssl_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, uint16_t nb_ops) { - struct openssl_session *sess; + void *sess; struct openssl_qp *qp = queue_pair; int i, retval; @@ -1606,7 +1809,12 @@ openssl_pmd_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, if (unlikely(sess == NULL)) goto enqueue_err; - retval = process_op(qp, ops[i], sess); + if (ops[i]->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) + retval = process_op(qp, ops[i], + (struct openssl_session *) sess); + else + retval = process_asym_op(qp, ops[i], + (struct openssl_asym_session *) sess); if (unlikely(retval < 0)) goto enqueue_err; } @@ -1661,7 +1869,8 @@ cryptodev_openssl_create(const char *name, RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | RTE_CRYPTODEV_FF_CPU_AESNI | RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT | - RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT; + RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | + RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO; /* Set vector instructions mode supported */ internals = dev->data->dev_private; diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index 5335685..a23a9e2 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -9,6 +9,7 @@ #include #include "rte_openssl_pmd_private.h" +#include "compat.h" static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { @@ -469,6 +470,63 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = { }, } }, } }, + { /* RSA */ + .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC, + {.asym = { + .xform_capa = { + .xform_type = RTE_CRYPTO_ASYM_XFORM_RSA, + .op_types = ((1 << RTE_CRYPTO_ASYM_OP_SIGN) | + (1 << RTE_CRYPTO_ASYM_OP_VERIFY) | + (1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) | + (1 << RTE_CRYPTO_ASYM_OP_DECRYPT)), + { + .modlen = { + /* min length is based on openssl rsa keygen */ + .min = 30, + /* value 0 symbolizes no limit on max length */ + .max = 0, + .increment = 1 + }, } + } + }, + } + }, + { /* modexp */ + .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC, + {.asym = { + .xform_capa = { + .xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX, + .op_types = 0, + { + .modlen = { + /* value 0 symbolizes no limit on min length */ + .min = 0, + /* value 0 symbolizes no limit on max length */ + .max = 0, + .increment = 1 + }, } + } + }, + } + }, + { /* modinv */ + .op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC, + {.asym = { + .xform_capa = { + .xform_type = RTE_CRYPTO_ASYM_XFORM_MODINV, + .op_types = 0, + { + .modlen = { + /* value 0 symbolizes no limit on min length */ + .min = 0, + /* value 0 symbolizes no limit on max length */ + .max = 0, + .increment = 1 + }, } + } + }, + } + }, RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() }; @@ -655,13 +713,20 @@ openssl_pmd_qp_count(struct rte_cryptodev *dev) return dev->data->nb_queue_pairs; } -/** Returns the size of the session structure */ +/** Returns the size of the symmetric session structure */ static unsigned openssl_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused) { return sizeof(struct openssl_session); } +/** Returns the size of the asymmetric session structure */ +static unsigned +openssl_pmd_asym_session_get_size(struct rte_cryptodev *dev __rte_unused) +{ + return sizeof(struct openssl_asym_session); +} + /** Configure the session from a crypto xform chain */ static int openssl_pmd_sym_session_configure(struct rte_cryptodev *dev __rte_unused, @@ -698,6 +763,226 @@ openssl_pmd_sym_session_configure(struct rte_cryptodev *dev __rte_unused, return 0; } +static int openssl_set_asym_session_parameters( + struct openssl_asym_session *asym_session, + struct rte_crypto_asym_xform *xform) +{ + int ret = 0; + + if (xform->next != NULL) { + OPENSSL_LOG(ERR, "chained xfrms are not supported on %s", + rte_crypto_asym_xform_strings[xform->xform_type]); + return -1; + } + + switch (xform->xform_type) { + case RTE_CRYPTO_ASYM_XFORM_RSA: + { + BIGNUM *n = NULL; + BIGNUM *e = NULL; + BIGNUM *d = NULL; + BIGNUM *p = NULL, *q = NULL, *dmp1 = NULL; + BIGNUM *iqmp = NULL, *dmq1 = NULL; + + /* copy xfrm data into rsa struct */ + n = BN_bin2bn((const unsigned char *)xform->rsa.n.data, + xform->rsa.n.length, n); + e = BN_bin2bn((const unsigned char *)xform->rsa.e.data, + xform->rsa.e.length, e); + + if (!n || !e) + goto err_rsa; + + RSA *rsa = RSA_new(); + if (rsa == NULL) + goto err_rsa; + + if (xform->rsa.key_type == RTE_RSA_KEY_TYPE_EXP) { + d = BN_bin2bn( + (const unsigned char *)xform->rsa.d.data, + xform->rsa.d.length, + d); + if (!d) { + RSA_free(rsa); + goto err_rsa; + } + } else { + p = BN_bin2bn((const unsigned char *) + xform->rsa.qt.p.data, + xform->rsa.qt.p.length, + p); + q = BN_bin2bn((const unsigned char *) + xform->rsa.qt.q.data, + xform->rsa.qt.q.length, + q); + dmp1 = BN_bin2bn((const unsigned char *) + xform->rsa.qt.dP.data, + xform->rsa.qt.dP.length, + dmp1); + dmq1 = BN_bin2bn((const unsigned char *) + xform->rsa.qt.dQ.data, + xform->rsa.qt.dQ.length, + dmq1); + iqmp = BN_bin2bn((const unsigned char *) + xform->rsa.qt.qInv.data, + xform->rsa.qt.qInv.length, + iqmp); + + if (!p || !q || !dmp1 || !dmq1 || !iqmp) { + RSA_free(rsa); + goto err_rsa; + } + set_rsa_params(rsa, p, q, ret); + if (ret) { + OPENSSL_LOG(ERR, + "failed to set rsa params\n"); + RSA_free(rsa); + goto err_rsa; + } + set_rsa_crt_params(rsa, dmp1, dmq1, iqmp, ret); + if (ret) { + OPENSSL_LOG(ERR, + "failed to set crt params\n"); + RSA_free(rsa); + /* + * set already populated params to NULL + * as its freed by call to RSA_free + */ + p = q = NULL; + goto err_rsa; + } + } + + set_rsa_keys(rsa, n, e, d, ret); + if (ret) { + OPENSSL_LOG(ERR, "Failed to load rsa keys\n"); + RSA_free(rsa); + return -1; + } + asym_session->u.r.rsa = rsa; + asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_RSA; + break; +err_rsa: + if (n) + BN_free(n); + if (e) + BN_free(e); + if (d) + BN_free(d); + if (p) + BN_free(p); + if (q) + BN_free(q); + if (dmp1) + BN_free(dmp1); + if (dmq1) + BN_free(dmq1); + if (iqmp) + BN_free(iqmp); + + return -1; + } + case RTE_CRYPTO_ASYM_XFORM_MODEX: + { + struct rte_crypto_modex_xform *xfrm = &(xform->modex); + + BN_CTX *ctx = BN_CTX_new(); + if (ctx == NULL) { + OPENSSL_LOG(ERR, + " failed to allocate resources\n"); + return -1; + } + BN_CTX_start(ctx); + BIGNUM *mod = BN_CTX_get(ctx); + BIGNUM *exp = BN_CTX_get(ctx); + if (mod == NULL || exp == NULL) { + BN_CTX_end(ctx); + BN_CTX_free(ctx); + return -1; + } + + mod = BN_bin2bn((const unsigned char *) + xfrm->modulus.data, + xfrm->modulus.length, mod); + exp = BN_bin2bn((const unsigned char *) + xfrm->exponent.data, + xfrm->exponent.length, exp); + asym_session->u.e.ctx = ctx; + asym_session->u.e.mod = mod; + asym_session->u.e.exp = exp; + asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_MODEX; + break; + } + case RTE_CRYPTO_ASYM_XFORM_MODINV: + { + struct rte_crypto_modinv_xform *xfrm = &(xform->modinv); + + BN_CTX *ctx = BN_CTX_new(); + if (ctx == NULL) { + OPENSSL_LOG(ERR, + " failed to allocate resources\n"); + return -1; + } + BN_CTX_start(ctx); + BIGNUM *mod = BN_CTX_get(ctx); + if (mod == NULL) { + BN_CTX_end(ctx); + BN_CTX_free(ctx); + return -1; + } + + mod = BN_bin2bn((const unsigned char *) + xfrm->modulus.data, + xfrm->modulus.length, + mod); + asym_session->u.m.ctx = ctx; + asym_session->u.m.modulus = mod; + asym_session->xfrm_type = RTE_CRYPTO_ASYM_XFORM_MODINV; + break; + } + default: + return -1; + } + + return 0; +} + +/** Configure the session from a crypto xform chain */ +static int +openssl_pmd_asym_session_configure(struct rte_cryptodev *dev __rte_unused, + struct rte_crypto_asym_xform *xform, + struct rte_cryptodev_asym_session *sess, + struct rte_mempool *mempool) +{ + void *asym_sess_private_data; + int ret; + + if (unlikely(sess == NULL)) { + OPENSSL_LOG(ERR, "invalid asymmetric session struct"); + return -EINVAL; + } + + if (rte_mempool_get(mempool, &asym_sess_private_data)) { + CDEV_LOG_ERR( + "Couldn't get object from session mempool"); + return -ENOMEM; + } + + ret = openssl_set_asym_session_parameters(asym_sess_private_data, + xform); + if (ret != 0) { + OPENSSL_LOG(ERR, "failed configure session parameters"); + + /* Return session to mempool */ + rte_mempool_put(mempool, asym_sess_private_data); + return ret; + } + + set_asym_session_private_data(sess, dev->driver_id, + asym_sess_private_data); + + return 0; +} /** Clear the memory of session so it doesn't leave key material behind */ static void @@ -717,6 +1002,50 @@ openssl_pmd_sym_session_clear(struct rte_cryptodev *dev, } } +static void openssl_reset_asym_session(struct openssl_asym_session *sess) +{ + switch (sess->xfrm_type) { + case RTE_CRYPTO_ASYM_XFORM_RSA: + if (sess->u.r.rsa) + RSA_free(sess->u.r.rsa); + break; + case RTE_CRYPTO_ASYM_XFORM_MODEX: + if (sess->u.e.ctx) { + BN_CTX_end(sess->u.e.ctx); + BN_CTX_free(sess->u.e.ctx); + } + break; + case RTE_CRYPTO_ASYM_XFORM_MODINV: + if (sess->u.m.ctx) { + BN_CTX_end(sess->u.m.ctx); + BN_CTX_free(sess->u.m.ctx); + } + break; + default: + break; + } +} + +/** Clear the memory of asymmetric session + * so it doesn't leave key material behind + */ +static void +openssl_pmd_asym_session_clear(struct rte_cryptodev *dev, + struct rte_cryptodev_asym_session *sess) +{ + uint8_t index = dev->driver_id; + void *sess_priv = get_asym_session_private_data(sess, index); + + /* Zero out the whole structure */ + if (sess_priv) { + openssl_reset_asym_session(sess_priv); + memset(sess_priv, 0, sizeof(struct openssl_asym_session)); + struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv); + set_asym_session_private_data(sess, index, NULL); + rte_mempool_put(sess_mp, sess_priv); + } +} + struct rte_cryptodev_ops openssl_pmd_ops = { .dev_configure = openssl_pmd_config, .dev_start = openssl_pmd_start, @@ -733,8 +1062,11 @@ struct rte_cryptodev_ops openssl_pmd_ops = { .queue_pair_count = openssl_pmd_qp_count, .sym_session_get_size = openssl_pmd_sym_session_get_size, + .asym_session_get_size = openssl_pmd_asym_session_get_size, .sym_session_configure = openssl_pmd_sym_session_configure, - .sym_session_clear = openssl_pmd_sym_session_clear + .asym_session_configure = openssl_pmd_asym_session_configure, + .sym_session_clear = openssl_pmd_sym_session_clear, + .asym_session_clear = openssl_pmd_asym_session_clear }; struct rte_cryptodev_ops *rte_openssl_pmd_ops = &openssl_pmd_ops; diff --git a/drivers/crypto/openssl/rte_openssl_pmd_private.h b/drivers/crypto/openssl/rte_openssl_pmd_private.h index 29fcb76..0ebe596 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_private.h +++ b/drivers/crypto/openssl/rte_openssl_pmd_private.h @@ -8,6 +8,7 @@ #include #include #include +#include #define CRYPTODEV_NAME_OPENSSL_PMD crypto_openssl /**< Open SSL Crypto PMD device name */ @@ -142,6 +143,24 @@ struct openssl_session { } __rte_cache_aligned; +/** OPENSSL crypto private asymmetric session structure */ +struct openssl_asym_session { + enum rte_crypto_asym_xform_type xfrm_type; + union { + struct rsa { + RSA *rsa; + } r; + struct exp { + BIGNUM *exp; + BIGNUM *mod; + BN_CTX *ctx; + } e; + struct mod { + BIGNUM *modulus; + BN_CTX *ctx; + } m; + } u; +} __rte_cache_aligned; /** Set and validate OPENSSL crypto session parameters */ extern int openssl_set_session_parameters(struct openssl_session *sess,