Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux
Pull crypto library fixes from Eric Biggers:
"Fix a regression where 'make clean' stopped removing some of the
generated assembly files on arm and arm64"
* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
lib/crypto: ensure generated *.S files are removed on make clean
lib/crypto: sha: Update Kconfig help for SHA1 and SHA256
+9
-9
+5
-5
lib/crypto/Kconfig
+5
-5
lib/crypto/Kconfig
···
140
140
config CRYPTO_LIB_SHA1
141
141
tristate
142
142
help
143
-
The SHA-1 library functions. Select this if your module uses any of
144
-
the functions from <crypto/sha1.h>.
143
+
The SHA-1 and HMAC-SHA1 library functions. Select this if your module
144
+
uses any of the functions from <crypto/sha1.h>.
145
145
146
146
config CRYPTO_LIB_SHA1_ARCH
147
147
bool
···
157
157
config CRYPTO_LIB_SHA256
158
158
tristate
159
159
help
160
-
Enable the SHA-256 library interface. This interface may be fulfilled
161
-
by either the generic implementation or an arch-specific one, if one
162
-
is available and enabled.
160
+
The SHA-224, SHA-256, HMAC-SHA224, and HMAC-SHA256 library functions.
161
+
Select this if your module uses any of these functions from
162
+
<crypto/sha2.h>.
163
163
164
164
config CRYPTO_LIB_SHA256_ARCH
165
165
bool
+4
-4
lib/crypto/Makefile
+4
-4
lib/crypto/Makefile
···
100
100
libsha256-y += arm/sha256-ce.o arm/sha256-core.o
101
101
$(obj)/arm/sha256-core.S: $(src)/arm/sha256-armv4.pl
102
102
$(call cmd,perlasm)
103
-
clean-files += arm/sha256-core.S
104
103
AFLAGS_arm/sha256-core.o += $(aflags-thumb2-y)
105
104
endif
106
105
···
107
108
libsha256-y += arm64/sha256-core.o
108
109
$(obj)/arm64/sha256-core.S: $(src)/arm64/sha2-armv8.pl
109
110
$(call cmd,perlasm_with_args)
110
-
clean-files += arm64/sha256-core.S
111
111
libsha256-$(CONFIG_KERNEL_MODE_NEON) += arm64/sha256-ce.o
112
112
endif
113
113
···
130
132
libsha512-y += arm/sha512-core.o
131
133
$(obj)/arm/sha512-core.S: $(src)/arm/sha512-armv4.pl
132
134
$(call cmd,perlasm)
133
-
clean-files += arm/sha512-core.S
134
135
AFLAGS_arm/sha512-core.o += $(aflags-thumb2-y)
135
136
endif
136
137
···
137
140
libsha512-y += arm64/sha512-core.o
138
141
$(obj)/arm64/sha512-core.S: $(src)/arm64/sha2-armv8.pl
139
142
$(call cmd,perlasm_with_args)
140
-
clean-files += arm64/sha512-core.S
141
143
libsha512-$(CONFIG_KERNEL_MODE_NEON) += arm64/sha512-ce-core.o
142
144
endif
143
145
···
163
167
obj-$(CONFIG_RISCV) += riscv/
164
168
obj-$(CONFIG_S390) += s390/
165
169
obj-$(CONFIG_X86) += x86/
170
+
171
+
# clean-files must be defined unconditionally
172
+
clean-files += arm/sha256-core.S arm/sha512-core.S
173
+
clean-files += arm64/sha256-core.S arm64/sha512-core.S