implements ecdsa 256, 384 and 521 alghorithm in akcipher model; change pcks7 and x509 to load certificates with ecdsa; increment testmgr to test ecdsa algo and finally allows signature and verification of modules with ecdsa algorithm
Subsystems (7)
PATCH 1/1 implements ecdsa 256, 384 and 521 alghorithm in akcipher model; change pcks7 and x509 to load certificates with ecdsa; increment testmgr to test ecdsa algo and finally allows signature and verification of modules with ecdsa algorithm
From: Saulo Alessandre <[email protected]>
Signed-off-by Saulo Alessandre <[email protected]>
--- Documentation/admin-guide/module-signing.rst | 10 + crypto/Kconfig | 12 + crypto/Makefile | 7 + crypto/asymmetric_keys/pkcs7_parser.c | 7 +- crypto/asymmetric_keys/pkcs7_verify.c | 5 +- crypto/asymmetric_keys/public_key.c | 30 +- crypto/asymmetric_keys/x509_cert_parser.c | 30 +- crypto/ecc.c | 228 ++++++++- crypto/ecc.h | 62 ++- crypto/ecc_curve_defs.h | 82 +++ crypto/ecdsa.c | 508 +++++++++++++++++++ crypto/ecdsa_params.asn1 | 1 + crypto/ecdsa_signature.asn1 | 6 + crypto/testmgr.c | 17 +- crypto/testmgr.h | 78 +++ include/crypto/ecdh.h | 2 + include/linux/oid_registry.h | 12 + lib/oid_registry.c | 108 +++- 18 files changed, 1146 insertions(+), 59 deletions(-) create mode 100644 crypto/ecdsa.c create mode 100644 crypto/ecdsa_params.asn1 create mode 100644 crypto/ecdsa_signature.asn1
Documentation/admin-guide/module-signing.rst +10 -0
@@ -174,6 +174,16 @@ 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. +It is also possible use the key private/public files using the ecdsa +alghorithm that is more fast than rsa. For this, configure ``CONFIG_CRYPTO_ECDSA`` +and for generate key and certificate use the openssl commands. + + openssl ecparam -gnenkey <prime256v1|secp384r1|secp521r1> \ + -name -noout -out kernel_key.pem + openssl req -new -key kernel_key.pem -x509 -nodes -days 36500 -out kernel_key.x509 + +To sign with ecdsa use the same way or manually using scripts/sign-file. + ========================= Public keys in the kernel
crypto/Kconfig +12 -0
@@ -233,12 +233,24 @@ config CRYPTO_RSA help Generic implementation of the RSA public key algorithm. +config CRYPTO_ECDSA + tristate "ECDSA algorithm" + select CRYPTO_AKCIPHER + select CRYPTO_MANAGER + select MPILIB + select ASN1 + help + Generic implementation of the ECDSA eliptical curve public key algorithm. + config CRYPTO_DH tristate "Diffie-Hellman algorithm" select CRYPTO_KPP select MPILIB help Generic implementation of the Diffie-Hellman algorithm. + FIPS 186-3, Digital Signature Standard using Mathematical routines for + the NIST prime elliptic curves April 05, 2010. Compatible with openssl + command line tools. config CRYPTO_ECC tristate
crypto/Makefile +7 -0
@@ -171,6 +171,13 @@ ecdh_generic-y += ecdh.o ecdh_generic-y += ecdh_helper.o obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o +$(obj)/ecdsa_signature.asn1.o: $(obj)/ecdsa_signature.asn1.c $(obj)/ecdsa_signature.asn1.h +$(obj)/ecdsa_params.asn1.o: $(obj)/ecdsa_params.asn1.c $(obj)/ecdsa_params.asn1.h +clean-files += ecdsa_signature.asn1.c ecdsa_signature.asn1.h +clean-files += ecdsa_params.asn1.c ecdsa_params.asn1.h +ecdsa_generic-y := ecdsa_signature.asn1.o ecdsa_params.asn1.o ecdsa.o +obj-$(CONFIG_CRYPTO_ECDSA) += ecdsa_generic.o + $(obj)/ecrdsa_params.asn1.o: $(obj)/ecrdsa_params.asn1.c $(obj)/ecrdsa_params.asn1.h $(obj)/ecrdsa_pub_key.asn1.o: $(obj)/ecrdsa_pub_key.asn1.c $(obj)/ecrdsa_pub_key.asn1.h $(obj)/ecrdsa.o: $(obj)/ecrdsa_params.asn1.h $(obj)/ecrdsa_pub_key.asn1.h
crypto/asymmetric_keys/pkcs7_parser.c +6 -1
@@ -267,12 +267,17 @@ int pkcs7_sig_note_pkey_algo(void *context, size_t hdrlen,switch (ctx->last_oid) {case OID_rsaEncryption: ctx->sinfo->sig->pkey_algo ="rsa" ; - ctx->sinfo->sig->encoding ="pkcs1" ; +break ; +case OID_id_ecdsa_with_sha256: +case OID_id_ecdsa_with_sha384: +case OID_id_ecdsa_with_sha512: + ctx->sinfo->sig->pkey_algo ="ecdsa" ;break ;default :printk ("Unsupported pkey algo: %u\n" , ctx->last_oid);return -ENOPKG ; } + ctx->sinfo->sig->encoding ="pkcs1" ;return 0 ; }
crypto/asymmetric_keys/pkcs7_verify.c +4 -1
@@ -41,8 +41,11 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7,* big the hash operational data will be. */ tfm =crypto_alloc_shash (sinfo->sig->hash_algo,0 ,0 ); -if (IS_ERR (tfm)) +if (IS_ERR (tfm)) { +pr_warn ("%s unsupported hash_algo[%s]" , __func__, + sinfo->sig->hash_algo);return (PTR_ERR (tfm) == -ENOENT ) ? -ENOPKG :PTR_ERR (tfm); + } desc_size =crypto_shash_descsize (tfm) +sizeof (*desc); sig->digest_size =crypto_shash_digestsize (tfm);
crypto/asymmetric_keys/public_key.c +20 -10
@@ -67,19 +67,29 @@ int software_key_determine_akcipher(const char *encoding, {int n; -if (strcmp (encoding,"pkcs1" ) ==0 ) { -/* The data wangled by the RSA algorithm is typically padded -* and encoded in some manner, such as EMSA-PKCS1-1_5 [RFC3447 -* sec 8.2]. -*/ -if (!hash_algo) +if (encoding &&strcmp (encoding,"pkcs1" ) ==0 ) { +if (pkey->pkey_algo &&strcmp (pkey->pkey_algo,"rsa" ) ==0 ) { +/* The data wangled by the RSA algorithm is typically padded +* and encoded in some manner, such as EMSA-PKCS1-1_5 [RFC3447 +* sec 8.2]. +*/ +if (!hash_algo) + n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , +"pkcs1pad(%s)" , + pkey->pkey_algo); +else + n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , +"pkcs1pad(%s,%s)" , + pkey->pkey_algo, hash_algo); + }else if (pkey->pkey_algo && +strcmp (pkey->pkey_algo,"ecdsa" ) ==0 ) { n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , -"pkcs1pad(%s)" , - pkey->pkey_algo); +"%s(%s)" , pkey->pkey_algo, hash_algo); + }else n =snprintf (alg_name,CRYPTO_MAX_ALG_NAME , -"pkcs1pad(%s,%s)" , - pkey->pkey_algo, hash_algo); +"pkcs1pad(%s,%s)" , + pkey->pkey_algo, hash_algo);return n >=CRYPTO_MAX_ALG_NAME ? -EINVAL :0 ; }
crypto/asymmetric_keys/x509_cert_parser.c +13 -17
@@ -197,6 +197,7 @@ int x509_note_pkey_algo(void *context, size_t hdrlen,pr_debug ("PubKey Algo: %u\n" , ctx->last_oid); + ctx->key_algo = ctx->last_oid;switch (ctx->last_oid) {case OID_md2WithRSAEncryption:case OID_md3WithRSAEncryption:
@@ -204,27 +205,15 @@ int x509_note_pkey_algo(void *context, size_t hdrlen,return -ENOPKG ;/* Unsupported combination */ case OID_md4WithRSAEncryption: - ctx->cert->sig->hash_algo ="md4" ; - goto rsa_pkcs1; -case OID_sha1WithRSAEncryption: - ctx->cert->sig->hash_algo ="sha1" ; - goto rsa_pkcs1; -case OID_sha256WithRSAEncryption: - ctx->cert->sig->hash_algo ="sha256" ; - goto rsa_pkcs1; -case OID_sha384WithRSAEncryption: - ctx->cert->sig->hash_algo ="sha384" ; - goto rsa_pkcs1; -case OID_sha512WithRSAEncryption: - ctx->cert->sig->hash_algo ="sha512" ; - goto rsa_pkcs1; -case OID_sha224WithRSAEncryption: - ctx->cert->sig->hash_algo ="sha224" ; +case OID_id_ecdsa_with_sha1: +case OID_id_ecdsa_with_sha256: +case OID_id_ecdsa_with_sha384: +case OID_id_ecdsa_with_sha512: goto rsa_pkcs1;case OID_gost2012Signature256:
@@ -237,9 +226,13 @@ int x509_note_pkey_algo(void *context, size_t hdrlen, } rsa_pkcs1: - ctx->cert->sig->pkey_algo ="rsa" ; +lookup_oid_sign_info (ctx->key_algo, &ctx->cert->sig->pkey_algo); +lookup_oid_digest_info (ctx->key_algo, &ctx->cert->sig->hash_algo, +NULL ,NULL ); ctx->cert->sig->encoding ="pkcs1" ; ctx->algo_oid = ctx->last_oid; +pr_info ("Found %s(%s) X509 certificate\n" , ctx->cert->sig->pkey_algo, + ctx->cert->sig->hash_algo);return 0 ; ecrdsa: ctx->cert->sig->pkey_algo ="ecrdsa" ;
@@ -266,6 +259,7 @@ int x509_note_signature(void *context, size_t hdrlen, }if (strcmp (ctx->cert->sig->pkey_algo,"rsa" ) ==0 || +strcmp (ctx->cert->sig->pkey_algo,"ecdsa" ) ==0 ||strcmp (ctx->cert->sig->pkey_algo,"ecrdsa" ) ==0 ) {/* Discard the BIT STRING metadata */ if (vlen <1 || *(const u8 *)value !=0 )
@@ -453,6 +447,8 @@ int x509_extract_key_data(void *context, size_t hdrlen, ctx->key_algo = ctx->last_oid;if (ctx->last_oid == OID_rsaEncryption) ctx->cert->pub->pkey_algo ="rsa" ; +else if (ctx->last_oid == OID_id_ecPublicKey) + ctx->cert->pub->pkey_algo ="ecdsa" ;else if (ctx->last_oid == OID_gost2012PKey256 || ctx->last_oid == OID_gost2012PKey512) ctx->cert->pub->pkey_algo ="ecrdsa" ;
crypto/ecc.c +205 -23
312 lines not on this page · raw message
crypto/ecc.h +60 -2
87 lines not on this page · raw message
crypto/ecc_curve_defs.h +82 -0
86 lines not on this page · raw message
crypto/ecdsa.c new file +508 -0
508 lines not on this page · raw message
crypto/ecdsa_params.asn1 new file +1 -0
@@ -0,0 +1 @@ +EcdsaCurve ::= OBJECT IDENTIFIER ({ ecdsa_param_curve })
crypto/ecdsa_signature.asn1 new file +6 -0
@@ -0,0 +1,6 @@ +EcdsaSignature ::= SEQUENCE { + signatureR INTEGER ({ ecdsa_parse_sig_r }), + signatureS INTEGER ({ ecdsa_parse_sig_s }) +} + +EcdsaPubKey ::= BIT STRING ({ ecdsa_parse_pub_key })
crypto/testmgr.c +15 -2
@@ -3728,8 +3728,15 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,memcpy (xbuf[0 ], m, m_size);sg_init_table (src_tab,3 ); -sg_set_buf (&src_tab[0 ], xbuf[0 ],8 ); -sg_set_buf (&src_tab[1 ], xbuf[0 ] +8 , m_size -8 ); +if (vecs->algo == OID_id_ecdsa_with_sha256 || + vecs->algo == OID_id_ecdsa_with_sha384 || + vecs->algo == OID_id_ecdsa_with_sha512) { +sg_set_buf (&src_tab[0 ], xbuf[0 ], m_size); +sg_set_buf (&src_tab[1 ], xbuf[1 ], c_size); + }else { +sg_set_buf (&src_tab[0 ], xbuf[0 ],8 ); +sg_set_buf (&src_tab[1 ], xbuf[0 ] +8 , m_size -8 ); + }if (vecs->siggen_sigver_test) {if (WARN_ON (c_size >PAGE_SIZE )) goto free_all;
@@ -4550,6 +4557,12 @@ static const struct alg_test_desc alg_test_descs[] = { .suite = { .kpp = __VECS(ecdh_tv_template) } + }, { + .alg = "ecdsa", + .test = alg_test_akcipher, + .suite = { + .akcipher = __VECS(ecdsa_tv_template) + } }, { .alg = "ecrdsa", .test = alg_test_akcipher,
crypto/testmgr.h +78 -0
84 lines not on this page · raw message
include/crypto/ecdh.h +2 -0
@@ -25,6 +25,8 @@/* Curves IDs */ #define ECC_CURVE_NIST_P192 0x0001#define ECC_CURVE_NIST_P256 0x0002 +#define ECC_CURVE_NIST_P384 0x0003 +#define ECC_CURVE_NIST_P521 0x0004/** * struct ecdh - define an ECDH private key
include/linux/oid_registry.h +12 -0
@@ -17,9 +17,15 @@* build_OID_registry.pl to generate the data for look_up_OID(). */ enum OID { + OID__undef,/* 1.0 */ OID_id_dsa_with_sha1,/* 1.2.840.10030.4.3 */ OID_id_dsa,/* 1.2.840.10040.4.1 */ + OID_id_secp192r1,/* 1.2.840.10045.3.1.1 */ + OID_id_secp256r1,/* 1.2.840.10045.3.1.7 */ OID_id_ecdsa_with_sha1,/* 1.2.840.10045.4.1 */ + OID_id_ecdsa_with_sha256,/* 1.2.840.10045.4.3.2 */ + OID_id_ecdsa_with_sha384,/* 1.2.840.10045.4.3.3 */ + OID_id_ecdsa_with_sha512,/* 1.2.840.10045.4.3.4 */ OID_id_ecPublicKey,/* 1.2.840.10045.2.1 */ /* PKCS#1 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)} */
@@ -58,6 +64,8 @@ enum OID { OID_certAuthInfoAccess,/* 1.3.6.1.5.5.7.1.1 */ OID_sha1,/* 1.3.14.3.2.26 */ + OID_id_secp384r1,/* 1.3.132.0.34 */ + OID_id_secp521r1,/* 1.3.132.0.35 */ OID_sha256,/* 2.16.840.1.101.3.4.2.1 */ OID_sha384,/* 2.16.840.1.101.3.4.2.2 */ OID_sha512, /* 2.16.840.1.101.3.4.2.3 */
@@ -113,5 +121,9 @@ enum OID {extern enum OID look_up_OID (const void *data,size_t datasize);extern int sprint_oid (const void *,size_t ,char *,size_t );extern int sprint_OID (enum OID ,char *,size_t ); +extern int lookup_oid_sign_info (enum OID oid, +const char **sign_algo); +extern int lookup_oid_digest_info (enum OID oid, +const char **hash_algo,u32 *hash_len,enum OID *oid_algo);#endif /* _LINUX_OID_REGISTRY_H */
lib/oid_registry.c +105 -3
134 lines not on this page · raw message
Signature · 1 line
2.17.1
Herbert Xu
maintainerQuoted 18 lines · Saulo Alessandre
From: Saulo Alessandre <[email protected]>
Signed-off-by Saulo Alessandre <[email protected]>--- Documentation/admin-guide/module-signing.rst | 10 + crypto/Kconfig | 12 + crypto/Makefile | 7 + crypto/asymmetric_keys/pkcs7_parser.c | 7 +- crypto/asymmetric_keys/pkcs7_verify.c | 5 +- crypto/asymmetric_keys/public_key.c | 30 +- crypto/asymmetric_keys/x509_cert_parser.c | 30 +- crypto/ecc.c | 228 ++++++++- crypto/ecc.h | 62 ++- crypto/ecc_curve_defs.h | 82 +++ crypto/ecdsa.c | 508 +++++++++++++++++++ crypto/ecdsa_params.asn1 | 1 + crypto/ecdsa_signature.asn1 | 6 + crypto/testmgr.c | 17 +-
Quoted 8 lines
crypto/testmgr.h | 78 +++ include/crypto/ecdh.h | 2 + include/linux/oid_registry.h | 12 + lib/oid_registry.c | 108 +++- 18 files changed, 1146 insertions(+), 59 deletions(-) create mode 100644 crypto/ecdsa.c create mode 100644 crypto/ecdsa_params.asn1 create mode 100644 crypto/ecdsa_signature.asn1
Please split your patch up. You should also explain in detail why this patch is needed in the kernel.
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