mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
crypto: fips - make proc files report fips module name and version
FIPS 140-3 introduced a requirement for the FIPS module to return information about itself, specifically a name and a version. These values must match the values reported on FIPS certificates. This patch adds two files to read a name and a version from: /proc/sys/crypto/fips_name /proc/sys/crypto/fips_version v2: removed redundant parentheses in config entries. v3: move FIPS_MODULE_* defines to fips.c where they are used. v4: return utsrelease.h inclusion Signed-off-by: Simo Sorce <simo@redhat.com> Signed-off-by: Vladis Dronov <vdronov@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
committed by
Herbert Xu
parent
1353e576ae
commit
5a44749f65
@@ -12,6 +12,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/sysctl.h>
|
||||
#include <linux/notifier.h>
|
||||
#include <generated/utsrelease.h>
|
||||
|
||||
int fips_enabled;
|
||||
EXPORT_SYMBOL_GPL(fips_enabled);
|
||||
@@ -30,13 +31,37 @@ static int fips_enable(char *str)
|
||||
|
||||
__setup("fips=", fips_enable);
|
||||
|
||||
#define FIPS_MODULE_NAME CONFIG_CRYPTO_FIPS_NAME
|
||||
#ifdef CONFIG_CRYPTO_FIPS_CUSTOM_VERSION
|
||||
#define FIPS_MODULE_VERSION CONFIG_CRYPTO_FIPS_VERSION
|
||||
#else
|
||||
#define FIPS_MODULE_VERSION UTS_RELEASE
|
||||
#endif
|
||||
|
||||
static char fips_name[] = FIPS_MODULE_NAME;
|
||||
static char fips_version[] = FIPS_MODULE_VERSION;
|
||||
|
||||
static struct ctl_table crypto_sysctl_table[] = {
|
||||
{
|
||||
.procname = "fips_enabled",
|
||||
.data = &fips_enabled,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0444,
|
||||
.proc_handler = proc_dointvec
|
||||
.procname = "fips_enabled",
|
||||
.data = &fips_enabled,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0444,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.procname = "fips_name",
|
||||
.data = &fips_name,
|
||||
.maxlen = 64,
|
||||
.mode = 0444,
|
||||
.proc_handler = proc_dostring
|
||||
},
|
||||
{
|
||||
.procname = "fips_version",
|
||||
.data = &fips_version,
|
||||
.maxlen = 64,
|
||||
.mode = 0444,
|
||||
.proc_handler = proc_dostring
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
Reference in New Issue
Block a user