| Message ID | 20190301175918.29694-12-vt@altlinux.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: add EC-RDSA (GOST 34.10) algorithm | expand |
Mimi, Dmitry, Can you Ack this patch? Thanks, On Fri, Mar 01, 2019 at 08:59:18PM +0300, Vitaly Chikunov wrote: > Allow to use EC-RDSA signatures for IMA by determining signature type by > the hash algorithm name. This works good for EC-RDSA since Streebog and > EC-RDSA should always be used together. > > Cc: Mimi Zohar <zohar@linux.ibm.com> > Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com> > Cc: linux-integrity@vger.kernel.org > Signed-off-by: Vitaly Chikunov <vt@altlinux.org> > --- > security/integrity/digsig_asymmetric.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/digsig_asymmetric.c > index d775e03fbbcc..99080871eb9f 100644 > --- a/security/integrity/digsig_asymmetric.c > +++ b/security/integrity/digsig_asymmetric.c > @@ -104,9 +104,16 @@ int asymmetric_verify(struct key *keyring, const char *sig, > > memset(&pks, 0, sizeof(pks)); > > - pks.pkey_algo = "rsa"; > pks.hash_algo = hash_algo_name[hdr->hash_algo]; > - pks.encoding = "pkcs1"; > + if (hdr->hash_algo == HASH_ALGO_STREEBOG_256 || > + hdr->hash_algo == HASH_ALGO_STREEBOG_512) { > + /* EC-RDSA and Streebog should go together. */ > + pks.pkey_algo = "ecrdsa"; > + pks.encoding = "raw"; > + } else { > + pks.pkey_algo = "rsa"; > + pks.encoding = "pkcs1"; > + } > pks.digest = (u8 *)data; > pks.digest_size = datalen; > pks.s = hdr->sig; > -- > 2.11.0
diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/digsig_asymmetric.c index d775e03fbbcc..99080871eb9f 100644 --- a/security/integrity/digsig_asymmetric.c +++ b/security/integrity/digsig_asymmetric.c @@ -104,9 +104,16 @@ int asymmetric_verify(struct key *keyring, const char *sig, memset(&pks, 0, sizeof(pks)); - pks.pkey_algo = "rsa"; pks.hash_algo = hash_algo_name[hdr->hash_algo]; - pks.encoding = "pkcs1"; + if (hdr->hash_algo == HASH_ALGO_STREEBOG_256 || + hdr->hash_algo == HASH_ALGO_STREEBOG_512) { + /* EC-RDSA and Streebog should go together. */ + pks.pkey_algo = "ecrdsa"; + pks.encoding = "raw"; + } else { + pks.pkey_algo = "rsa"; + pks.encoding = "pkcs1"; + } pks.digest = (u8 *)data; pks.digest_size = datalen; pks.s = hdr->sig;
Allow to use EC-RDSA signatures for IMA by determining signature type by the hash algorithm name. This works good for EC-RDSA since Streebog and EC-RDSA should always be used together. Cc: Mimi Zohar <zohar@linux.ibm.com> Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com> Cc: linux-integrity@vger.kernel.org Signed-off-by: Vitaly Chikunov <vt@altlinux.org> --- security/integrity/digsig_asymmetric.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)