{"id":2183177,"url":"http://patchwork.ozlabs.org/api/covers/2183177/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/cover/20260112192035.10427-1-ebiggers@kernel.org/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","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-1-ebiggers@kernel.org>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20260112192035.10427-1-ebiggers@kernel.org/","date":"2026-01-12T19:19:58","name":"[v2,00/35] AES library improvements","submitter":{"id":74690,"url":"http://patchwork.ozlabs.org/api/people/74690/?format=json","name":"Eric Biggers","email":"ebiggers@kernel.org"},"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/cover/20260112192035.10427-1-ebiggers@kernel.org/mbox/","series":[{"id":488089,"url":"http://patchwork.ozlabs.org/api/series/488089/?format=json","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/covers/2183177/comments/","headers":{"Return-Path":"\n ","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=saTCPIlt;\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-15553-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n arc=none smtp.remote-ip=172.105.4.254","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=saTCPIlt;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org\n (client-ip=172.105.4.254; helo=tor.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 4dqj3046LVz1xpk\n\tfor ; Tue, 13 Jan 2026 06:23:23 +1100 (AEDT)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4dqj2y38xXz2xP8;\n\tTue, 13 Jan 2026 06:23:22 +1100 (AEDT)","from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4dqj2w6H65z2xHW\n\tfor ; Tue, 13 Jan 2026 06:23:20 +1100 (AEDT)","from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n\tby tor.source.kernel.org (Postfix) with ESMTP id 1831C60052;\n\tMon, 12 Jan 2026 19:23:18 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 5A00AC116D0;\n\tMon, 12 Jan 2026 19:23:17 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1768245802;\n\tcv=none;\n b=UjecN+JkRgg6EMmrjJknQZCH59SVP5XCKUAt7xGpvvXGhMZO5ITdC8qK9aDYjJQJ6PJVj6bcOBwH+w6nTaoxuoypAQi9hL/mCrXHzdNTrxL9HMFfdo0TpkqtKfsGGO/xFYENDgY/eFCgoheggK+LCBZTvdQC2rE/mWDUMkAldPVf0hOVUhQRDsaUXEove2aZGsZk9L8QRc5YdHRvJ6IPFW1lFRtuC1wv3dPRCiwhFmhyFfmoGqTQAWNu+dG8XVmU9xC/qaxSA1JP202xpYDHlv9RVU6XFM+oUBuOKg3he2popeFjN8FgJFbX3p5y717bNyPRjdfs2CfPkA0D7WmBIA==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1768245802; c=relaxed/relaxed;\n\tbh=FcdmpcYl+oA1UjjHKxKQOZkUZuagf/r1xudBDiOQakY=;\n\th=From:To:Cc:Subject:Date:Message-ID:MIME-Version;\n b=YoSTMJJtJk8HfNM00SiXwcpzWSOaXZ5u8+UBwvTyrrssKFz+snk+qpGXH6Q2l/2PYwAsQwLEfbMT+uhPq4zO0miVJXAwKNusaj7Bb1DQfODRV9fYr/k7ejkpJUwQg3A5IxI77Fwo/GArTGxi6N4KRA8yTEmTzOXMnd294U3eHtSHP8kpis+CB2WEruSQwr/VWMiflfly1ibMRk7xrF4C+K28LOoHfp5x2Ykz/de+bl/a1NcZF8GhOZS1vzykB7TJbdWjjPQCv7p7ATuIMHyJWfWt0G87QWoJOk4tMRC1wRhnMk0UMV/dxJP6eKfQsz8y0OLvstXVvWDGc2j0kR11Uw==","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=saTCPIlt; dkim-atps=neutral;\n spf=pass (client-ip=172.105.4.254; helo=tor.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=1768245797;\n\tbh=ZRvP8Eu2ZYkXNX7mjnd+j5ZWmCcl5EekdaxQe1idS1w=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=saTCPIltyU6hz6OskiKaBu6wp//9dQn/pMKDiaQBrYAySSw/gaF4u8LT3tpoA/S3x\n\t HDgSfhKkzgLurULIdcYBigyg4lcTPA0P4V2A85QIA8Arxy9IjXOyd+XXCtFL4YXbbM\n\t 9eN1XlEB6jH+SGVbkxNOOg8yh5x83M4rz1na5cHoXKGVUsbJQnzdPuslpZi/xasArB\n\t hpEnTlENXpj9JzigBVXjAZGkliYF3R689fK4oBhSkVokLMBKAeehfrxQ+bbAoqbWSt\n\t LZKoAa1hg/lJBEFBdij2oE6ESJlxcUveElZZcuVwMZLC/aFoWtf16D3TqQSO55znGl\n\t ZPaaDYuTbv88g==","From":"Eric Biggers ","To":"linux-crypto@vger.kernel.org","Cc":"linux-kernel@vger.kernel.org,\n\tArd Biesheuvel ,\n\t\"Jason A . Donenfeld\" ,\n\tHerbert Xu ,\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 ,\n\tHarald Freudenberger ,\n\tEric Biggers ","Subject":"[PATCH v2 00/35] AES library improvements","Date":"Mon, 12 Jan 2026 11:19:58 -0800","Message-ID":"<20260112192035.10427-1-ebiggers@kernel.org>","X-Mailer":"git-send-email 2.52.0","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"","List-Help":"","List-Owner":"","List-Post":"","List-Archive":",\n ","List-Subscribe":",\n ,\n ","List-Unsubscribe":"","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":"This series applies to libcrypto-next. It can also be retrieved from:\n\n git fetch https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git aes-lib-v2\n\nThis series makes three main improvements to the kernel's AES library:\n\n 1. Make it use the kernel's existing architecture-optimized AES code,\n including AES instructions, when available. Previously, only the\n traditional crypto API gave access to the optimized AES code.\n (As a reminder, AES instructions typically make AES over 10 times\n as fast as the generic code. They also make it constant-time.)\n\n 2. Support preparing an AES key for only the forward direction of the\n block cipher, using about half as much memory. This is a helpful\n optimization for many common AES modes of operation. It also helps\n keep structs small enough to be allocated on the stack, especially\n considering potential future library APIs for AES modes.\n\n 3. Replace the library's generic AES implementation with a much faster\n one that is almost as fast as \"aes-generic\", while still keeping\n the table size reasonably small and maintaining some constant-time\n hardening. This allows removing \"aes-generic\", unifying the\n current two generic AES implementations in the kernel tree.\n\n(1) and (2) end up being interrelated: the existing\n'struct crypto_aes_ctx' does not work for either one (in general).\nThus, this series reworks the AES library to be based around new data\ntypes 'struct aes_key' and 'struct aes_enckey'.\n\nAs has been the case for other algorithms, to achieve (1) without\nduplicating the architecture-optimized code, it had to be moved into\nlib/crypto/ rather than copied. To allow actually removing the\narch-specific crypto_cipher \"aes\" algorithms, a consolidated \"aes-lib\"\ncrypto_cipher algorithm which simply wraps the library is also added.\nThat's most easily done with it replacing \"aes-generic\" too, so that is\ndone too. (That's another reason for doing (3) at the same time.)\n\nAs usual, care is taken to support all the existing arch-optimized code.\nThis makes it possible for users of the traditional crypto API to switch\nto the library API, which is generally much easier to use, without being\nconcerned about performance regressions.\n\nThat being said, this series only deals with the bare (single-block) AES\nlibrary. Future patchsets are expected to build on this work to provide\narchitecture-optimized library APIs for specific AES modes of operation.\n\nChanged in v2:\n- Fix missing MMU protection for aes_enc_tab and aes_dec_tab.\n (Suggested by Qingfang Deng)\n- Reduced churn by temporarily making aes_encrypt() and aes_decrypt()\n type-generic macros. (Suggested by Andrew Cooper)\n- Added Ard's Acked-by\n- Rebased onto latest libcrypto-next\n- A few other very minor tweaks, such as updating the file comment in\n aes-riscv64-glue.c\n\nEric Biggers (35):\n crypto: powerpc/aes - Rename struct aes_key\n lib/crypto: aes: Introduce improved AES library\n crypto: arm/aes-neonbs - Use AES library for single blocks\n crypto: arm/aes - Switch to aes_enc_tab[] and aes_dec_tab[]\n crypto: arm64/aes - Switch to aes_enc_tab[] and aes_dec_tab[]\n crypto: arm64/aes - Select CRYPTO_LIB_SHA256 from correct places\n crypto: aegis - Switch from crypto_ft_tab[] to aes_enc_tab[]\n crypto: aes - Remove aes-fixed-time / CONFIG_CRYPTO_AES_TI\n crypto: aes - Replace aes-generic with wrapper around lib\n lib/crypto: arm/aes: Migrate optimized code into library\n lib/crypto: arm64/aes: Migrate optimized code into library\n lib/crypto: powerpc/aes: Migrate SPE optimized code into library\n lib/crypto: powerpc/aes: Migrate POWER8 optimized code into library\n lib/crypto: riscv/aes: Migrate optimized code into library\n lib/crypto: s390/aes: Migrate optimized code into library\n lib/crypto: sparc/aes: Migrate optimized code into library\n lib/crypto: x86/aes: Add AES-NI optimization\n crypto: x86/aes - Remove the superseded AES-NI crypto_cipher\n Bluetooth: SMP: Use new AES library API\n chelsio: Use new AES library API\n net: phy: mscc: macsec: Use new AES library API\n staging: rtl8723bs: core: Use new AES library API\n crypto: arm/ghash - Use new AES library API\n crypto: arm64/ghash - Use new AES library API\n crypto: x86/aes-gcm - Use new AES library API\n crypto: ccp - Use new AES library API\n crypto: chelsio - Use new AES library API\n crypto: crypto4xx - Use new AES library API\n crypto: drbg - Use new AES library API\n crypto: inside-secure - Use new AES library API\n crypto: omap - Use new AES library API\n lib/crypto: aescfb: Use new AES library API\n lib/crypto: aesgcm: Use new AES library API\n lib/crypto: aes: Remove old AES en/decryption functions\n lib/crypto: aes: Drop 'volatile' from aes_sbox and aes_inv_sbox\n\n arch/arm/configs/milbeaut_m10v_defconfig | 1 -\n arch/arm/configs/multi_v7_defconfig | 2 +-\n arch/arm/configs/omap2plus_defconfig | 2 +-\n arch/arm/configs/pxa_defconfig | 2 +-\n arch/arm/crypto/Kconfig | 19 -\n arch/arm/crypto/Makefile | 2 -\n arch/arm/crypto/aes-cipher-glue.c | 69 -\n arch/arm/crypto/aes-cipher.h | 13 -\n arch/arm/crypto/aes-neonbs-glue.c | 29 +-\n arch/arm/crypto/ghash-ce-glue.c | 14 +-\n arch/arm64/crypto/Kconfig | 29 +-\n arch/arm64/crypto/Makefile | 6 -\n arch/arm64/crypto/aes-ce-ccm-glue.c | 2 -\n arch/arm64/crypto/aes-ce-glue.c | 178 ---\n arch/arm64/crypto/aes-ce-setkey.h | 6 -\n arch/arm64/crypto/aes-cipher-glue.c | 63 -\n arch/arm64/crypto/aes-glue.c | 2 -\n arch/arm64/crypto/ghash-ce-glue.c | 27 +-\n arch/m68k/configs/amiga_defconfig | 1 -\n arch/m68k/configs/apollo_defconfig | 1 -\n arch/m68k/configs/atari_defconfig | 1 -\n arch/m68k/configs/bvme6000_defconfig | 1 -\n arch/m68k/configs/hp300_defconfig | 1 -\n arch/m68k/configs/mac_defconfig | 1 -\n arch/m68k/configs/multi_defconfig | 1 -\n arch/m68k/configs/mvme147_defconfig | 1 -\n arch/m68k/configs/mvme16x_defconfig | 1 -\n arch/m68k/configs/q40_defconfig | 1 -\n arch/m68k/configs/sun3_defconfig | 1 -\n arch/m68k/configs/sun3x_defconfig | 1 -\n arch/powerpc/crypto/Kconfig | 2 +-\n arch/powerpc/crypto/Makefile | 9 +-\n arch/powerpc/crypto/aes-gcm-p10-glue.c | 4 +-\n arch/powerpc/crypto/aes-spe-glue.c | 88 +-\n arch/powerpc/crypto/aes.c | 134 --\n arch/powerpc/crypto/aes_cbc.c | 4 +-\n arch/powerpc/crypto/aes_ctr.c | 2 +-\n arch/powerpc/crypto/aes_xts.c | 6 +-\n arch/powerpc/crypto/aesp8-ppc.h | 22 -\n arch/powerpc/crypto/vmx.c | 10 +-\n arch/riscv/crypto/Kconfig | 2 -\n arch/riscv/crypto/aes-macros.S | 12 +-\n arch/riscv/crypto/aes-riscv64-glue.c | 81 +-\n arch/riscv/crypto/aes-riscv64-zvkned.S | 27 -\n arch/s390/configs/debug_defconfig | 2 +-\n arch/s390/configs/defconfig | 2 +-\n arch/s390/crypto/Kconfig | 2 -\n arch/s390/crypto/aes_s390.c | 113 --\n arch/sparc/crypto/Kconfig | 2 +-\n arch/sparc/crypto/Makefile | 2 +-\n arch/sparc/crypto/aes_glue.c | 140 +-\n arch/x86/crypto/Kconfig | 2 -\n arch/x86/crypto/aes-gcm-aesni-x86_64.S | 33 +-\n arch/x86/crypto/aes-gcm-vaes-avx2.S | 21 +-\n arch/x86/crypto/aes-gcm-vaes-avx512.S | 25 +-\n arch/x86/crypto/aesni-intel_asm.S | 25 -\n arch/x86/crypto/aesni-intel_glue.c | 119 +-\n crypto/Kconfig | 23 +-\n crypto/Makefile | 4 +-\n crypto/aegis.h | 2 +-\n crypto/aes.c | 66 +\n crypto/aes_generic.c | 1320 -----------------\n crypto/aes_ti.c | 83 --\n crypto/crypto_user.c | 2 +-\n crypto/df_sp80090a.c | 30 +-\n crypto/drbg.c | 12 +-\n crypto/testmgr.c | 43 +-\n drivers/char/tpm/tpm2-sessions.c | 10 +-\n drivers/crypto/amcc/crypto4xx_alg.c | 10 +-\n drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 4 +-\n drivers/crypto/chelsio/chcr_algo.c | 10 +-\n .../crypto/inside-secure/safexcel_cipher.c | 12 +-\n drivers/crypto/inside-secure/safexcel_hash.c | 14 +-\n drivers/crypto/omap-aes-gcm.c | 6 +-\n drivers/crypto/omap-aes.h | 2 +-\n drivers/crypto/starfive/jh7110-aes.c | 10 +-\n drivers/crypto/xilinx/xilinx-trng.c | 8 +-\n .../inline_crypto/ch_ipsec/chcr_ipsec.c | 4 +-\n .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 8 +-\n .../chelsio/inline_crypto/chtls/chtls_hw.c | 4 +-\n drivers/net/phy/mscc/mscc_macsec.c | 8 +-\n drivers/staging/rtl8723bs/core/rtw_security.c | 20 +-\n include/crypto/aes.h | 278 +++-\n include/crypto/df_sp80090a.h | 2 +-\n include/crypto/gcm.h | 2 +-\n lib/crypto/Kconfig | 12 +\n lib/crypto/Makefile | 43 +-\n lib/crypto/aes.c | 473 ++++--\n lib/crypto/aescfb.c | 30 +-\n lib/crypto/aesgcm.c | 12 +-\n .../crypto/arm}/aes-cipher-core.S | 4 +-\n lib/crypto/arm/aes.h | 56 +\n .../crypto => lib/crypto/arm64}/aes-ce-core.S | 0\n .../crypto/arm64}/aes-cipher-core.S | 4 +-\n lib/crypto/arm64/aes.h | 164 ++\n lib/crypto/powerpc/.gitignore | 2 +\n .../crypto/powerpc}/aes-spe-core.S | 0\n .../crypto/powerpc}/aes-spe-keys.S | 0\n .../crypto/powerpc}/aes-spe-modes.S | 0\n .../crypto/powerpc}/aes-spe-regs.h | 0\n .../crypto/powerpc}/aes-tab-4k.S | 0\n lib/crypto/powerpc/aes.h | 238 +++\n .../crypto/powerpc}/aesp8-ppc.pl | 1 +\n lib/crypto/riscv/aes-riscv64-zvkned.S | 84 ++\n lib/crypto/riscv/aes.h | 63 +\n lib/crypto/s390/aes.h | 106 ++\n lib/crypto/sparc/aes.h | 149 ++\n .../crypto => lib/crypto/sparc}/aes_asm.S | 0\n lib/crypto/x86/aes-aesni.S | 261 ++++\n lib/crypto/x86/aes.h | 85 ++\n net/bluetooth/smp.c | 8 +-\n 111 files changed, 2202 insertions(+), 2959 deletions(-)\n delete mode 100644 arch/arm/crypto/aes-cipher-glue.c\n delete mode 100644 arch/arm/crypto/aes-cipher.h\n delete mode 100644 arch/arm64/crypto/aes-ce-glue.c\n delete mode 100644 arch/arm64/crypto/aes-ce-setkey.h\n delete mode 100644 arch/arm64/crypto/aes-cipher-glue.c\n delete mode 100644 arch/powerpc/crypto/aes.c\n create mode 100644 crypto/aes.c\n delete mode 100644 crypto/aes_generic.c\n delete mode 100644 crypto/aes_ti.c\n rename {arch/arm/crypto => lib/crypto/arm}/aes-cipher-core.S (97%)\n create mode 100644 lib/crypto/arm/aes.h\n rename {arch/arm64/crypto => lib/crypto/arm64}/aes-ce-core.S (100%)\n rename {arch/arm64/crypto => lib/crypto/arm64}/aes-cipher-core.S (96%)\n create mode 100644 lib/crypto/arm64/aes.h\n create mode 100644 lib/crypto/powerpc/.gitignore\n rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-core.S (100%)\n rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-keys.S (100%)\n rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-modes.S (100%)\n rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-regs.h (100%)\n rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-tab-4k.S (100%)\n create mode 100644 lib/crypto/powerpc/aes.h\n rename {arch/powerpc/crypto => lib/crypto/powerpc}/aesp8-ppc.pl (99%)\n create mode 100644 lib/crypto/riscv/aes-riscv64-zvkned.S\n create mode 100644 lib/crypto/riscv/aes.h\n create mode 100644 lib/crypto/s390/aes.h\n create mode 100644 lib/crypto/sparc/aes.h\n rename {arch/sparc/crypto => lib/crypto/sparc}/aes_asm.S (100%)\n create mode 100644 lib/crypto/x86/aes-aesni.S\n create mode 100644 lib/crypto/x86/aes.h\n\n\nbase-commit: 959a634ebcda02e0add101024a5793323d66cda5"}