crypto: hash - select CRYPTO_HASH where needed

Message ID 1453740685-1980366-1-git-send-email-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann Jan. 25, 2016, 4:51 p.m.
The ghash and poly1305 hash implementations can be enabled when
CONFIG_CRYPTO_HASH is turned off, causing a link error:

crypto/built-in.o: In function `ghash_mod_init':
(.init.text+0xd0): undefined reference to `crypto_register_shash'
crypto/built-in.o: In function `ghash_mod_exit':
(.exit.text+0xb4): undefined reference to `crypto_unregister_shash'
crypto/built-in.o: In function `poly1305_mod_init':
(.init.text+0xb4): undefined reference to `crypto_register_shash'
crypto/built-in.o: In function `poly1305_mod_exit':
(.exit.text+0x98): undefined reference to `crypto_unregister_shash'

This adds an explicit 'select', like all other hashes have it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 crypto/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.7.0

Comments

Herbert Xu Jan. 26, 2016, 2:48 p.m. | #1
On Mon, Jan 25, 2016 at 05:51:21PM +0100, Arnd Bergmann wrote:
> The ghash and poly1305 hash implementations can be enabled when

> CONFIG_CRYPTO_HASH is turned off, causing a link error:

> 

> crypto/built-in.o: In function `ghash_mod_init':

> (.init.text+0xd0): undefined reference to `crypto_register_shash'

> crypto/built-in.o: In function `ghash_mod_exit':

> (.exit.text+0xb4): undefined reference to `crypto_unregister_shash'

> crypto/built-in.o: In function `poly1305_mod_init':

> (.init.text+0xb4): undefined reference to `crypto_register_shash'

> crypto/built-in.o: In function `poly1305_mod_exit':

> (.exit.text+0x98): undefined reference to `crypto_unregister_shash'

> 

> This adds an explicit 'select', like all other hashes have it.

> 

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Patch

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 99109b93604a..2d76676a1253 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -472,11 +472,13 @@  config CRYPTO_CRCT10DIF_PCLMUL
 config CRYPTO_GHASH
 	tristate "GHASH digest algorithm"
 	select CRYPTO_GF128MUL
+	select CRYPTO_HASH
 	help
 	  GHASH is message digest algorithm for GCM (Galois/Counter Mode).
 
 config CRYPTO_POLY1305
 	tristate "Poly1305 authenticator algorithm"
+	select CRYPTO_HASH
 	help
 	  Poly1305 authenticator algorithm, RFC7539.