diff options
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/curve25519.h | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/include/crypto/curve25519.h b/include/crypto/curve25519.h index 4e6dc840b159..9ecb3c1f0f15 100644 --- a/include/crypto/curve25519.h +++ b/include/crypto/curve25519.h @@ -33,7 +33,8 @@ 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)) +	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519) && +	    (!IS_ENABLED(CONFIG_CRYPTO_CURVE25519_X86) || IS_ENABLED(CONFIG_AS_ADX)))  		curve25519_arch(mypublic, secret, basepoint);  	else  		curve25519_generic(mypublic, secret, basepoint); @@ -49,7 +50,8 @@ __must_check curve25519_generate_public(u8 pub[CURVE25519_KEY_SIZE],  				    CURVE25519_KEY_SIZE)))  		return false; -	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519)) +	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519) && +	    (!IS_ENABLED(CONFIG_CRYPTO_CURVE25519_X86) || IS_ENABLED(CONFIG_AS_ADX)))  		curve25519_base_arch(pub, secret);  	else  		curve25519_generic(pub, secret, curve25519_base_point); |