Merge tag 'dma-mapping-5.6' of git://git.infradead.org/users/hch/dma-mapping

[linux.git] / lib / crypto / Makefile

diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 34a701ab8b92ea12e67440e096c45bd43fa3e15c..3a435629d9ce9c4806f75068d1891dad411556e6 100644 (file)
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -19,16 +19,21 @@ libblake2s-y                                        += blake2s.o
 obj-$(CONFIG_CRYPTO_LIB_CHACHA20POLY1305)      += libchacha20poly1305.o
 libchacha20poly1305-y                          += chacha20poly1305.o
 
-obj-$(CONFIG_CRYPTO_LIB_CURVE25519_GENERIC)    += libcurve25519.o
-libcurve25519-y                                        := curve25519-fiat32.o
-libcurve25519-$(CONFIG_ARCH_SUPPORTS_INT128)   := curve25519-hacl64.o
+obj-$(CONFIG_CRYPTO_LIB_CURVE25519_GENERIC)    += libcurve25519-generic.o
+libcurve25519-generic-y                                := curve25519-fiat32.o
+libcurve25519-generic-$(CONFIG_ARCH_SUPPORTS_INT128)   := curve25519-hacl64.o
+libcurve25519-generic-y                                += curve25519-generic.o
+
+obj-$(CONFIG_CRYPTO_LIB_CURVE25519)            += libcurve25519.o
 libcurve25519-y                                        += curve25519.o
 
 obj-$(CONFIG_CRYPTO_LIB_DES)                   += libdes.o
 libdes-y                                       := des.o
 
 obj-$(CONFIG_CRYPTO_LIB_POLY1305_GENERIC)      += libpoly1305.o
-libpoly1305-y                                  := poly1305.o
+libpoly1305-y                                  := poly1305-donna32.o
+libpoly1305-$(CONFIG_ARCH_SUPPORTS_INT128)     := poly1305-donna64.o
+libpoly1305-y                                  += poly1305.o
 
 obj-$(CONFIG_CRYPTO_LIB_SHA256)                        += libsha256.o
 libsha256-y                                    := sha256.o
@@ -36,4 +41,5 @@ libsha256-y                                   := sha256.o
 ifneq ($(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS),y)
 libblake2s-y                                   += blake2s-selftest.o
 libchacha20poly1305-y                          += chacha20poly1305-selftest.o
+libcurve25519-y                                        += curve25519-selftest.o
 endif