mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	Continuing from this commit: 52f5684c8e
("kernel: use macros from compiler.h instead of __attribute__((...))")
I submitted 4 total patches. They are part of task I've taken up to
increase compiler portability in the kernel. I've cleaned up the
subsystems under /kernel /mm /block and /security, this patch targets
/crypto.
There is <linux/compiler.h> which provides macros for various gcc specific
constructs. Eg: __weak for __attribute__((weak)). I've cleaned all
instances of gcc specific attributes with the right macros for the crypto
subsystem.
I had to make one additional change into compiler-gcc.h for the case when
one wants to use this: __attribute__((aligned) and not specify an alignment
factor. From the gcc docs, this will result in the largest alignment for
that data type on the target machine so I've named the macro
__aligned_largest. Please advise if another name is more appropriate.
Signed-off-by: Gideon Israel Dsouza <gidisrael@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
		
	
			
		
			
				
	
	
		
			149 lines
		
	
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			149 lines
		
	
	
	
		
			3.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Public Key Encryption
 | 
						|
 *
 | 
						|
 * Copyright (c) 2015, Intel Corporation
 | 
						|
 * Authors: Tadeusz Struk <tadeusz.struk@intel.com>
 | 
						|
 *
 | 
						|
 * 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/errno.h>
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/seq_file.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
#include <linux/string.h>
 | 
						|
#include <linux/crypto.h>
 | 
						|
#include <linux/compiler.h>
 | 
						|
#include <crypto/algapi.h>
 | 
						|
#include <linux/cryptouser.h>
 | 
						|
#include <net/netlink.h>
 | 
						|
#include <crypto/akcipher.h>
 | 
						|
#include <crypto/internal/akcipher.h>
 | 
						|
#include "internal.h"
 | 
						|
 | 
						|
#ifdef CONFIG_NET
 | 
						|
static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 | 
						|
{
 | 
						|
	struct crypto_report_akcipher rakcipher;
 | 
						|
 | 
						|
	strncpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
 | 
						|
 | 
						|
	if (nla_put(skb, CRYPTOCFGA_REPORT_AKCIPHER,
 | 
						|
		    sizeof(struct crypto_report_akcipher), &rakcipher))
 | 
						|
		goto nla_put_failure;
 | 
						|
	return 0;
 | 
						|
 | 
						|
nla_put_failure:
 | 
						|
	return -EMSGSIZE;
 | 
						|
}
 | 
						|
#else
 | 
						|
static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 | 
						|
{
 | 
						|
	return -ENOSYS;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg)
 | 
						|
	__maybe_unused;
 | 
						|
 | 
						|
static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg)
 | 
						|
{
 | 
						|
	seq_puts(m, "type         : akcipher\n");
 | 
						|
}
 | 
						|
 | 
						|
static void crypto_akcipher_exit_tfm(struct crypto_tfm *tfm)
 | 
						|
{
 | 
						|
	struct crypto_akcipher *akcipher = __crypto_akcipher_tfm(tfm);
 | 
						|
	struct akcipher_alg *alg = crypto_akcipher_alg(akcipher);
 | 
						|
 | 
						|
	alg->exit(akcipher);
 | 
						|
}
 | 
						|
 | 
						|
static int crypto_akcipher_init_tfm(struct crypto_tfm *tfm)
 | 
						|
{
 | 
						|
	struct crypto_akcipher *akcipher = __crypto_akcipher_tfm(tfm);
 | 
						|
	struct akcipher_alg *alg = crypto_akcipher_alg(akcipher);
 | 
						|
 | 
						|
	if (alg->exit)
 | 
						|
		akcipher->base.exit = crypto_akcipher_exit_tfm;
 | 
						|
 | 
						|
	if (alg->init)
 | 
						|
		return alg->init(akcipher);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void crypto_akcipher_free_instance(struct crypto_instance *inst)
 | 
						|
{
 | 
						|
	struct akcipher_instance *akcipher = akcipher_instance(inst);
 | 
						|
 | 
						|
	akcipher->free(akcipher);
 | 
						|
}
 | 
						|
 | 
						|
static const struct crypto_type crypto_akcipher_type = {
 | 
						|
	.extsize = crypto_alg_extsize,
 | 
						|
	.init_tfm = crypto_akcipher_init_tfm,
 | 
						|
	.free = crypto_akcipher_free_instance,
 | 
						|
#ifdef CONFIG_PROC_FS
 | 
						|
	.show = crypto_akcipher_show,
 | 
						|
#endif
 | 
						|
	.report = crypto_akcipher_report,
 | 
						|
	.maskclear = ~CRYPTO_ALG_TYPE_MASK,
 | 
						|
	.maskset = CRYPTO_ALG_TYPE_MASK,
 | 
						|
	.type = CRYPTO_ALG_TYPE_AKCIPHER,
 | 
						|
	.tfmsize = offsetof(struct crypto_akcipher, base),
 | 
						|
};
 | 
						|
 | 
						|
int crypto_grab_akcipher(struct crypto_akcipher_spawn *spawn, const char *name,
 | 
						|
			 u32 type, u32 mask)
 | 
						|
{
 | 
						|
	spawn->base.frontend = &crypto_akcipher_type;
 | 
						|
	return crypto_grab_spawn(&spawn->base, name, type, mask);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(crypto_grab_akcipher);
 | 
						|
 | 
						|
struct crypto_akcipher *crypto_alloc_akcipher(const char *alg_name, u32 type,
 | 
						|
					      u32 mask)
 | 
						|
{
 | 
						|
	return crypto_alloc_tfm(alg_name, &crypto_akcipher_type, type, mask);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(crypto_alloc_akcipher);
 | 
						|
 | 
						|
static void akcipher_prepare_alg(struct akcipher_alg *alg)
 | 
						|
{
 | 
						|
	struct crypto_alg *base = &alg->base;
 | 
						|
 | 
						|
	base->cra_type = &crypto_akcipher_type;
 | 
						|
	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
 | 
						|
	base->cra_flags |= CRYPTO_ALG_TYPE_AKCIPHER;
 | 
						|
}
 | 
						|
 | 
						|
int crypto_register_akcipher(struct akcipher_alg *alg)
 | 
						|
{
 | 
						|
	struct crypto_alg *base = &alg->base;
 | 
						|
 | 
						|
	akcipher_prepare_alg(alg);
 | 
						|
	return crypto_register_alg(base);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(crypto_register_akcipher);
 | 
						|
 | 
						|
void crypto_unregister_akcipher(struct akcipher_alg *alg)
 | 
						|
{
 | 
						|
	crypto_unregister_alg(&alg->base);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(crypto_unregister_akcipher);
 | 
						|
 | 
						|
int akcipher_register_instance(struct crypto_template *tmpl,
 | 
						|
			       struct akcipher_instance *inst)
 | 
						|
{
 | 
						|
	akcipher_prepare_alg(&inst->alg);
 | 
						|
	return crypto_register_instance(tmpl, akcipher_crypto_instance(inst));
 | 
						|
}
 | 
						|
EXPORT_SYMBOL_GPL(akcipher_register_instance);
 | 
						|
 | 
						|
MODULE_LICENSE("GPL");
 | 
						|
MODULE_DESCRIPTION("Generic public key cipher type");
 |