From patchwork Fri Aug 26 15:17:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Horia Geanta X-Patchwork-Id: 9301625 X-Patchwork-Delegate: herbert@gondor.apana.org.au 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 E8145607EE for ; Fri, 26 Aug 2016 15:32:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7C6F29501 for ; Fri, 26 Aug 2016 15:32:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC61D2953E; Fri, 26 Aug 2016 15:32:56 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95D6529501 for ; Fri, 26 Aug 2016 15:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753585AbcHZPcy (ORCPT ); Fri, 26 Aug 2016 11:32:54 -0400 Received: from mail-dm3nam03on0075.outbound.protection.outlook.com ([104.47.41.75]:45155 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753006AbcHZPcx (ORCPT ); Fri, 26 Aug 2016 11:32:53 -0400 X-Greylist: delayed 915 seconds by postgrey-1.27 at vger.kernel.org; Fri, 26 Aug 2016 11:32:53 EDT Received: from BN3PR0301CA0063.namprd03.prod.outlook.com (10.160.152.159) by BL2PR03MB1875.namprd03.prod.outlook.com (10.164.115.19) with Microsoft SMTP Server (TLS) id 15.1.403.16; Fri, 26 Aug 2016 15:17:25 +0000 Received: from BY2FFO11FD011.protection.gbl (2a01:111:f400:7c0c::191) by BN3PR0301CA0063.outlook.office365.com (2a01:111:e400:401e::31) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9 via Frontend Transport; Fri, 26 Aug 2016 15:17:25 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; davemloft.net; dkim=none (message not signed) header.d=none; davemloft.net; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD011.mail.protection.outlook.com (10.1.14.129) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Fri, 26 Aug 2016 15:17:25 +0000 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.77.120]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u7QFHNlk022731; Fri, 26 Aug 2016 08:17:24 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: Herbert Xu CC: , "David S. Miller" Subject: [PATCH v2] crypto: caam - fix IV loading for authenc (giv)decryption Date: Fri, 26 Aug 2016 18:17:13 +0300 Message-ID: <1472224633-25412-1-git-send-email-horia.geanta@nxp.com> X-Mailer: git-send-email 2.4.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131166982457621637; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(586003)(2870700001)(2906002)(19580405001)(86362001)(626004)(356003)(305945005)(105606002)(4326007)(5660300001)(81156014)(11100500001)(8676002)(33646002)(81166006)(5820100001)(50226002)(110136002)(189998001)(36756003)(47776003)(50986999)(23676002)(229853001)(50466002)(104016004)(87936001)(68736007)(8936002)(106466001)(19580395003)(7846002)(85426001)(92566002)(97736004)(77096005); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB1875; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD011; 1:fVlqX70T4OqI5yCYFWgnQm9kSNemZ5csGqPdOyleKmt0zuvZQqsIQvwhKeD6krPS1IJ8mVC4a7PA7Sb9IWiPJrDKvIPiQlKD9bXUahNu1UZPk54k2lcJdulSocZaMUw2f5HbL+6Y6uUShTVn8dhMrNMK3xNX1jmkU5LLNqMZXhrkhCbyWjlA+lMdNAaT3wegJiizysku0XtenPH1m4MIOgwzZU6cTGQiyaxCYwLSlAY2vwlUkxcoPhD+nSkPx5yM1LeW+2lf8p6s4kq/lVXAS+9yEcUuE+5uoiGUna/aS5IVLmdFCwPdQPxjRVjKkOtc6gmqEHfRTUQ4JPNnhuemkBziTGRmPa0PYuETJeTCxAiIvIiTmF4v0LqkBf0bw5qV15qgQv1gqmo3oRFhWWFajnfxZTUaPdxoAoALmtUI87HXwdxxV/oAAnxpW1tUwpmg6lC866lW9Y0fvw2GQdz0PAuP4YTxMlK6Zua44ER/LjQe6sHlXkdvhtVthvJSnml+lWhTeIjJ0pDwv5ZJY+xOIyKfu9rNLtm5juR5efRBOFLSI6DRmto4zBA37q5+q6klrLiL9SgxcboBTcczwidbrZC1PfvEV7Ph4HWolYayGsD1j9d3ergn89eV/sE+20IB X-MS-Office365-Filtering-Correlation-Id: 6ac7af1b-63b0-4895-7c85-08d3cdc4161c X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB1875; 2:QfhJ7BVEP7h/aqru72Aoio2uCUUbV077FjiXeTb4rwqnHu/AuGxhtN+EgqnTW6GU43G/H8Pd8/kWDL1cu+bIpz+nReTW/FKIBiHeFqL2a6Bydhav6lIYihGBrarHM0ib30BB9v3WCo3EZS9Mj8UFBn+PNOIBcH2a4Opa9EauXDGNm9CPQV5qpYX4XBr5JgaW; 3:Qj1J5MJa2Iu2086TTuekBQed1kfkQa2hyxUySKIQdtBxv6a3+sArJCD/bd5kwR+Ru7ZOvL/foS9EnCdcSrw2fMvlAI3U4/762MFYi0vspxDiLmwCOCAdj49BWz9ipiBz3sQjbksZlO0DWwsaeYjPmOA0NS6wA0JE3ZY1RBJLQXMJgVFl7wEophvvn+D3TwzevTTTOPqMn6m70Bw59a0iDBkWa5cBJ9LOi1VqEA/52KE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB1875; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB1875; 25:P94Do4EIvDy+q8mjcmrBiuzs4obtG2auDVmAOn0A5CdDWRS+9p1msaDJHRAj/YRo4LCO9AOLJ2qKEyyopVaaQvpHahxz3ORuvCIvAx+9z3W+CaW+1CnfnI4x4bVIrqkFg+GDr1HrWbFozkVNNI1GhVad8EMm7ZEvo8ZUb2j8WM6tf8YGkW2YVBAOzmsRYls/O0jQ7t8JnhdcLZJOHWT26f9DIe1l8zQncFv+8NwBhXLtwXkvU7iNPgSR0nmR2Yi52NZHPEnurYSkn4GibM6/AB1DBu7IxWdS6oNtJTKVDMKkMJROJjH0XZzVUr9PrB2WaYfqGICrgY+SkrcFJ2ZGPIQ9urSRMdJdhJ9EXCKmij5rJSUU3x73SwhZPwyzPh1rTpWz+qlQXUBOC1xL3UBw5qCxwp7fl+n3gaxNKtRKXUDvdRM32sA2H1GvGDGxHUTnIB2AFDJ58hQcSQAoAl4axGoWhGjevngmJPVv3FvPmQaez2DuaPSJzXLXDTVDxId8OUd/UHq3BfySrgsimwsgxt0ew/5s92mONRBqzyac1Jqg2voNJUiO2t9EUkgFG6ZY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(13024025)(13023025)(13017025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:BL2PR03MB1875; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB1875; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB1875; 4:sA3X9YfI8W5A404Ba6GxEka/pQRa7BOwrJzf3hEk78ivuO31eJ02k5Rk+6UlD6uzwh+IjiHIVBRgQpMn5dF2sTsmo4ia+tRx44d2wTdKRasEK6IggonhWCABDKS5IGC2qg7Wnp6R9RaGfKtizc2Dp1O5PN4sZe3u91MUFuQOuul5sse1Wy0H3Acvu5xlqs91ESP14LMuzebblm7PUWF0UOCEtMG82VntxeTp9f1hOXazt3ofcnxhBKFzY9cvVnyeQgTw3Wk5JmYZbFrU8rYlHoFAhgAe0/w5kZAbvP58t+bJH9qv1RN50og6KZzwyDD9MUd1EriugwX1RGlgO4w47x9L1hSLQQuYDmPT4zSzmu2rw3v4XGA+hTphMz4D0IxYoiQHldxSoXaf2hbhKUhNTXjthL6na0SIz+HjTvolHzaRwamFYB3DVeebgyVnckA/0WFojsVjFOPoFT95XPBFLe5oYMzILD1SBE0xywf/SZ0lVTFKksxevzQTERIQ3kx2gn+2JJHISUyGH6E4YlgEcD7qC9h3fWPztTJobZ+8Mcw0fwoWdOdkQDHgg0FRe9Q2 X-Forefront-PRVS: 00462943DE X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTDJQUjAzTUIxODc1OzIzOjVmZGtLcjJDc3lpb0hJMmZvVkVkMWg2ZlJQ?= =?utf-8?B?WmF4cUlyN1V3aEJOczdST1NMM2NYOXNwbU12RFdtdjA2dktySnpYakNSMm93?= =?utf-8?B?WHhzZG9JSjU2Zlo2UG1RUjYxc3U4eGxGWTlzZWpFSitVUlRueXRQd1g3U1Zz?= =?utf-8?B?SEttclp6SzZFNnR5aE5sUWk3TW9ZbGxYL09yV2UrUHN4aGptV2xWcSs2dS9M?= =?utf-8?B?T3hHRnVvaE94SE02UnMySzNVdldWQlRidVVDMzBiNXBkZ1N4dUpEMGlQRDNC?= =?utf-8?B?cmZmOFRCTEdBcVpLQng4UG1WRlpSRXU1NEdzUGpmcklHL1ZvZWdMN2tVcGZr?= =?utf-8?B?UWlTWGlGTnd5Sk0wTmJKOUx4YmM0UFdMazh1amVhRnlJWkVTWGM0ZS8vQnVZ?= =?utf-8?B?S1JDUzZFdDVwT2pHVUxOVUYzZy9VbzBQcWR5YlhSYThBcGtINlllOUxzZ1oy?= =?utf-8?B?WWJZbHZyRnlVd3NZdk5iMGcyVGVCbGp1WmJpekNhcWpJck1Yb0c4NmR6WEt6?= =?utf-8?B?c2J5OHpQTlpmUVViVjJrT3VZRCtIbWpiRnpTcElIaGpOd0d2VnBnalpBRDBK?= =?utf-8?B?bDZkTWlwOGliL3NaWXA4U2lvVHlSaUxVQm5Ec0ltcUNBN1BlRm12eWpqZUxr?= =?utf-8?B?ZEJUNTAxa1RXbEJJS0VRd2RUVlY4M2pDcGNuRWxFMlJnNDJOa3RFQ3h0dXI0?= =?utf-8?B?Q0lIQml6MStLTHpKQmh5MHJqbDQ1ZjhMWWQrS0hlb1JBZzJXNVpLS2FqVXJD?= =?utf-8?B?THR6NFlRMDZyU0VFN0hxcG5DSFJFVGxzREZ4UXNScDFYKzVqOFlCSTE1cUtI?= =?utf-8?B?d2JVZG91SG1xUGVUSGVzNEZDbzdwcjd5WS96Ri91RVVESCtxL2VyU1VGSGlv?= =?utf-8?B?U3dheWZSOE5qWlc3UXdOLzN4VlVMVk9MbWhVYTBrNTA3NnMrcVBqL2V5ZVdO?= =?utf-8?B?NFNlM3doRmdidFpPY0dBYWRIV081OE5CQkFTWExXVEsvNGpjZXptWW9CQzE3?= =?utf-8?B?bTdHdHozbCtPRGE4R1FVVDNvWTlKNTllNnZ5SzF6K1hHdXI3N2pzOFcwWTFv?= =?utf-8?B?VHpucHB6NU1KbE1JU1YzQW9PMWs3SnZzVGdGVExYQ2F6V3hEZ1VKQnZjamhp?= =?utf-8?B?OXQ1Vk1QVFJqWFh5TDl0Wm9HNWpNQThnVEtGVXhubjFzQWxLb09Ha1RyTFRK?= =?utf-8?B?Z2ZmQXk1RlJJUms2VDNWKys1dnRyMDNROHZub09GZ3ZTSksvR1ZieFA5VzJv?= =?utf-8?B?ZENtVXB2bmVyVWoxMUtiYUlvWW0yRzhBaG1YWHg0dUZGQWtGNnVoWU9INnpj?= =?utf-8?B?aEZ4cktuUEI5aEg0RE9oNjNUa3Y4NGx2blc1MFcxZ2xyL3NaZWEvSDRiQklC?= =?utf-8?B?M2duQzZmZDlQTTJ3MXo5S0c1Z0cvdGN4MXZuK0NwTmFTZjUvMU1Qck1vTUda?= =?utf-8?B?YzhsTmZxUU9HUi9vN1p0cHVBNFJ1Z2lsTTNwY292WThUTkt0ZmFyTTNYU2F1?= =?utf-8?Q?0wU3Myxu2T6Lq/7vjjMINeXjU=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB1875; 5:fstOD19nQDH7ehZ0WSpJQgz7sBbbFq8eUSwoBlztnWRMWnfpmAZ9HetS4tJ4kALLN5FCTE9el7kK+I9TmezFiGXJkjJ/xdGMUnYThnQ+0egGoNuL9Uo6CWn6al6+ocOprBKW2wVA9eRUGn8rYbFxSq63Mzcvo7GinBepYy3LKlk=; 24:4iV1WaD5eaOLoGtJPy6ca2hndYU+PQzV6C8CJzjqX4iO3Tbzx2J1+GZmR5+0KVKUATG4fFf+ZEwboaxU/xaWtZ7FK6H8KX2Q9zQq2BfOhf8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2016 15:17:25.5593 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB1875 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For algorithms that implement IV generators before the crypto ops, the IV needed for decryption is initially located in req->src scatterlist, not in req->iv. Avoid copying the IV into req->iv by modifying the (givdecrypt) descriptors to load it directly from req->src. aead_givdecrypt() is no longer needed and goes away. Cc: # 4.3+ Fixes: 479bcc7c5b9e ("crypto: caam - Convert authenc to new AEAD interface") Signed-off-by: Horia Geantă --- drivers/crypto/caam/caamalg.c | 77 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 6dc597126b79..775b8b524913 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -556,7 +556,10 @@ skip_enc: /* Read and write assoclen bytes */ append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ); - append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ); + if (alg->caam.geniv) + append_math_add_imm_u32(desc, VARSEQOUTLEN, REG3, IMM, ivsize); + else + append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ); /* Skip assoc data */ append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF); @@ -565,6 +568,14 @@ skip_enc: append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG | KEY_VLF); + if (alg->caam.geniv) { + append_seq_load(desc, ivsize, LDST_CLASS_1_CCB | + LDST_SRCDST_BYTE_CONTEXT | + (ctx1_iv_off << LDST_OFFSET_SHIFT)); + append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO | + (ctx1_iv_off << MOVE_OFFSET_SHIFT) | ivsize); + } + /* Load Counter into CONTEXT1 reg */ if (is_rfc3686) append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM | @@ -2150,7 +2161,7 @@ static void init_authenc_job(struct aead_request *req, init_aead_job(req, edesc, all_contig, encrypt); - if (ivsize && (is_rfc3686 || !(alg->caam.geniv && encrypt))) + if (ivsize && !alg->caam.geniv) append_load_as_imm(desc, req->iv, ivsize, LDST_CLASS_1_CCB | LDST_SRCDST_BYTE_CONTEXT | @@ -2537,20 +2548,6 @@ static int aead_decrypt(struct aead_request *req) return ret; } -static int aead_givdecrypt(struct aead_request *req) -{ - struct crypto_aead *aead = crypto_aead_reqtfm(req); - unsigned int ivsize = crypto_aead_ivsize(aead); - - if (req->cryptlen < ivsize) - return -EINVAL; - - req->cryptlen -= ivsize; - req->assoclen += ivsize; - - return aead_decrypt(req); -} - /* * allocate and map the ablkcipher extended descriptor for ablkcipher */ @@ -3210,7 +3207,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = AES_BLOCK_SIZE, .maxauthsize = MD5_DIGEST_SIZE, }, @@ -3256,7 +3253,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = AES_BLOCK_SIZE, .maxauthsize = SHA1_DIGEST_SIZE, }, @@ -3302,7 +3299,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = AES_BLOCK_SIZE, .maxauthsize = SHA224_DIGEST_SIZE, }, @@ -3348,7 +3345,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = AES_BLOCK_SIZE, .maxauthsize = SHA256_DIGEST_SIZE, }, @@ -3394,7 +3391,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = AES_BLOCK_SIZE, .maxauthsize = SHA384_DIGEST_SIZE, }, @@ -3440,7 +3437,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = AES_BLOCK_SIZE, .maxauthsize = SHA512_DIGEST_SIZE, }, @@ -3486,7 +3483,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES3_EDE_BLOCK_SIZE, .maxauthsize = MD5_DIGEST_SIZE, }, @@ -3534,7 +3531,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES3_EDE_BLOCK_SIZE, .maxauthsize = SHA1_DIGEST_SIZE, }, @@ -3582,7 +3579,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES3_EDE_BLOCK_SIZE, .maxauthsize = SHA224_DIGEST_SIZE, }, @@ -3630,7 +3627,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES3_EDE_BLOCK_SIZE, .maxauthsize = SHA256_DIGEST_SIZE, }, @@ -3678,7 +3675,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES3_EDE_BLOCK_SIZE, .maxauthsize = SHA384_DIGEST_SIZE, }, @@ -3726,7 +3723,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES3_EDE_BLOCK_SIZE, .maxauthsize = SHA512_DIGEST_SIZE, }, @@ -3772,7 +3769,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES_BLOCK_SIZE, .maxauthsize = MD5_DIGEST_SIZE, }, @@ -3818,7 +3815,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES_BLOCK_SIZE, .maxauthsize = SHA1_DIGEST_SIZE, }, @@ -3864,7 +3861,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES_BLOCK_SIZE, .maxauthsize = SHA224_DIGEST_SIZE, }, @@ -3910,7 +3907,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES_BLOCK_SIZE, .maxauthsize = SHA256_DIGEST_SIZE, }, @@ -3956,7 +3953,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES_BLOCK_SIZE, .maxauthsize = SHA384_DIGEST_SIZE, }, @@ -4002,7 +3999,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = DES_BLOCK_SIZE, .maxauthsize = SHA512_DIGEST_SIZE, }, @@ -4051,7 +4048,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = CTR_RFC3686_IV_SIZE, .maxauthsize = MD5_DIGEST_SIZE, }, @@ -4102,7 +4099,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = CTR_RFC3686_IV_SIZE, .maxauthsize = SHA1_DIGEST_SIZE, }, @@ -4153,7 +4150,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = CTR_RFC3686_IV_SIZE, .maxauthsize = SHA224_DIGEST_SIZE, }, @@ -4204,7 +4201,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = CTR_RFC3686_IV_SIZE, .maxauthsize = SHA256_DIGEST_SIZE, }, @@ -4255,7 +4252,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = CTR_RFC3686_IV_SIZE, .maxauthsize = SHA384_DIGEST_SIZE, }, @@ -4306,7 +4303,7 @@ static struct caam_aead_alg driver_aeads[] = { .setkey = aead_setkey, .setauthsize = aead_setauthsize, .encrypt = aead_encrypt, - .decrypt = aead_givdecrypt, + .decrypt = aead_decrypt, .ivsize = CTR_RFC3686_IV_SIZE, .maxauthsize = SHA512_DIGEST_SIZE, },