Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2183209/?format=api
{ "id": 2183209, "url": "http://patchwork.ozlabs.org/api/patches/2183209/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260112192035.10427-35-ebiggers@kernel.org/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<20260112192035.10427-35-ebiggers@kernel.org>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20260112192035.10427-35-ebiggers@kernel.org/", "date": "2026-01-12T19:20:32", "name": "[v2,34/35] lib/crypto: aes: Remove old AES en/decryption functions", "commit_ref": null, "pull_url": null, "state": "handled-elsewhere", "archived": false, "hash": "c55826b7c30b30e53aa04fbd7eb43e2d93774be0", "submitter": { "id": 74690, "url": "http://patchwork.ozlabs.org/api/people/74690/?format=api", "name": "Eric Biggers", "email": "ebiggers@kernel.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260112192035.10427-35-ebiggers@kernel.org/mbox/", "series": [ { "id": 488089, "url": "http://patchwork.ozlabs.org/api/series/488089/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=488089", "date": "2026-01-12T19:19:58", "name": "AES library improvements", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/488089/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2183209/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2183209/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linuxppc-dev+bounces-15573-incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=K5lc6/Cx;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-15573-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)", "lists.ozlabs.org;\n arc=none smtp.remote-ip=172.234.252.31", "lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org", "lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=K5lc6/Cx;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org\n (client-ip=172.234.252.31; helo=sea.source.kernel.org;\n envelope-from=ebiggers@kernel.org; receiver=lists.ozlabs.org)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4dqj5v3fqcz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 13 Jan 2026 06:25:55 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4dqj3G3jC6z3bcr;\n\tTue, 13 Jan 2026 06:23:38 +1100 (AEDT)", "from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4dqj3F0hqbz30Yb\n\tfor <linuxppc-dev@lists.ozlabs.org>; Tue, 13 Jan 2026 06:23:37 +1100 (AEDT)", "from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n\tby sea.source.kernel.org (Postfix) with ESMTP id BE1D7443CE;\n\tMon, 12 Jan 2026 19:23:36 +0000 (UTC)", "by smtp.kernel.org (Postfix) with ESMTPSA id 3BAD0C116D0;\n\tMon, 12 Jan 2026 19:23:36 +0000 (UTC)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1768245818;\n\tcv=none;\n b=O7mNRws1XeURo5rT0O7y9VgyCjZBUhKz4Ou3ciX9mfnYWaPPYse7jX4KkVFvcl9UdB9N5FBCBubbV8jMufIk4eAwDCcLyQ+7yE9tz0jEcgboE1hH+m08Ma33HF68xteuAeTtPa5Z4w70i/lEz5xIa6o4fc+MIBMZq2gFr4n0A4hhGPmFXCq5qkvnCjRDZFEmEkHkriWs4LW7asEl8lmPM+5vP7V6IWOrfARZkF9KwX0BHjYQAi1d6gQ/ys1KnFD1WVDvDBIyZTsZeIdw/ymKPVc1G8LlFJjByV28+r7IeRVnTkzRrXgSwWWeocz/+ruSV9wEcjPIm/6yAFqZn8TU6Q==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1768245818; c=relaxed/relaxed;\n\tbh=LBy9ucwRbNGC8Ur1jViRtkb3g1Jk4uX2P+oAzV4Gx30=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=jX/C0d4NqGXAZ0jabvlMcyhFpzh6xV5sZn2dpkaFWMoiYjGSLNEm+4uUgjP1+hedT9hDalXacHuAESDn414xwzEXMigwxcBRNozUHsrvh4M3zuoyRJbJca+tCzpZfmKAuaPEFrXOBu0XKMQE7UzZTO/O/2XC7zjKTUeL2iz05aS122IA6c6G57vS8eai3ZUKCWShtc23wIxoNK8dRbt7W88X6/w4v6LIwxkdMRLLnsryxW8zIkg3ASaSjJp52DHoTnWYxJwt8DtYfCD3Ray/0UyQFvbZr5U8ksqjClcvRNrpXvjLZb5uG9p8RRsVIqzcRiZDOsylnxE+f+VxADuFdw==", "ARC-Authentication-Results": "i=1; lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org;\n dkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=K5lc6/Cx; dkim-atps=neutral;\n spf=pass (client-ip=172.234.252.31; helo=sea.source.kernel.org;\n envelope-from=ebiggers@kernel.org;\n receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=k20201202; t=1768245816;\n\tbh=mfz4ZYJt3AWopKXA9rY3STkyUZNi7LKRSY3PzscIMgc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=K5lc6/CxW55D01F0aZkD+PpuXbQ9StZLbSb19NcR2aqc19iwx8bcvLzBfQ2CKBbZJ\n\t HOlQVgOo0A0p3dcfR9pfL28aHxro8jtR8J1k1gz0siRRVvSHhqV+06riALpifHyreK\n\t +7x4fvIO/pjiW73W7mRwy+SAgN7G6DetbTBuowmpxmOmJCngNDg1+brp3NTQ4Q8ZTq\n\t y9UISG3fG9brsVPgnRsCMacDt1gC4gj+/+tEq0vqu6ly4tFHEkbHQq+JHsoT4TB1id\n\t XF/JhUpiBUqMtw4pXp6qkhYYHUWX7OQX334WULSjKnFEtawqAABSXhB/gGH6fcJUwX\n\t 7BkQZJQJixr1Q==", "From": "Eric Biggers <ebiggers@kernel.org>", "To": "linux-crypto@vger.kernel.org", "Cc": "linux-kernel@vger.kernel.org,\n\tArd Biesheuvel <ardb@kernel.org>,\n\t\"Jason A . Donenfeld\" <Jason@zx2c4.com>,\n\tHerbert Xu <herbert@gondor.apana.org.au>,\n\tlinux-arm-kernel@lists.infradead.org,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tlinux-riscv@lists.infradead.org,\n\tlinux-s390@vger.kernel.org,\n\tsparclinux@vger.kernel.org,\n\tx86@kernel.org,\n\tHolger Dengler <dengler@linux.ibm.com>,\n\tHarald Freudenberger <freude@linux.ibm.com>,\n\tEric Biggers <ebiggers@kernel.org>", "Subject": "[PATCH v2 34/35] lib/crypto: aes: Remove old AES en/decryption\n functions", "Date": "Mon, 12 Jan 2026 11:20:32 -0800", "Message-ID": "<20260112192035.10427-35-ebiggers@kernel.org>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260112192035.10427-1-ebiggers@kernel.org>", "References": "<20260112192035.10427-1-ebiggers@kernel.org>", "X-Mailing-List": "linuxppc-dev@lists.ozlabs.org", "List-Id": "<linuxppc-dev.lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev+help@lists.ozlabs.org>", "List-Owner": "<mailto:linuxppc-dev+owner@lists.ozlabs.org>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Archive": "<https://lore.kernel.org/linuxppc-dev/>,\n <https://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Subscribe": "<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>", "List-Unsubscribe": "<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>", "Precedence": "list", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Spam-Status": "No, score=-0.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,\n\tDKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS\n\tautolearn=disabled version=4.0.1 OzLabs 8", "X-Spam-Checker-Version": "SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org" }, "content": "Now that all callers of the aes_encrypt() and aes_decrypt() type-generic\nmacros are using the new types, remove the old functions.\n\nThen, replace the macro with direct calls to the new functions, dropping\nthe \"_new\" suffix from them.\n\nThis completes the change in the type of the key struct that is passed\nto aes_encrypt() and aes_decrypt().\n\nAcked-by: Ard Biesheuvel <ardb@kernel.org>\nSigned-off-by: Eric Biggers <ebiggers@kernel.org>\n---\n include/crypto/aes.h | 24 ++-------\n lib/crypto/aes.c | 118 +++----------------------------------------\n 2 files changed, 10 insertions(+), 132 deletions(-)", "diff": "diff --git a/include/crypto/aes.h b/include/crypto/aes.h\nindex 4cb3c27d1bf5..cbf1cc96db52 100644\n--- a/include/crypto/aes.h\n+++ b/include/crypto/aes.h\n@@ -306,39 +306,23 @@ typedef union {\n * @out: Buffer to store the ciphertext block\n * @in: Buffer containing the plaintext block\n *\n * Context: Any context.\n */\n-#define aes_encrypt(key, out, in) \\\n-\t_Generic((key), \\\n-\t\t struct crypto_aes_ctx *: aes_encrypt_old((const struct crypto_aes_ctx *)(key), (out), (in)), \\\n-\t\t const struct crypto_aes_ctx *: aes_encrypt_old((const struct crypto_aes_ctx *)(key), (out), (in)), \\\n-\t\t struct aes_enckey *: aes_encrypt_new((const struct aes_enckey *)(key), (out), (in)), \\\n-\t\t const struct aes_enckey *: aes_encrypt_new((const struct aes_enckey *)(key), (out), (in)), \\\n-\t\t struct aes_key *: aes_encrypt_new((const struct aes_key *)(key), (out), (in)), \\\n-\t\t const struct aes_key *: aes_encrypt_new((const struct aes_key *)(key), (out), (in)))\n-void aes_encrypt_old(const struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);\n-void aes_encrypt_new(aes_encrypt_arg key, u8 out[at_least AES_BLOCK_SIZE],\n-\t\t const u8 in[at_least AES_BLOCK_SIZE]);\n+void aes_encrypt(aes_encrypt_arg key, u8 out[at_least AES_BLOCK_SIZE],\n+\t\t const u8 in[at_least AES_BLOCK_SIZE]);\n \n /**\n * aes_decrypt() - Decrypt a single AES block\n * @key: The AES key, previously initialized by aes_preparekey()\n * @out: Buffer to store the plaintext block\n * @in: Buffer containing the ciphertext block\n *\n * Context: Any context.\n */\n-#define aes_decrypt(key, out, in) \\\n-\t_Generic((key), \\\n-\t\t struct crypto_aes_ctx *: aes_decrypt_old((const struct crypto_aes_ctx *)(key), (out), (in)), \\\n-\t\t const struct crypto_aes_ctx *: aes_decrypt_old((const struct crypto_aes_ctx *)(key), (out), (in)), \\\n-\t\t struct aes_key *: aes_decrypt_new((const struct aes_key *)(key), (out), (in)), \\\n-\t\t const struct aes_key *: aes_decrypt_new((const struct aes_key *)(key), (out), (in)))\n-void aes_decrypt_old(const struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);\n-void aes_decrypt_new(const struct aes_key *key, u8 out[at_least AES_BLOCK_SIZE],\n-\t\t const u8 in[at_least AES_BLOCK_SIZE]);\n+void aes_decrypt(const struct aes_key *key, u8 out[at_least AES_BLOCK_SIZE],\n+\t\t const u8 in[at_least AES_BLOCK_SIZE]);\n \n extern const u8 crypto_aes_sbox[];\n extern const u8 crypto_aes_inv_sbox[];\n extern const u32 aes_enc_tab[256];\n extern const u32 aes_dec_tab[256];\ndiff --git a/lib/crypto/aes.c b/lib/crypto/aes.c\nindex 88da68dcf5a8..b7ab2d0c4e59 100644\n--- a/lib/crypto/aes.c\n+++ b/lib/crypto/aes.c\n@@ -249,26 +249,10 @@ static u32 inv_mix_columns(u32 x)\n \tu32 y = mul_by_x2(x);\n \n \treturn mix_columns(x ^ y ^ ror32(y, 16));\n }\n \n-static __always_inline u32 subshift(u32 in[], int pos)\n-{\n-\treturn (aes_sbox[in[pos] & 0xff]) ^\n-\t (aes_sbox[(in[(pos + 1) % 4] >> 8) & 0xff] << 8) ^\n-\t (aes_sbox[(in[(pos + 2) % 4] >> 16) & 0xff] << 16) ^\n-\t (aes_sbox[(in[(pos + 3) % 4] >> 24) & 0xff] << 24);\n-}\n-\n-static __always_inline u32 inv_subshift(u32 in[], int pos)\n-{\n-\treturn (aes_inv_sbox[in[pos] & 0xff]) ^\n-\t (aes_inv_sbox[(in[(pos + 3) % 4] >> 8) & 0xff] << 8) ^\n-\t (aes_inv_sbox[(in[(pos + 2) % 4] >> 16) & 0xff] << 16) ^\n-\t (aes_inv_sbox[(in[(pos + 1) % 4] >> 24) & 0xff] << 24);\n-}\n-\n static u32 subw(u32 in)\n {\n \treturn (aes_sbox[in & 0xff]) ^\n \t (aes_sbox[(in >> 8) & 0xff] << 8) ^\n \t (aes_sbox[(in >> 16) & 0xff] << 16) ^\n@@ -343,55 +327,10 @@ int aes_expandkey(struct crypto_aes_ctx *ctx, const u8 *in_key,\n \taes_expandkey_generic(ctx->key_enc, ctx->key_dec, in_key, key_len);\n \treturn 0;\n }\n EXPORT_SYMBOL(aes_expandkey);\n \n-void aes_encrypt_old(const struct crypto_aes_ctx *ctx, u8 *out, const u8 *in)\n-{\n-\tconst u32 *rkp = ctx->key_enc + 4;\n-\tint rounds = 6 + ctx->key_length / 4;\n-\tu32 st0[4], st1[4];\n-\tint round;\n-\n-\tst0[0] = ctx->key_enc[0] ^ get_unaligned_le32(in);\n-\tst0[1] = ctx->key_enc[1] ^ get_unaligned_le32(in + 4);\n-\tst0[2] = ctx->key_enc[2] ^ get_unaligned_le32(in + 8);\n-\tst0[3] = ctx->key_enc[3] ^ get_unaligned_le32(in + 12);\n-\n-\t/*\n-\t * Force the compiler to emit data independent Sbox references,\n-\t * by xoring the input with Sbox values that are known to add up\n-\t * to zero. This pulls the entire Sbox into the D-cache before any\n-\t * data dependent lookups are done.\n-\t */\n-\tst0[0] ^= aes_sbox[ 0] ^ aes_sbox[ 64] ^ aes_sbox[134] ^ aes_sbox[195];\n-\tst0[1] ^= aes_sbox[16] ^ aes_sbox[ 82] ^ aes_sbox[158] ^ aes_sbox[221];\n-\tst0[2] ^= aes_sbox[32] ^ aes_sbox[ 96] ^ aes_sbox[160] ^ aes_sbox[234];\n-\tst0[3] ^= aes_sbox[48] ^ aes_sbox[112] ^ aes_sbox[186] ^ aes_sbox[241];\n-\n-\tfor (round = 0;; round += 2, rkp += 8) {\n-\t\tst1[0] = mix_columns(subshift(st0, 0)) ^ rkp[0];\n-\t\tst1[1] = mix_columns(subshift(st0, 1)) ^ rkp[1];\n-\t\tst1[2] = mix_columns(subshift(st0, 2)) ^ rkp[2];\n-\t\tst1[3] = mix_columns(subshift(st0, 3)) ^ rkp[3];\n-\n-\t\tif (round == rounds - 2)\n-\t\t\tbreak;\n-\n-\t\tst0[0] = mix_columns(subshift(st1, 0)) ^ rkp[4];\n-\t\tst0[1] = mix_columns(subshift(st1, 1)) ^ rkp[5];\n-\t\tst0[2] = mix_columns(subshift(st1, 2)) ^ rkp[6];\n-\t\tst0[3] = mix_columns(subshift(st1, 3)) ^ rkp[7];\n-\t}\n-\n-\tput_unaligned_le32(subshift(st1, 0) ^ rkp[4], out);\n-\tput_unaligned_le32(subshift(st1, 1) ^ rkp[5], out + 4);\n-\tput_unaligned_le32(subshift(st1, 2) ^ rkp[6], out + 8);\n-\tput_unaligned_le32(subshift(st1, 3) ^ rkp[7], out + 12);\n-}\n-EXPORT_SYMBOL(aes_encrypt_old);\n-\n static __always_inline u32 enc_quarterround(const u32 w[4], int i, u32 rk)\n {\n \treturn rk ^ aes_enc_tab[(u8)w[i]] ^\n \t rol32(aes_enc_tab[(u8)(w[(i + 1) % 4] >> 8)], 8) ^\n \t rol32(aes_enc_tab[(u8)(w[(i + 2) % 4] >> 16)], 16) ^\n@@ -496,55 +435,10 @@ static void __maybe_unused aes_decrypt_generic(const u32 inv_rndkeys[],\n \tput_unaligned_le32(declast_quarterround(w, 1, *rkp++), &out[4]);\n \tput_unaligned_le32(declast_quarterround(w, 2, *rkp++), &out[8]);\n \tput_unaligned_le32(declast_quarterround(w, 3, *rkp++), &out[12]);\n }\n \n-void aes_decrypt_old(const struct crypto_aes_ctx *ctx, u8 *out, const u8 *in)\n-{\n-\tconst u32 *rkp = ctx->key_dec + 4;\n-\tint rounds = 6 + ctx->key_length / 4;\n-\tu32 st0[4], st1[4];\n-\tint round;\n-\n-\tst0[0] = ctx->key_dec[0] ^ get_unaligned_le32(in);\n-\tst0[1] = ctx->key_dec[1] ^ get_unaligned_le32(in + 4);\n-\tst0[2] = ctx->key_dec[2] ^ get_unaligned_le32(in + 8);\n-\tst0[3] = ctx->key_dec[3] ^ get_unaligned_le32(in + 12);\n-\n-\t/*\n-\t * Force the compiler to emit data independent Sbox references,\n-\t * by xoring the input with Sbox values that are known to add up\n-\t * to zero. This pulls the entire Sbox into the D-cache before any\n-\t * data dependent lookups are done.\n-\t */\n-\tst0[0] ^= aes_inv_sbox[ 0] ^ aes_inv_sbox[ 64] ^ aes_inv_sbox[129] ^ aes_inv_sbox[200];\n-\tst0[1] ^= aes_inv_sbox[16] ^ aes_inv_sbox[ 83] ^ aes_inv_sbox[150] ^ aes_inv_sbox[212];\n-\tst0[2] ^= aes_inv_sbox[32] ^ aes_inv_sbox[ 96] ^ aes_inv_sbox[160] ^ aes_inv_sbox[236];\n-\tst0[3] ^= aes_inv_sbox[48] ^ aes_inv_sbox[112] ^ aes_inv_sbox[187] ^ aes_inv_sbox[247];\n-\n-\tfor (round = 0;; round += 2, rkp += 8) {\n-\t\tst1[0] = inv_mix_columns(inv_subshift(st0, 0)) ^ rkp[0];\n-\t\tst1[1] = inv_mix_columns(inv_subshift(st0, 1)) ^ rkp[1];\n-\t\tst1[2] = inv_mix_columns(inv_subshift(st0, 2)) ^ rkp[2];\n-\t\tst1[3] = inv_mix_columns(inv_subshift(st0, 3)) ^ rkp[3];\n-\n-\t\tif (round == rounds - 2)\n-\t\t\tbreak;\n-\n-\t\tst0[0] = inv_mix_columns(inv_subshift(st1, 0)) ^ rkp[4];\n-\t\tst0[1] = inv_mix_columns(inv_subshift(st1, 1)) ^ rkp[5];\n-\t\tst0[2] = inv_mix_columns(inv_subshift(st1, 2)) ^ rkp[6];\n-\t\tst0[3] = inv_mix_columns(inv_subshift(st1, 3)) ^ rkp[7];\n-\t}\n-\n-\tput_unaligned_le32(inv_subshift(st1, 0) ^ rkp[4], out);\n-\tput_unaligned_le32(inv_subshift(st1, 1) ^ rkp[5], out + 4);\n-\tput_unaligned_le32(inv_subshift(st1, 2) ^ rkp[6], out + 8);\n-\tput_unaligned_le32(inv_subshift(st1, 3) ^ rkp[7], out + 12);\n-}\n-EXPORT_SYMBOL(aes_decrypt_old);\n-\n /*\n * Note: the aes_prepare*key_* names reflect the fact that the implementation\n * might not actually expand the key. (The s390 code for example doesn't.)\n * Where the key is expanded we use the more specific names aes_expandkey_*.\n *\n@@ -606,23 +500,23 @@ int aes_prepareenckey(struct aes_enckey *key, const u8 *in_key, size_t key_len)\n {\n \treturn __aes_preparekey(key, NULL, in_key, key_len);\n }\n EXPORT_SYMBOL(aes_prepareenckey);\n \n-void aes_encrypt_new(aes_encrypt_arg key, u8 out[AES_BLOCK_SIZE],\n-\t\t const u8 in[AES_BLOCK_SIZE])\n+void aes_encrypt(aes_encrypt_arg key, u8 out[AES_BLOCK_SIZE],\n+\t\t const u8 in[AES_BLOCK_SIZE])\n {\n \taes_encrypt_arch(key.enc_key, out, in);\n }\n-EXPORT_SYMBOL(aes_encrypt_new);\n+EXPORT_SYMBOL(aes_encrypt);\n \n-void aes_decrypt_new(const struct aes_key *key, u8 out[AES_BLOCK_SIZE],\n-\t\t const u8 in[AES_BLOCK_SIZE])\n+void aes_decrypt(const struct aes_key *key, u8 out[AES_BLOCK_SIZE],\n+\t\t const u8 in[AES_BLOCK_SIZE])\n {\n \taes_decrypt_arch(key, out, in);\n }\n-EXPORT_SYMBOL(aes_decrypt_new);\n+EXPORT_SYMBOL(aes_decrypt);\n \n #ifdef aes_mod_init_arch\n static int __init aes_mod_init(void)\n {\n \taes_mod_init_arch();\n", "prefixes": [ "v2", "34/35" ] }