From patchwork Thu Jul 12 14:08:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shally Verma X-Patchwork-Id: 42980 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 17CA81B476; Thu, 12 Jul 2018 16:09:23 +0200 (CEST) Received: from NAM05-DM3-obe.outbound.protection.outlook.com (mail-eopbgr730080.outbound.protection.outlook.com [40.107.73.80]) by dpdk.org (Postfix) with ESMTP id 60DBF1B473 for ; Thu, 12 Jul 2018 16:09:21 +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=Bl1Soe1GhvTYs1ugf4zJ2eTAmNWd5PzFg4+RJfFZ/pg=; b=eDPN/Wa11Y6v4EFH4YIlO0CX7ZnmdoHKM/0DqS6YwRyKo928B2kftqB6Sv/5Q7Qs4cSR3xDnRVJlRXH7wE5ypU8OgiO5+gsFB2Wa/Oj+W05ToCw/UWnwtglMRXtoYiWToMclurmF7LQXyowzuczCrHeqo6cZSSnGWmLf6fsgUpI= 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:17 +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:45 +0530 Message-Id: <1531404526-17984-3-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: 94c11a21-e489-4f5a-1bc7-08d5e8010f4c 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:QgKyArRyvpgQ8OFKHxwoc2DMBBZLZX9PILZXhVcPXdRBHtsydaXPf0+s8Y4VVOw5fnVp0f6VXSuVnMpphi66rOvAgPVT7eM61DBZKybG9TuKVTlNUB07Nl+IthwkxRNiYe5SCcTGxzKp2dy1xXqRbJaNDeyFJrPfGB0mKyy0w5opB5Ygch2b1i8GFjJ++mkniXeFfV4nmxyTuIf78WOgTlyNmfRcdDfqLmDDY3M0CkPPDpWpb62a6vBgMGSpRIHY; 25:aazSJmE0WUa7tO4ozmmFhDB3pIBPyYAxa8Rw4M6DtO8mbD6llRvCCur+Xx3yn+mWkzAK/dxa8GfN80l7c5ruWbCuhqLrPUY3gct16P9zl+QbhnfdGwQisruFjRaxsWXpDB1KZm0jLn6T2y7LgZunxSxaYtiyHANsyAZ4HzgBgV8Y6HIcIAFzpTfuZ8Eoms9+Aa4g1JZyxnioTf7BUt3O6h38vvohaYdV5jgXCom/477twhmkFAr+dfASuTyQm0yVWIStB+4v7tEJvxC2xOBfPJym90c7DSeNhYeUWMqc8i7RpTMzMZBcX8v4Nb8SHDw/1j0O+DZpjq5GBf6iXo4aug==; 31:bCug3qlX1aKhovfPFrB3TMlHLlJIY7JK1guNhT+oUw6yC1lbJsAvQ5oCjBU4uV+6nAA7vM80ndHKqPjk8eCw8fbn7vDGoKOsEjaQd9aJ5Jms8i7pcYXWjfsQKamCur5KbDiHppR8uHtMEsf3T1x3SpwDF7SCQaDqcmQybvcN4C0DZ4zhGEkSe1UeBKzcAir+p905fKB9rKZJgnuiZYkX5r9kscy5AsxeUsprkmWFv8k= X-MS-TrafficTypeDiagnostic: DM5PR0701MB3637: X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3637; 20:3s/MQpcg6I6lbJAasrpABA8XgCnS1TWj6A1dy9bDeb5u6iv0NFk/PCOO0QxvfXAYooM/jSBe7I8xZegoMUxsucM8AaGF3sYnoE6ow1U8Pmshk7ysL/6gMg7Jdikz6WguQgTaRWM6+k4AQHWI321ozIVFdbwwrBt0D1YltJ3TopB8AnEYczoJnhoPxRPbT0bMrNNkQdegKbhGVok2NcE57gRrnQoBBfuIzEXRr+Pky+xK2wWn/rSv8f+8v0SMdyUrl8DAmRNCz8njTghGW9HyKuQQQIgOqQzku1WF4tl1Pl5YvSsRaS9Ii2ENuq4nilUg5SXWilDcWwyyH6JhInYq9tWWGWHEVVkmLaXbGrJjwVE7UsNCyxA8mZTC1YU0K2TPUBhwkJH326dK5747rXYAEUi+oR5DnO1FAEOmw+BSZzGFnOY1PCRBboaHEH+xW+TlC6I42fuwgGbIMMPMMlA00wqCeK9qLTSUhyhV+B31LpwskrYYPrvHa5xrOAH3ilEt9i18FeiAOUYhZmXGmL/Hf/ljZv8W62FMzfglXwVecUeWICe2DU7XnxwmwTVWEQl9d5dr51yORk79HtJLm8IL1OfgzNjFjCqdgBRxHpp+Db4=; 4:hJ+qQ1X7rYYGdeki5vlTeEEUEM8SWpzJMaWlyuYEs0xq6SOjNlChoPIM49h9RhY4h3iNNV3UXUc9iKg5YfYOk0IDKDib6vvlErIdFg6fU2/Do2EqleSJuudY4Q2jjCFim6CJsD1wwfDPUmjQB6n4aOzegF3By7sL0q+rGVOouhdDdRk6gifn1sJeQLVSoS2ryHYAbcJ8zo07hcHM+ZdxtfllwqJZDCqkSTngwNPFyx8DK45tWmEJgOI50TR3tkUU037pFuv6x5yJPmexXsBxew== 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:MvXiSF4GEwngC5VEM8bHf2fkDNsEi5iZnd/5n+5?= FDakR629XhY9qPRWrye/hvkihDoHMgUeBZ22tDg/6igAjvEaLjMrLNEHBCnZtJgl2ENwSdspUe5RkUThUHPWi69L+Kv+QWpnWc1OfI2z2hReE6L9i0NZWswnYTFEcx8JH5DwdDQTcE7StRookmHF2N7OzLVxEYgHpWcFi/EpCSFr94FVLOOMnFwNihD/ZT8dKD6hklszGRKeWhaD0rIbopK0Apdo6c4j/fmQtDVyrtKXZlBb4dv+wTLuBOCcHBOdPMzkm5ynJchRC9AppJ4wdWjL52/x9o6sq7jDdEUnz9YWNinRIiLysdy11DtrT8cC0g9fPLGyMsu1Gpm6oqFLSIRcqT+KewKCJU2g8vr4UFqI8tqOJ2B1rN+THgVPbiuaNguYTug0j64KCU52F/NqJ61ZB35M0RoKWbOeaWD6vdxFURzBvtUCPveZW+zBKy5P16pat8X/3ZeAyGh136JSZdsoPokuRn6m+egDU0zeg8JsA90+bWMu8DjGe+G4wEZnu0jED58L6UFuLU5+fZD9GP9Uxs6JzNZPo6cfa/XYhybK6/dGb0xrpZkx7HAzeFwNj9rDywhMJh6db4OuWZYqIMH4auK3+x6bBuVgWjReXqcCbyo/O2FQw1a7/DkkY4Fa5iIXL2Pk6LFgjSxxpao1+5xefzGsKMSj1YcO8FPon6aw8wHq+q8jLkA8LdCXUtSB+pbH18z0+jQrXVYFfip/LFOwFJmyq9pfobBHz+wQjd8t6NmUxmIkepJl862COEEsYSU8HSKDo6V1sYnu3IOyNZq8QsKIPzMwv1DOWYy6ypweFRuRXz2rLGF5C6CgY6Al0yWsHOOlr3AGZgcRVjcQLsP/Z9Znfsa+DPgTrZ29IKR2O+aqSBUOsSO6O9f/rZcEWnIQPXri5Zjec0TZbCWkx8E5TuWUfYGfEXfd7CftKgyNSgV4hwLltMM5xvB0YQBV2XUFMhN8zqaB8b+uQi5DjHnFNq0TKMOw4RwC2w96NwVNVjA2LmSKb2ebleWIHWFEnIZiu0A4lsm++LEk2TGSQBrLHcrzSypYfr5m7ukjYt+/OdJDOAL+lQHJhJyHeadmZgvQHr6EkPvIvrlnF5oWZvzM1CP0UxfpH3BNcEOQ7LQ+VNIoeCEUlPQ7pC4XBWCVdzRko4c/20LVHzFxezFUh5qrczkbf1+QThkrY2/n1ALPVe/Ize+v7FEvdjjqSpoobyTxskUH+28ARsR6FFyrXSbh3jMEQwQWHlSU63ewqNNTzwPXvOmQbkmR3SDQLGindEK2YsXfhRWvcWBcTaHXpA5VK4gJ0Trd5cHgKL+2X3PJp6KoYO2Hjflh402RbjRfyz1M= X-Microsoft-Antispam-Message-Info: ePpbm/8XBd8eDL6nYKOqjaXTHeKqDAaJeYVc+BJpfe8qyf78hKRGadC0nqgyakY3ETv6QZ5aOCsKYM8uw3MvkBsMqENkJi8t0k6UlMAkR+cXzlwy5rRIWobQC/fgIsHzR0EO28ZNSBXib0jtQM1meZlB/PnAP4Pkl18vTdAvXMP+esnx9Nxh+dvgdlnUwh6Tsu7Qy/bOyVFKCPt99iVcnW3Z680A6zmmwMs48gKem9gIYTLuMEPfX5cSI5wsb3yC5zdrC1o47v9lolyhDdJy1l3BBAJxE1g4r5H0RM60+lwzUjeO+gQoW1mJ0+NlBn5BVNkBCySsxCg9N+raSPrJNfkKexB6O+kA09qGJvoBYqs= X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3637; 6:Lwr8PqRLye3iOIsNw+s5/fsJrsJF0xwyfeCpYq9lvsgEcNm96QLO4THh1HibxZDEZFbSPKfIlklIqHc4SlBZOpkwV4mMtemgCJ88mHDcLoEXp/14HOpibw7so1vFsg/FvISrD2dDEYHYzUQNTGSOPourzikBB8SMVQp41Xd8NlU3f7MCRyGOOJ4whjZphqg7BeiJUFmtYQknmffc/VdbJNJ2XHrJdWVqyYmIxG4pEGpx5t57THpnQOtu9vk+LgWEPVp75VfFIGzufCg9MU5zsY0UFYOBFUYiv8AMCOFljpfFc11C6AA0txllZgnFw7ErIOMj1IPjs3KyJfIwUCqvhSmekbNXfok/0F8BvIuq6Rac5XjDZ02/EURckjnqXMKEuTiwQ+9h7+FaZVyzVQBzLosxY8HXdoyPsvz2y/sp3wsM16fyus9NrDEgRpfzb6TMtEXpvJ2tp3j94Ok1FUBM7w==; 5:I81opxnmdKmKxSBX/BM+UGgkMIxq8KdtGCxrhRXftJwFQWFdXxPyWdnvm8dMxEVGFHKQAkD4JH+tmnVMvuE6p2ryOeMedfQ35sX/PUMtkdQ2k/dESIp//EZE1YZ4PBn4zNVQLVa5Rqkakq6IlU39FZxwjAHD8jdItpC2ECzM/KY=; 24:ECnXN0OMQ6326RoIDw/0MYumlRVD2asyIfOsVvsmFL59Ikyg981DmcF7Y/vHwLzBPKTWyTo5v7gkV0NI42gzMjSUuRDcEzR5AKWoFxmYF+c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3637; 7:ykFKXUTgA92krQMYfKXPd7d3As7GKFkx7kiDK4tFQ+Juw+lX6I9BMh/tgnzcwsdo6l8Zd1WHa1z/J0nGJbEaWSOXrqY49FmnUBxUuYv9WTOVnjkJD1EP/aD0WbUYqlpEtKnZ+7u/gNgCQVct7VXMB/uhR5Bh4NQjJGK8tRHmqUKF3/hjNlwpIdY45KNANMtK0vNqc5Bsoxl6l4BQ0GbbmeqVgqIUSOWHKbfnAJW9R/nsyiYW7HSUF2TTYROhK5W8 X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2018 14:09:17.0487 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94c11a21-e489-4f5a-1bc7-08d5e8010f4c 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 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 e21a6a1..3314802 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1543,6 +1543,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) @@ -1713,6 +1937,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 a23a9e2..ee31e1b 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 */