Commit f6259dea authored by Simon Arlott's avatar Simon Arlott Committed by Herbert Xu
Browse files

[CRYPTO] padlock: Remove pointless padlock module 



When this is compiled in it is run too early to do anything useful:
[    6.052000] padlock: No VIA PadLock drivers have been loaded.
[    6.052000] padlock: Using VIA PadLock ACE for AES algorithm.
[    6.052000] padlock: Using VIA PadLock ACE for SHA1/SHA256 algorithms.

When it's a module it isn't doing anything special, the same functionality 
can be provided in userspace by "probeall padlock padlock-aes padlock-sha" 
in modules.conf if it is required.

Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
Cc: Michal Ludvig <michal@logix.cz>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e196d625

drivers/crypto/Kconfig

+3 −13
Original line number Diff line number Diff line 
menu "Hardware crypto devices"



config CRYPTO_DEV_PADLOCK

	tristate "Support for VIA PadLock ACE"

	bool "Support for VIA PadLock ACE"

	depends on X86_32

	select CRYPTO_ALGAPI

	default m

	default y

	help

	  Some VIA processors come with an integrated crypto engine

	  (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -14,16 +14,6 @@ config CRYPTO_DEV_PADLOCK 
	  The instructions are used only when the CPU supports them.

	  Otherwise software encryption is used.



	  Selecting M for this option will compile a helper module

	  padlock.ko that should autoload all below configured

	  algorithms. Don't worry if your hardware does not support

	  some or all of them. In such case padlock.ko will

	  simply write a single line into the kernel log informing

	  about its failure but everything will keep working fine.



	  If you are unsure, say M. The compiled module will be

	  called padlock.ko



config CRYPTO_DEV_PADLOCK_AES

	tristate "PadLock driver for AES algorithm"

	depends on CRYPTO_DEV_PADLOCK
@@ -55,7 +45,7 @@ source "arch/s390/crypto/Kconfig" 


config CRYPTO_DEV_GEODE

	tristate "Support for the Geode LX AES engine"

	depends on CRYPTO && X86_32 && PCI

	depends on X86_32 && PCI

	select CRYPTO_ALGAPI

	select CRYPTO_BLKCIPHER

	default m

drivers/crypto/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o

obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o

obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o

obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o

drivers/crypto/padlock.c

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
/*

 * Cryptographic API.

 *

 * Support for VIA PadLock hardware crypto engine.

 *

 * Copyright (c) 2006  Michal Ludvig <michal@logix.cz>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 */



#include <linux/module.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/crypto.h>

#include <linux/cryptohash.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/scatterlist.h>

#include "padlock.h"



static int __init padlock_init(void)

{

	int success = 0;



	if (crypto_has_cipher("aes-padlock", 0, 0))

		success++;



	if (crypto_has_hash("sha1-padlock", 0, 0))

		success++;



	if (crypto_has_hash("sha256-padlock", 0, 0))

		success++;



	if (!success) {

		printk(KERN_WARNING PFX "No VIA PadLock drivers have been loaded.\n");

		return -ENODEV;

	}



	printk(KERN_NOTICE PFX "%d drivers are available.\n", success);



	return 0;

}



static void __exit padlock_fini(void)

{

}



module_init(padlock_init);

module_exit(padlock_fini);



MODULE_DESCRIPTION("Load all configured PadLock algorithms.");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Michal Ludvig");

CRA Git | Maintained and supported by SUSTech CRA and CCSE