Check codeSigning extended key usage extension
Subsystems (5)
v8 cover Check codeSigning extended key usage extension
NIAP PP_OS certification requests that the OS shall validate the CodeSigning extended key usage extension field for integrity verifiction of exectable code:
https://www.niap-ccevs.org/MMO/PP/-442-/ FIA_X509_EXT.1.1
This patchset adds the logic for parsing the codeSigning EKU extension field in X.509. And checking the CodeSigning EKU when verifying signature of kernel module or kexec PE binary in PKCS#7.
v8:
- Fixed the bug of is_key_on_revocation_list() when CONFIG_SYSTEM_REVOCATION_LIST is not set.
v7:
- Fixed the broken function call in is_key_on_revocation_list(). (be found by kernel test robot)
- Use a general name check_eku_by_usage() instead of check_codesign_eku().
v6:
- Add more length checking when parsing extKeyUsage and EKU's OID blob.
- Add 'usage' parameter to the comment of pkcs7_validate_trust function.
v5:
Fixed the wording in module-signing.rst.
v4:
Fixed the wording in patch description.
v3:
- Add codeSigning EKU to x509.genkey key generation config.
- Add openssl command option example for generating CodeSign EKU to module-signing.rst document.
v2:
Changed the help wording in the Kconfig.
Lee, Chun-Yi (4):
X.509: Add CodeSigning extended key usage parsing PKCS#7: Check codeSigning EKU for kernel module and kexec pe
verification
modsign: Add codeSigning EKU when generating X.509 key generation
config
Documentation/admin-guide/module-signing.rst: add openssl command
option example for CodeSign EKU
Documentation/admin-guide/module-signing.rst | 6 ++++ certs/Makefile | 1 + certs/blacklist.c | 6 ++-- certs/system_keyring.c | 4 +-- crypto/asymmetric_keys/Kconfig | 9 ++++++ crypto/asymmetric_keys/pkcs7_trust.c | 43 ++++++++++++++++++++++++++-- crypto/asymmetric_keys/x509_cert_parser.c | 25 ++++++++++++++++ include/crypto/pkcs7.h | 4 ++- include/crypto/public_key.h | 1 + include/keys/system_keyring.h | 7 +++-- include/linux/oid_registry.h | 5 ++++ 11 files changed, 101 insertions(+), 10 deletions(-)
Signature · 1 line
2.16.4
PATCH v8 1/4 X.509: Add CodeSigning extended key usage parsing
This patch adds the logic for parsing the CodeSign extended key usage extension in X.509. The parsing result will be set to the eku flag which is carried by public key. It can be used in the PKCS#7 verification.
--- crypto/asymmetric_keys/x509_cert_parser.c | 25 +++++++++++++++++++++++++ include/crypto/public_key.h | 1 + include/linux/oid_registry.h | 5 +++++ 3 files changed, 31 insertions(+)
crypto/asymmetric_keys/x509_cert_parser.c +25 -0
@@ -542,6 +542,8 @@ int x509_process_extension(void *context, size_t hdrlen,struct x509_parse_context *ctx = context;struct asymmetric_key_id *kid;const unsigned char *v = value; +int i =0 ; +enum OID oid;pr_debug ("Extension: %u\n" , ctx->last_oid);
@@ -571,6 +573,29 @@ int x509_process_extension(void *context, size_t hdrlen,return 0 ; } +if (ctx->last_oid == OID_extKeyUsage) { +if (vlen <2 || + v[0 ] != ((ASN1_UNIV <<6 ) |ASN1_CONS_BIT |ASN1_SEQ ) || + v[1 ] != vlen -2 ) +return -EBADMSG ; + i +=2 ; + +while (i < vlen) { +/* A 10 bytes EKU OID Octet blob = +* ASN1_OID + size byte + 8 bytes OID */ +if ((i +10 ) > vlen || v[i] !=ASN1_OID || v[i +1 ] !=8 ) +return -EBADMSG ; + + oid =look_up_OID (v + i +2 , v[i +1 ]); +if (oid == OID_codeSigning) { + ctx->cert->pub->eku |= EKU_codeSigning; + } + i +=10 ; + } +pr_debug ("extKeyUsage: %d\n" , ctx->cert->pub->eku); +return 0 ; + } +return 0 ; }
include/crypto/public_key.h +1 -0
@@ -28,6 +28,7 @@ struct public_key {bool key_is_private;const char *id_type;const char *pkey_algo; + unsigned int eku : 9; /* Extended Key Usage (9-bit) */ };extern void public_key_free (struct public_key *key);
include/linux/oid_registry.h +5 -0
@@ -125,9 +125,14 @@ enum OID { OID_TPMImportableKey,/* 2.23.133.10.1.4 */ OID_TPMSealedData,/* 2.23.133.10.1.5 */ +/* Extended key purpose OIDs [RFC 5280] */ + OID_codeSigning,/* 1.3.6.1.5.5.7.3.3 */ + OID__NR }; +#define EKU_codeSigning (1 << 2) +extern enum OID look_up_OID (const void *data,size_t datasize);extern int parse_OID (const void *data,size_t datasize,enum OID *oid);extern int sprint_oid (const void *,size_t ,char *,size_t );
Signature · 1 line
2.16.4
Jarkko Sakkinen
maintainerRe: [PATCH v8,1/4] X.509: Add CodeSigning extended key usage parsing
Quoted 60 lines · Chun-Yi
This patch adds the logic for parsing the CodeSign extended key usage extension in X.509. The parsing result will be set to the eku flag which is carried by public key. It can be used in the PKCS#7 verification.
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- crypto/asymmetric_keys/x509_cert_parser.c | 25 +++++++++++++++++++++++++ include/crypto/public_key.h | 1 + include/linux/oid_registry.h | 5 +++++ 3 files changed, 31 insertions(+)crypto/asymmetric_keys/x509_cert_parser.c +25
-0@@ -542,6 +542,8 @@ int x509_process_extension(void *context, size_t hdrlen,struct x509_parse_context *ctx = context;struct asymmetric_key_id *kid;const unsigned char *v = value; +int i =0 ; +enum OID oid;pr_debug ("Extension: %u\n" , ctx->last_oid);@@ -571,6 +573,29 @@ int x509_process_extension(void *context, size_t hdrlen,return 0 ; } +if (ctx->last_oid == OID_extKeyUsage) { +if (vlen <2 || + v[0 ] != ((ASN1_UNIV <<6 ) |ASN1_CONS_BIT |ASN1_SEQ ) || + v[1 ] != vlen -2 ) +return -EBADMSG ; + i +=2 ; + +while (i < vlen) { +/* A 10 bytes EKU OID Octet blob = +* ASN1_OID + size byte + 8 bytes OID */ +if ((i +10 ) > vlen || v[i] !=ASN1_OID || v[i +1 ] !=8 ) +return -EBADMSG ; + + oid =look_up_OID (v + i +2 , v[i +1 ]); +if (oid == OID_codeSigning) { + ctx->cert->pub->eku |= EKU_codeSigning; + } + i +=10 ; + } +pr_debug ("extKeyUsage: %d\n" , ctx->cert->pub->eku); +return 0 ; + } +return 0 ; }include/crypto/public_key.h +0
-0
include/crypto/public_key.h struct public_key { · line 31
Quoted 4 lines
include/crypto/public_key.h +1
-0@@ -28,6 +28,7 @@ struct public_key {bool key_is_private;const char *id_type;const char *pkey_algo; + unsigned int eku : 9; /* Extended Key Usage (9-bit) */
Why no just name it ext_key_usage? I get the use of "EKU" elsewhere but not in the variable name. Now you have to remember too much context when just looking at this (and it's even undocumented to add that).
Quoted 26 lines
include/crypto/public_key.h +0
-0};extern void public_key_free (struct public_key *key);include/linux/oid_registry.h +5
-0@@ -125,9 +125,14 @@ enum OID { OID_TPMImportableKey,/* 2.23.133.10.1.4 */ OID_TPMSealedData,/* 2.23.133.10.1.5 */ +/* Extended key purpose OIDs [RFC 5280] */ + OID_codeSigning,/* 1.3.6.1.5.5.7.3.3 */ + OID__NR }; +#define EKU_codeSigning (1 << 2) +extern enum OID look_up_OID (const void *data,size_t datasize);extern int parse_OID (const void *data,size_t datasize,enum OID *oid);extern int sprint_oid (const void *,size_t ,char *,size_t );Signature · 3 lines
2.16.4 005diaq6539262
/Jarkko
Re: [PATCH v8,1/4] X.509: Add CodeSigning extended key usage parsing
Hi Jarkko,
Quoted 56 lines · Jarkko Sakkinen
Quoted 55 lines · Chun-Yi
This patch adds the logic for parsing the CodeSign extended key usage extension in X.509. The parsing result will be set to the eku flag which is carried by public key. It can be used in the PKCS#7 verification.
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- crypto/asymmetric_keys/x509_cert_parser.c | 25 +++++++++++++++++++++++++ include/crypto/public_key.h | 1 + include/linux/oid_registry.h | 5 +++++ 3 files changed, 31 insertions(+)crypto/asymmetric_keys/x509_cert_parser.c +25
-0@@ -542,6 +542,8 @@ int x509_process_extension(void *context, size_t hdrlen,struct x509_parse_context *ctx = context;struct asymmetric_key_id *kid;const unsigned char *v = value; +int i =0 ; +enum OID oid;pr_debug ("Extension: %u\n" , ctx->last_oid);@@ -571,6 +573,29 @@ int x509_process_extension(void *context, size_t hdrlen,return 0 ; } +if (ctx->last_oid == OID_extKeyUsage) { +if (vlen <2 || + v[0 ] != ((ASN1_UNIV <<6 ) |ASN1_CONS_BIT |ASN1_SEQ ) || + v[1 ] != vlen -2 ) +return -EBADMSG ; + i +=2 ; + +while (i < vlen) { +/* A 10 bytes EKU OID Octet blob = +* ASN1_OID + size byte + 8 bytes OID */ +if ((i +10 ) > vlen || v[i] !=ASN1_OID || v[i +1 ] !=8 ) +return -EBADMSG ; + + oid =look_up_OID (v + i +2 , v[i +1 ]); +if (oid == OID_codeSigning) { + ctx->cert->pub->eku |= EKU_codeSigning; + } + i +=10 ; + } +pr_debug ("extKeyUsage: %d\n" , ctx->cert->pub->eku); +return 0 ; + } +return 0 ; }
Quoted 15 lines
include/crypto/public_key.h struct public_key { · line 31
Quoted 9 lines
include/crypto/public_key.h +1
-0@@ -28,6 +28,7 @@ struct public_key {bool key_is_private;const char *id_type;const char *pkey_algo; + unsigned int eku : 9; /* Extended Key Usage (9-bit) */Why no just name it
ext_key_usage? I get the use of "EKU" elsewhere but not in the variable name. Now you have to remember too much context when just looking at this (and it's even undocumented to add that).
Thanks for your suggestion. I will use a better name in next version.
Joey Lee
Quoted 29 lines
Quoted 26 lines
include/crypto/public_key.h +0
-0};extern void public_key_free (struct public_key *key);include/linux/oid_registry.h +5
-0@@ -125,9 +125,14 @@ enum OID { OID_TPMImportableKey,/* 2.23.133.10.1.4 */ OID_TPMSealedData,/* 2.23.133.10.1.5 */ +/* Extended key purpose OIDs [RFC 5280] */ + OID_codeSigning,/* 1.3.6.1.5.5.7.3.3 */ + OID__NR }; +#define EKU_codeSigning (1 << 2) +extern enum OID look_up_OID (const void *data,size_t datasize);extern int parse_OID (const void *data,size_t datasize,enum OID *oid);extern int sprint_oid (const void *,size_t ,char *,size_t );Signature · 3 lines
2.16.4 005diaq6539262/Jarkko
Re: [PATCH v8,1/4] X.509: Add CodeSigning extended key usage parsing
In reply to Lee, Chun-YiHi Joey,
Quoted 26 lines · Chun-Yi
This patch adds the logic for parsing the CodeSign extended key usage extension in X.509. The parsing result will be set to the eku flag which is carried by public key. It can be used in the PKCS#7 verification.
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- crypto/asymmetric_keys/x509_cert_parser.c | 25 +++++++++++++++++++++++++ include/crypto/public_key.h | 1 + include/linux/oid_registry.h | 5 +++++ 3 files changed, 31 insertions(+)crypto/asymmetric_keys/x509_cert_parser.c +2
-0@@ -542,6 +542,8 @@ int x509_process_extension(void *context, size_t hdrlen,struct x509_parse_context *ctx = context;struct asymmetric_key_id *kid;const unsigned char *v = value; +int i =0 ; +enum OID oid;pr_debug ("Extension: %u\n" , ctx->last_oid);
crypto/asymmetric_keys/x509_cert_parser.c int x509_process_extension(void *context, size_t hdrlen, · line 582
Quoted 10 lines
crypto/asymmetric_keys/x509_cert_parser.c +7
-0@@ -571,6 +573,29 @@ int x509_process_extension(void *context, size_t hdrlen,return 0 ; } +if (ctx->last_oid == OID_extKeyUsage) { +if (vlen <2 || + v[0 ] != ((ASN1_UNIV <<6 ) |ASN1_CONS_BIT |ASN1_SEQ ) || + v[1 ] != vlen -2 ) +return -EBADMSG ; + i +=2 ; +
Please use assignment rather than incrementing here, ie i = 2. This allows the counter to be independent of previous code.
crypto/asymmetric_keys/x509_cert_parser.c int x509_process_extension(void *context, size_t hdrlen, · line 583
Quoted 1 line
crypto/asymmetric_keys/x509_cert_parser.c +1
-0+while (i < vlen) {
Or better yet, for (i = 2; i < vlen; i += 10) ...
Quoted 50 lines
crypto/asymmetric_keys/x509_cert_parser.c +15
-0+/* A 10 bytes EKU OID Octet blob = +* ASN1_OID + size byte + 8 bytes OID */ +if ((i +10 ) > vlen || v[i] !=ASN1_OID || v[i +1 ] !=8 ) +return -EBADMSG ; + + oid =look_up_OID (v + i +2 , v[i +1 ]); +if (oid == OID_codeSigning) { + ctx->cert->pub->eku |= EKU_codeSigning; + } + i +=10 ; + } +pr_debug ("extKeyUsage: %d\n" , ctx->cert->pub->eku); +return 0 ; + } +return 0 ; }include/crypto/public_key.h +1
-0@@ -28,6 +28,7 @@ struct public_key {bool key_is_private;const char *id_type;const char *pkey_algo; + unsigned int eku : 9; /* Extended Key Usage (9-bit) */ };extern void public_key_free (struct public_key *key);include/linux/oid_registry.h +5
-0@@ -125,9 +125,14 @@ enum OID { OID_TPMImportableKey,/* 2.23.133.10.1.4 */ OID_TPMSealedData,/* 2.23.133.10.1.5 */ +/* Extended key purpose OIDs [RFC 5280] */ + OID_codeSigning,/* 1.3.6.1.5.5.7.3.3 */ + OID__NR }; +#define EKU_codeSigning (1 << 2) +extern enum OID look_up_OID (const void *data,size_t datasize);extern int parse_OID (const void *data,size_t datasize,enum OID *oid);extern int sprint_oid (const void *,size_t ,char *,size_t );
Signature · 7 lines
SUSE Software Solutions Germany GmbH Maxfeldstr. 5 90409 Nürnberg Germany HRB 36809, AG Nürnberg Geschäftsführer: Felix Imendörffer
PATCH v8 2/4 PKCS#7: Check codeSigning EKU for kernel module and kexec pe verification
In reply to Lee, Chun-YiThis patch adds the logic for checking the CodeSigning extended key usage when verifying signature of kernel module or kexec PE binary in PKCS#7.
--- certs/blacklist.c | 6 +++-- certs/system_keyring.c | 4 ++-- crypto/asymmetric_keys/Kconfig | 9 ++++++++ crypto/asymmetric_keys/pkcs7_trust.c | 43 +++++++++++++++++++++++++++++++++--- include/crypto/pkcs7.h | 4 +++- include/keys/system_keyring.h | 7 ++++-- 6 files changed, 63 insertions(+), 10 deletions(-)
certs/blacklist.c +4 -2
@@ -16,6 +16,7 @@#include <linux/seq_file.h> #include <linux/uidgid.h> #include <keys/system_keyring.h> +#include <keys/asymmetric-type.h> #include "blacklist.h" #include "common.h"
@@ -181,11 +182,12 @@ int add_key_to_revocation_list(const char *data, size_t size)* is_key_on_revocation_list - Determine if the key for a PKCS#7 message is revoked * @pkcs7: The PKCS#7 message to check */ -int is_key_on_revocation_list (struct pkcs7_message *pkcs7) +int is_key_on_revocation_list (struct pkcs7_message *pkcs7, +enum key_being_used_for usage) {int ret; - ret =pkcs7_validate_trust (pkcs7, blacklist_keyring); + ret =pkcs7_validate_trust (pkcs7, blacklist_keyring, usage, false);if (ret ==0 )return -EKEYREJECTED ;
certs/system_keyring.c +2 -2
@@ -221,13 +221,13 @@ int verify_pkcs7_message_sig(const void *data, size_t len, goto error; } - ret =is_key_on_revocation_list (pkcs7); + ret =is_key_on_revocation_list (pkcs7, usage);if (ret != -ENOKEY ) {pr_devel ("PKCS#7 platform key is on revocation list\n" ); goto error; } } - ret =pkcs7_validate_trust (pkcs7, trusted_keys); + ret =pkcs7_validate_trust (pkcs7, trusted_keys, usage, true);if (ret <0 ) {if (ret == -ENOKEY )pr_devel ("PKCS#7 signature not signed with a trusted key\n" );
crypto/asymmetric_keys/Kconfig +9 -0
@@ -96,4 +96,13 @@ config SIGNED_PE_FILE_VERIFICATION This option provides support for verifying the signature(s) on a signed PE binary. +config CHECK_CODESIGN_EKU + bool "Check codeSigning extended key usage" + depends on PKCS7_MESSAGE_PARSER=y + depends on SYSTEM_DATA_VERIFICATION + help + This option provides support for checking the codeSigning extended + key usage when verifying the signature in PKCS#7. It affects kernel + module verification and kexec PE binary verification. + endif # ASYMMETRIC_KEY_TYPE
crypto/asymmetric_keys/pkcs7_trust.c +40 -3
78 lines not on this page · raw message
include/crypto/pkcs7.h +3 -1
@@ -30,7 +30,9 @@ extern int pkcs7_get_content_data(const struct pkcs7_message *pkcs7,* pkcs7_trust.c */ extern int pkcs7_validate_trust (struct pkcs7_message *pkcs7, -struct key *trust_keyring); +struct key *trust_keyring, +enum key_being_used_for usage, +bool check_eku);/* * pkcs7_verify.c
include/keys/system_keyring.h +5 -2
@@ -9,6 +9,7 @@#define _KEYS_SYSTEM_KEYRING_H#include <linux/key.h> +#include <keys/asymmetric-type.h> #ifdef CONFIG_SYSTEM_TRUSTED_KEYRING
@@ -59,13 +60,15 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len)#ifdef CONFIG_SYSTEM_REVOCATION_LIST extern int add_key_to_revocation_list (const char *data,size_t size); -extern int is_key_on_revocation_list (struct pkcs7_message *pkcs7); +extern int is_key_on_revocation_list (struct pkcs7_message *pkcs7, +enum key_being_used_for usage);#else static inline int add_key_to_revocation_list (const char *data,size_t size) {return 0 ; } -static inline int is_key_on_revocation_list (struct pkcs7_message *pkcs7) +static inline int is_key_on_revocation_list (struct pkcs7_message *pkcs7, +enum key_being_used_for usage) {return -ENOKEY ; }
Signature · 1 line
2.16.4
Re: [PATCH v8,2/4] PKCS#7: Check codeSigning EKU for kernel module and kexec pe verification
Hi Joey,
Quoted 84 lines · Chun-Yi
This patch adds the logic for checking the CodeSigning extended key usage when verifying signature of kernel module or kexec PE binary in PKCS#7.
Signed-off-by "Lee, Chun-Yi" <[email protected]>--- certs/blacklist.c | 6 +++-- certs/system_keyring.c | 4 ++-- crypto/asymmetric_keys/Kconfig | 9 ++++++++ crypto/asymmetric_keys/pkcs7_trust.c | 43 +++++++++++++++++++++++++++++++++--- include/crypto/pkcs7.h | 4 +++- include/keys/system_keyring.h | 7 ++++-- 6 files changed, 63 insertions(+), 10 deletions(-)certs/blacklist.c +4
-2@@ -16,6 +16,7 @@#include <linux/seq_file.h> #include <linux/uidgid.h> #include <keys/system_keyring.h> +#include <keys/asymmetric-type.h> #include "blacklist.h" #include "common.h" @@ -181,11 +182,12 @@ int add_key_to_revocation_list(const char *data, size_t size)* is_key_on_revocation_list - Determine if the key for a PKCS#7 message is revoked * @pkcs7: The PKCS#7 message to check */ -int is_key_on_revocation_list (struct pkcs7_message *pkcs7) +int is_key_on_revocation_list (struct pkcs7_message *pkcs7, +enum key_being_used_for usage) {int ret; - ret =pkcs7_validate_trust (pkcs7, blacklist_keyring); + ret =pkcs7_validate_trust (pkcs7, blacklist_keyring, usage, false);if (ret ==0 )return -EKEYREJECTED ;certs/system_keyring.c +2
-2@@ -221,13 +221,13 @@ int verify_pkcs7_message_sig(const void *data, size_t len, goto error; } - ret =is_key_on_revocation_list (pkcs7); + ret =is_key_on_revocation_list (pkcs7, usage);if (ret != -ENOKEY ) {pr_devel ("PKCS#7 platform key is on revocation list\n" ); goto error; } } - ret =pkcs7_validate_trust (pkcs7, trusted_keys); + ret =pkcs7_validate_trust (pkcs7, trusted_keys, usage, true);if (ret <0 ) {if (ret == -ENOKEY )pr_devel ("PKCS#7 signature not signed with a trusted key\n" );crypto/asymmetric_keys/Kconfig +9
-0@@ -96,4 +96,13 @@ config SIGNED_PE_FILE_VERIFICATION This option provides support for verifying the signature(s) on a signed PE binary. +config CHECK_CODESIGN_EKU + bool "Check codeSigning extended key usage" + depends on PKCS7_MESSAGE_PARSER=y + depends on SYSTEM_DATA_VERIFICATION + help + This option provides support for checking the codeSigning extended + key usage when verifying the signature in PKCS#7. It affects kernel + module verification and kexec PE binary verification. + endif # ASYMMETRIC_KEY_TYPEcrypto/asymmetric_keys/pkcs7_trust.c +0
-0
crypto/asymmetric_keys/pkcs7_trust.c line 20
Quoted 5 lines
crypto/asymmetric_keys/pkcs7_trust.c +2
-0@@ -16,12 +16,40 @@#include <crypto/public_key.h> #include "pkcs7_parser.h" +#ifdef CONFIG_CHECK_CODESIGN_EKU +static bool check_eku_by_usage (struct key *key,enum key_being_used_for usage)
Can this check fit into the existing find_asymmetric_key call (or, a new find_asymmetric_key_by_usage call) instead? pkcs7_validate_trust_one needs to match the signature against an EKU_codeSigning key on trust_keyring.
Thanks,
Varad
Quoted 123 lines
crypto/asymmetric_keys/pkcs7_trust.c +38
-3+{ +struct public_key *public_key = key->payload.data[asym_crypto]; +bool ret = true; + +switch (usage) { +case VERIFYING_MODULE_SIGNATURE : +case VERIFYING_KEXEC_PE_SIGNATURE : + ret = !!(public_key->eku & EKU_codeSigning); +if (!ret) +pr_warn ("The signer '%s' key is not CodeSigning\n" , + key->description); +break ; +default : +break ; + } +return ret; +} +#else +static bool check_eku_by_usage (struct key *key,enum key_being_used_for usage) +{ +return true; +} +#endif +/* * Check the trust on one PKCS#7 SignedInfo block. */ static int pkcs7_validate_trust_one (struct pkcs7_message *pkcs7,struct pkcs7_signed_info *sinfo, -struct key *trust_keyring) +struct key *trust_keyring, +enum key_being_used_for usage, +bool check_eku) {struct public_key_signature *sig = sinfo->sig;struct x509_certificate *x509, *last =NULL , *p;@@ -112,6 +140,10 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,return -ENOKEY ; matched: +if (check_eku && !check_eku_by_usage (key, usage)) { +key_put (key); +return -ENOKEY ; + } ret =verify_signature (key, sig);key_put (key);if (ret <0 ) {@@ -135,6 +167,8 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,* pkcs7_validate_trust - Validate PKCS#7 trust chain * @pkcs7: The PKCS#7 certificate to validate * @trust_keyring: Signing certificates to use as starting points +* @usage: The use to which the key is being put. +* @check_eku: Check EKU (Extended Key Usage) * * Validate that the certificate chain inside the PKCS#7 message intersects * keys we already know and trust. @@ -156,7 +190,9 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,* May also return -ENOMEM. */ int pkcs7_validate_trust (struct pkcs7_message *pkcs7, -struct key *trust_keyring) +struct key *trust_keyring, +enum key_being_used_for usage, +bool check_eku) {struct pkcs7_signed_info *sinfo;struct x509_certificate *p;@@ -167,7 +203,8 @@ int pkcs7_validate_trust(struct pkcs7_message *pkcs7, p->seen = false;for (sinfo = pkcs7->signed_infos; sinfo; sinfo = sinfo->next) { - ret =pkcs7_validate_trust_one (pkcs7, sinfo, trust_keyring); + ret =pkcs7_validate_trust_one (pkcs7, sinfo, trust_keyring, + usage, check_eku);switch (ret) {case -ENOKEY :continue ;include/crypto/pkcs7.h +3
-1@@ -30,7 +30,9 @@ extern int pkcs7_get_content_data(const struct pkcs7_message *pkcs7,* pkcs7_trust.c */ extern int pkcs7_validate_trust (struct pkcs7_message *pkcs7, -struct key *trust_keyring); +struct key *trust_keyring, +enum key_being_used_for usage, +bool check_eku);/* * pkcs7_verify.c include/keys/system_keyring.h +5
-2@@ -9,6 +9,7 @@#define _KEYS_SYSTEM_KEYRING_H#include <linux/key.h> +#include <keys/asymmetric-type.h> #ifdef CONFIG_SYSTEM_TRUSTED_KEYRING @@ -59,13 +60,15 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len)#ifdef CONFIG_SYSTEM_REVOCATION_LIST extern int add_key_to_revocation_list (const char *data,size_t size); -extern int is_key_on_revocation_list (struct pkcs7_message *pkcs7); +extern int is_key_on_revocation_list (struct pkcs7_message *pkcs7, +enum key_being_used_for usage);#else static inline int add_key_to_revocation_list (const char *data,size_t size) {return 0 ; } -static inline int is_key_on_revocation_list (struct pkcs7_message *pkcs7) +static inline int is_key_on_revocation_list (struct pkcs7_message *pkcs7, +enum key_being_used_for usage) {return -ENOKEY ; }
Signature · 7 lines
SUSE Software Solutions Germany GmbH Maxfeldstr. 5 90409 Nürnberg Germany HRB 36809, AG Nürnberg Geschäftsführer: Felix Imendörffer
PATCH v8 3/4 modsign: Add codeSigning EKU when generating X.509 key generation config
In reply to Lee, Chun-YiAdd codeSigning EKU to the X.509 key generation config for the build time autogenerated kernel key.
--- certs/Makefile | 1 + 1 file changed, 1 insertion(+)
certs/Makefile +1 -0
@@ -99,6 +99,7 @@ $(obj)/x509.genkey: @echo >>$@ "keyUsage=digitalSignature" @echo >>$@ "subjectKeyIdentifier=hash" @echo >>$@ "authorityKeyIdentifier=keyid" + @echo >>$@ "extendedKeyUsage=codeSigning" endif # CONFIG_MODULE_SIG_KEY $(eval $(call config_filename,MODULE_SIG_KEY))
Signature · 1 line
2.16.4
PATCH v8 4/4 Documentation/admin-guide/module-signing.rst: add openssl command option example for CodeSign EKU
In reply to Lee, Chun-YiAdd an openssl command option example for generating CodeSign extended key usage in X.509 when CONFIG_CHECK_CODESIGN_EKU is enabled.
--- Documentation/admin-guide/module-signing.rst | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/admin-guide/module-signing.rst +6 -0
@@ -170,6 +170,12 @@ generate the public/private key files:: -config x509.genkey -outform PEM -out kernel_key.pem \ -keyout kernel_key.pem +When ``CONFIG_CHECK_CODESIGN_EKU`` option is enabled, the following openssl +command option should be added where for generating CodeSign extended key usage +in X.509:: + + -addext "extendedKeyUsage=codeSigning" + The full pathname for the resulting kernel_key.pem file can then be specified in the ``CONFIG_MODULE_SIG_KEY`` option, and the certificate and key therein will be used instead of an autogenerated keypair.
Signature · 1 line
2.16.4