forked from mirrors/linux
		
	Commit5d26a105b5("crypto: prefix module autoloading with "crypto-"") changed the automatic module loading when requesting crypto algorithms to prefix all module requests with "crypto-". This requires all crypto modules to have a crypto specific module alias even if their file name would otherwise match the requested crypto algorithm. Even though commit5d26a105b5added those aliases for a vast amount of modules, it was missing a few. Add the required MODULE_ALIAS_CRYPTO annotations to those files to make them get loaded automatically, again. This fixes, e.g., requesting 'ecb(blowfish-generic)', which used to work with kernels v3.18 and below. Also change MODULE_ALIAS() lines to MODULE_ALIAS_CRYPTO(). The former won't work for crypto modules any more. Fixes:5d26a105b5("crypto: prefix module autoloading with "crypto-"") Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
		
			
				
	
	
		
			66 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			66 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * RNG implementation using standard kernel RNG.
 | 
						|
 *
 | 
						|
 * Copyright (c) 2008 Herbert Xu <herbert@gondor.apana.org.au>
 | 
						|
 *
 | 
						|
 * 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
 | 
						|
 * any later version.
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <crypto/internal/rng.h>
 | 
						|
#include <linux/err.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/random.h>
 | 
						|
 | 
						|
static int krng_get_random(struct crypto_rng *tfm, u8 *rdata, unsigned int dlen)
 | 
						|
{
 | 
						|
	get_random_bytes(rdata, dlen);
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int krng_reset(struct crypto_rng *tfm, u8 *seed, unsigned int slen)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static struct crypto_alg krng_alg = {
 | 
						|
	.cra_name		= "stdrng",
 | 
						|
	.cra_driver_name	= "krng",
 | 
						|
	.cra_priority		= 200,
 | 
						|
	.cra_flags		= CRYPTO_ALG_TYPE_RNG,
 | 
						|
	.cra_ctxsize		= 0,
 | 
						|
	.cra_type		= &crypto_rng_type,
 | 
						|
	.cra_module		= THIS_MODULE,
 | 
						|
	.cra_u			= {
 | 
						|
		.rng = {
 | 
						|
			.rng_make_random	= krng_get_random,
 | 
						|
			.rng_reset		= krng_reset,
 | 
						|
			.seedsize		= 0,
 | 
						|
		}
 | 
						|
	}
 | 
						|
};
 | 
						|
 | 
						|
 | 
						|
/* Module initalization */
 | 
						|
static int __init krng_mod_init(void)
 | 
						|
{
 | 
						|
	return crypto_register_alg(&krng_alg);
 | 
						|
}
 | 
						|
 | 
						|
static void __exit krng_mod_fini(void)
 | 
						|
{
 | 
						|
	crypto_unregister_alg(&krng_alg);
 | 
						|
	return;
 | 
						|
}
 | 
						|
 | 
						|
module_init(krng_mod_init);
 | 
						|
module_exit(krng_mod_fini);
 | 
						|
 | 
						|
MODULE_LICENSE("GPL");
 | 
						|
MODULE_DESCRIPTION("Kernel Random Number Generator");
 | 
						|
MODULE_ALIAS_CRYPTO("stdrng");
 | 
						|
MODULE_ALIAS_CRYPTO("krng");
 |