| Message ID | 20200324084821.29944-14-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86, crypto: remove always-defined CONFIG_AS_* and cosolidate Kconfig/Makefiles | expand |
On Tue, Mar 24, 2020 at 05:48:18PM +0900, Masahiro Yamada wrote: > From: "Jason A. Donenfeld" <Jason@zx2c4.com> > > Since we're doing a static inline dispatch here, we normally branch > based on whether or not there's an arch implementation. That would have > been fine in general, except the crypto Makefile prior used to turn > things off -- despite the Kconfig -- resulting in us needing to also > hard code various assembler things into the dispatcher too. The horror! > Now that the assembler config options are done by Kconfig, we can get > rid of the inconsistency. > > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > include/crypto/curve25519.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/include/crypto/curve25519.h b/include/crypto/curve25519.h index 9ecb3c1f0f15..4e6dc840b159 100644 --- a/include/crypto/curve25519.h +++ b/include/crypto/curve25519.h @@ -33,8 +33,7 @@ bool __must_check curve25519(u8 mypublic[CURVE25519_KEY_SIZE], const u8 secret[CURVE25519_KEY_SIZE], const u8 basepoint[CURVE25519_KEY_SIZE]) { - if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519) && - (!IS_ENABLED(CONFIG_CRYPTO_CURVE25519_X86) || IS_ENABLED(CONFIG_AS_ADX))) + if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519)) curve25519_arch(mypublic, secret, basepoint); else curve25519_generic(mypublic, secret, basepoint); @@ -50,8 +49,7 @@ __must_check curve25519_generate_public(u8 pub[CURVE25519_KEY_SIZE], CURVE25519_KEY_SIZE))) return false; - if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519) && - (!IS_ENABLED(CONFIG_CRYPTO_CURVE25519_X86) || IS_ENABLED(CONFIG_AS_ADX))) + if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519)) curve25519_base_arch(pub, secret); else curve25519_generic(pub, secret, curve25519_base_point);