crypto: fips - make proc files report fips module name and version
PATCH 1/1 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
--- crypto/Kconfig | 21 +++++++++++++++++++++ crypto/fips.c | 27 ++++++++++++++++++++++----- include/linux/fips.h | 9 +++++++++ 3 files changed, 52 insertions(+), 5 deletions(-)
crypto/Kconfig +21 -0
@@ -33,6 +33,27 @@ config CRYPTO_FIPS certification. You should say no unless you know what this is. +config CRYPTO_FIPS_NAME + string "FIPS Module Name" + default "Linux Kernel Cryptographic API" + depends on (CRYPTO_FIPS) + help + This option sets the FIPS Module name reported by the Crypto API via + the /proc/sys/crypto/fips_name file. + +config CRYPTO_FIPS_CUSTOM_VERSION + bool "Use Custom FIPS Module Version" + depends on (CRYPTO_FIPS) + default n + +config CRYPTO_FIPS_VERSION + string "FIPS Module Version" + default "(none)" + depends on (CRYPTO_FIPS_CUSTOM_VERSION) + help + This option provides the ability to override the FIPS Module Version. + By default the KERNELRELEASE value is used. + config CRYPTO_ALGAPI tristate select CRYPTO_ALGAPI2
crypto/fips.c +22 -5
@@ -30,13 +30,30 @@ static int fips_enable(char *str)__setup ("fips=" , fips_enable); +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 }, {} };
include/linux/fips.h +9 -0
@@ -2,10 +2,19 @@#ifndef _FIPS_H#define _FIPS_H +#include <generated/utsrelease.h> +#ifdef CONFIG_CRYPTO_FIPS extern int fips_enabled;extern struct atomic_notifier_head fips_fail_notif_chain; +#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 +void fips_fail_notify (void );#else
Signature · 1 line
2.36.1
Hi--
crypto/Kconfig config CRYPTO_FIPS · line 39
Quoted 12 lines · Vladis Dronov
crypto/Kconfig +4
-0@@ -33,6 +33,27 @@ config CRYPTO_FIPS certification. You should say no unless you know what this is. +config CRYPTO_FIPS_NAME + string "FIPS Module Name" + default "Linux Kernel Cryptographic API" + depends on (CRYPTO_FIPS)
No parentheses.
crypto/Kconfig config CRYPTO_FIPS · line 46
Quoted 7 lines
crypto/Kconfig +7
-0+ help + This option sets the FIPS Module name reported by the Crypto API via + the /proc/sys/crypto/fips_name file. + +config CRYPTO_FIPS_CUSTOM_VERSION + bool "Use Custom FIPS Module Version" + depends on (CRYPTO_FIPS)
Ditto.
crypto/Kconfig config CRYPTO_FIPS · line 52
Quoted 6 lines
crypto/Kconfig +6
-0+ default n + +config CRYPTO_FIPS_VERSION + string "FIPS Module Version" + default "(none)" + depends on (CRYPTO_FIPS_CUSTOM_VERSION)
Ditto.
Quoted 3 lines
crypto/Kconfig +3
-0+ help + This option provides the ability to override the FIPS Module Version. + By default the KERNELRELEASE value is used.
Signature · 1 line
~Randy
Hi,
Quoted 38 lines · Randy Dunlap
Hi--
crypto/Kconfig config CRYPTO_FIPS · line 39
Quoted 12 lines · Vladis Dronov
crypto/Kconfig +4
-0@@ -33,6 +33,27 @@ config CRYPTO_FIPS certification. You should say no unless you know what this is. +config CRYPTO_FIPS_NAME + string "FIPS Module Name" + default "Linux Kernel Cryptographic API" + depends on (CRYPTO_FIPS)No parentheses.
crypto/Kconfig config CRYPTO_FIPS · line 46
Quoted 7 lines
crypto/Kconfig +7
-0+ help + This option sets the FIPS Module name reported by the Crypto API via + the /proc/sys/crypto/fips_name file. + +config CRYPTO_FIPS_CUSTOM_VERSION + bool "Use Custom FIPS Module Version" + depends on (CRYPTO_FIPS)Ditto.
crypto/Kconfig config CRYPTO_FIPS · line 52
Quoted 6 lines
crypto/Kconfig +6
-0+ default n + +config CRYPTO_FIPS_VERSION + string "FIPS Module Version" + default "(none)" + depends on (CRYPTO_FIPS_CUSTOM_VERSION)Ditto.
Quoted 6 lines
crypto/Kconfig config CRYPTO_FIPS · line 55
Quoted 3 lines
crypto/Kconfig +3
-0+ help + This option provides the ability to override the FIPS Module Version. + By default the KERNELRELEASE value is used.--
~Randy
Oh dang, indeed. Thanks, Randy.
Let me post v2 to this same thread to reduce separate threads.
Best regards,
Vladis Dronov | Red Hat, Inc. | The Core Kernel | Senior Software Engineer
PATCH v2 1/1 crypto: fips - make proc files report fips module name and version
In reply to Vladis DronovFIPS 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.
--- crypto/Kconfig | 21 +++++++++++++++++++++ crypto/fips.c | 27 ++++++++++++++++++++++----- include/linux/fips.h | 9 +++++++++ 3 files changed, 52 insertions(+), 5 deletions(-)
crypto/Kconfig +21 -0
@@ -33,6 +33,27 @@ config CRYPTO_FIPS certification. You should say no unless you know what this is. +config CRYPTO_FIPS_NAME + string "FIPS Module Name" + default "Linux Kernel Cryptographic API" + depends on CRYPTO_FIPS + help + This option sets the FIPS Module name reported by the Crypto API via + the /proc/sys/crypto/fips_name file. + +config CRYPTO_FIPS_CUSTOM_VERSION + bool "Use Custom FIPS Module Version" + depends on CRYPTO_FIPS + default n + +config CRYPTO_FIPS_VERSION + string "FIPS Module Version" + default "(none)" + depends on CRYPTO_FIPS_CUSTOM_VERSION + help + This option provides the ability to override the FIPS Module Version. + By default the KERNELRELEASE value is used. + config CRYPTO_ALGAPI tristate select CRYPTO_ALGAPI2
crypto/fips.c +22 -5
@@ -30,13 +30,30 @@ static int fips_enable(char *str)__setup ("fips=" , fips_enable); +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 }, {} };
include/linux/fips.h +9 -0
@@ -2,10 +2,19 @@#ifndef _FIPS_H#define _FIPS_H +#include <generated/utsrelease.h> +#ifdef CONFIG_CRYPTO_FIPS extern int fips_enabled;extern struct atomic_notifier_head fips_fail_notif_chain; +#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 +void fips_fail_notify (void );#else
Signature · 1 line
2.36.1
Herbert Xu
maintainerQuoted 11 lines · Vladis Dronov
include/linux/fips.h +2
-0@@ -2,10 +2,19 @@#ifndef _FIPS_H#define _FIPS_H +#include <generated/utsrelease.h> +
include/linux/fips.h line 16
Quoted 10 lines
include/linux/fips.h +6
-0#ifdef CONFIG_CRYPTO_FIPS extern int fips_enabled;extern struct atomic_notifier_head fips_fail_notif_chain; +#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
Why does this need to be in fips.h? If it's only used by one file then it should be moved to the place where it's used.
Thanks,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi, Herbert,
Quoted 7 lines · Herbert Xu
Quoted 5 lines · Vladis Dronov
#ifdef
CONFIG_CRYPTO_FIPS
extern intfips_enabled;
extern structatomic_notifier_headfips_fail_notif_chain;
Quoted 9 lines
include/linux/fips.h line 16
Quoted 6 lines
include/linux/fips.h +6
-0+#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 Why does this need to be in
fips.h? If it's only used by one file then it should be moved to the place where it's used.
Indeed, you are right, these defines are used only once, thank you. I'll move them to fips.c. Let me post v3 to this same thread below.
Just a heads-up, a kernel with this patch builds, boots and a FIPS output is correct.
Best regards,
Vladis Dronov | Red Hat, Inc. | The Core Kernel | Senior Software Engineer
PATCH v3 1/1 crypto: fips - make proc files report fips module name and version
In reply to Vladis DronovFIPS 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.
--- crypto/Kconfig | 21 +++++++++++++++++++++ crypto/fips.c | 34 +++++++++++++++++++++++++++++----- 2 files changed, 50 insertions(+), 5 deletions(-)
crypto/Kconfig +21 -0
@@ -33,6 +33,27 @@ config CRYPTO_FIPS certification. You should say no unless you know what this is. +config CRYPTO_FIPS_NAME + string "FIPS Module Name" + default "Linux Kernel Cryptographic API" + depends on CRYPTO_FIPS + help + This option sets the FIPS Module name reported by the Crypto API via + the /proc/sys/crypto/fips_name file. + +config CRYPTO_FIPS_CUSTOM_VERSION + bool "Use Custom FIPS Module Version" + depends on CRYPTO_FIPS + default n + +config CRYPTO_FIPS_VERSION + string "FIPS Module Version" + default "(none)" + depends on CRYPTO_FIPS_CUSTOM_VERSION + help + This option provides the ability to override the FIPS Module Version. + By default the KERNELRELEASE value is used. + config CRYPTO_ALGAPI tristate select CRYPTO_ALGAPI2
crypto/fips.c +29 -5
@@ -30,13 +30,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 }, {} };
Signature · 1 line
2.36.1
Herbert Xu
maintainerQuoted 8 lines · Vladis Dronov
crypto/fips.c +0
-0@@ -30,13 +30,37 @@ static int fips_enable(char *str)__setup ("fips=" , fips_enable);
crypto/fips.c static int fips_enable(char *str) · line 41
Quoted 10 lines
crypto/fips.c +9
-0+#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 ;
This doesn't compile for me because you need to include generated/utsrelease.h.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi, Herbert,
Quoted 11 lines · Herbert Xu
Quoted 9 lines · Vladis Dronov
crypto/fips.c +0
-0@@ -30,13 +30,37 @@ static int fips_enable(char *str)__setup ("fips=" , fips_enable);
Quoted 12 lines
crypto/fips.c static int fips_enable(char *str) · line 41
Quoted 9 lines
crypto/fips.c +9
-0+#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 ;This doesn't compile for me because you need to include
generated/utsrelease.h.
Dang, it does not build now indeed. I'm not sure how my previous build succeeded so I've assumed utsrelease.h is included in fips.c via some other .h file.
I've posted v4 to this same thread below, it just adds the "#include <generated/utsrelease.h>" line.
I'm sorry for the noise.
Best regards,
Vladis Dronov | Red Hat, Inc. | The Core Kernel | Senior Software Engineer
PATCH v4 1/1 crypto: fips - make proc files report fips module name and version
In reply to Vladis DronovFIPS 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
--- crypto/Kconfig | 21 +++++++++++++++++++++ crypto/fips.c | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 5 deletions(-)
crypto/Kconfig +21 -0
@@ -33,6 +33,27 @@ config CRYPTO_FIPS certification. You should say no unless you know what this is. +config CRYPTO_FIPS_NAME + string "FIPS Module Name" + default "Linux Kernel Cryptographic API" + depends on CRYPTO_FIPS + help + This option sets the FIPS Module name reported by the Crypto API via + the /proc/sys/crypto/fips_name file. + +config CRYPTO_FIPS_CUSTOM_VERSION + bool "Use Custom FIPS Module Version" + depends on CRYPTO_FIPS + default n + +config CRYPTO_FIPS_VERSION + string "FIPS Module Version" + default "(none)" + depends on CRYPTO_FIPS_CUSTOM_VERSION + help + This option provides the ability to override the FIPS Module Version. + By default the KERNELRELEASE value is used. + config CRYPTO_ALGAPI tristate select CRYPTO_ALGAPI2
crypto/fips.c +30 -5
@@ -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 }, {} };
Signature · 1 line
2.36.1
Herbert Xu
maintainerQuoted 13 lines · Vladis Dronov
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_versionv2: removed redundant parentheses in config entries.
v3: move FIPS_MODULE_* defines tofips.cwhere they are used.
v4: returnutsrelease.hinclusion
Quoted 6 lines
Signed-off-by Simo Sorce <[email protected]>Signed-off-by Vladis Dronov <[email protected]>--- crypto/Kconfig | 21 +++++++++++++++++++++ crypto/fips.c | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 5 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt