From: Jarkko Sakkinen <jarkko@kernel.org> To: keyrings@vger.kernel.org Subject: Re: [RESEND][PATCH] keys: Handle missing Authority Key Identifier X509 extension Date: Sun, 18 Oct 2020 20:22:34 +0000 [thread overview] Message-ID: <20201018202234.GA574776@kapsi.fi> (raw) In-Reply-To: <20180505060152.21571-1-andrew.zaborowski@intel.com> On Tue, Oct 13, 2020 at 03:39:38PM +0200, Andrew Zaborowski wrote: > In a self-signed certificate the subject and issuer are the same and so > the Authority Key Identifier X.509 v3 extension is explicitly made > optional in RFC5280 section 4.2.1.1. > crypto/asymmetric_keys/x509_cert_parser.c can't handle this and makes > (at least) the restrict.c functions refuse to work with certificates > that don't include the AKID. Fix this by filling in the missing > cert->sig->auth_ids with the certificate's own IDs after parsing and > determinig the certificate is self-signed. > > The asymmetric_key_generate_id return value is not checked because it's > already succeeded once at this point. > > There are root X.509 v3 certificates in use where this is the case, > mostly oldish ones. > > Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com> Acked-by: Jarkko Sakkinen <jarkko@kernel.org> > --- > crypto/asymmetric_keys/x509_cert_parser.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c > index 26ec20ef489..a5a2f93e242 100644 > --- a/crypto/asymmetric_keys/x509_cert_parser.c > +++ b/crypto/asymmetric_keys/x509_cert_parser.c > @@ -136,6 +136,25 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen) > if (ret < 0) > goto error_decode; > > + if (cert->self_signed) { > + if (!cert->sig->auth_ids[0]) { > + /* Duplicate cert->id */ > + kid = asymmetric_key_generate_id(cert->raw_serial, > + cert->raw_serial_size, > + cert->raw_issuer, > + cert->raw_issuer_size); > + cert->sig->auth_ids[0] = kid; > + } > + > + if (!cert->sig->auth_ids[1] && cert->skid) { > + /* Duplicate cert->skid */ > + kid = asymmetric_key_generate_id(cert->raw_skid, > + cert->raw_skid_size, > + "", 0); > + cert->sig->auth_ids[1] = kid; > + } > + } > + > kfree(ctx); > return cert; > > -- > 2.20.1 > > /Jarkko
WARNING: multiple messages have this Message-ID (diff)
From: Jarkko Sakkinen <jarkko@kernel.org> To: Andrew Zaborowski <andrew.zaborowski@intel.com> Cc: keyrings@vger.kernel.org, dhowells@redhat.com Subject: Re: [RESEND][PATCH] keys: Handle missing Authority Key Identifier X509 extension Date: Sun, 18 Oct 2020 23:22:34 +0300 [thread overview] Message-ID: <20201018202234.GA574776@kapsi.fi> (raw) Message-ID: <20201018202234.2-KME911Z0hfP7AWpfL3QVziNm0vWCfoOugme2V46yM@z> (raw) In-Reply-To: <20201013133939.1182462-1-andrew.zaborowski@intel.com> On Tue, Oct 13, 2020 at 03:39:38PM +0200, Andrew Zaborowski wrote: > In a self-signed certificate the subject and issuer are the same and so > the Authority Key Identifier X.509 v3 extension is explicitly made > optional in RFC5280 section 4.2.1.1. > crypto/asymmetric_keys/x509_cert_parser.c can't handle this and makes > (at least) the restrict.c functions refuse to work with certificates > that don't include the AKID. Fix this by filling in the missing > cert->sig->auth_ids with the certificate's own IDs after parsing and > determinig the certificate is self-signed. > > The asymmetric_key_generate_id return value is not checked because it's > already succeeded once at this point. > > There are root X.509 v3 certificates in use where this is the case, > mostly oldish ones. > > Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com> Acked-by: Jarkko Sakkinen <jarkko@kernel.org> > --- > crypto/asymmetric_keys/x509_cert_parser.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c > index 26ec20ef489..a5a2f93e242 100644 > --- a/crypto/asymmetric_keys/x509_cert_parser.c > +++ b/crypto/asymmetric_keys/x509_cert_parser.c > @@ -136,6 +136,25 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen) > if (ret < 0) > goto error_decode; > > + if (cert->self_signed) { > + if (!cert->sig->auth_ids[0]) { > + /* Duplicate cert->id */ > + kid = asymmetric_key_generate_id(cert->raw_serial, > + cert->raw_serial_size, > + cert->raw_issuer, > + cert->raw_issuer_size); > + cert->sig->auth_ids[0] = kid; > + } > + > + if (!cert->sig->auth_ids[1] && cert->skid) { > + /* Duplicate cert->skid */ > + kid = asymmetric_key_generate_id(cert->raw_skid, > + cert->raw_skid_size, > + "", 0); > + cert->sig->auth_ids[1] = kid; > + } > + } > + > kfree(ctx); > return cert; > > -- > 2.20.1 > > /Jarkko
next prev parent reply other threads:[~2020-10-18 20:22 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-05 6:01 [RESEND][PATCH] KEYS: Handle missing Authority Key Identifier x509 extension Andrew Zaborowski 2018-08-18 0:11 ` Andrew Zaborowski 2018-10-19 22:13 ` Andrew Zaborowski 2019-02-08 14:35 ` Andrew Zaborowski 2020-04-07 0:25 ` [RESEND][PATCH] keys: Handle missing Authority Key Identifier X509 extension Andrew Zaborowski 2020-05-04 8:51 ` Andrew Zaborowski 2020-06-25 22:10 ` Andrew Zaborowski 2020-06-25 22:10 ` [RESEND][PATCH] keys: Update comment for restrict_link_by_key_or_keyring_chain Andrew Zaborowski 2020-07-29 23:49 ` [RESEND][PATCH] keys: Handle missing Authority Key Identifier X509 extension Andrew Zaborowski 2020-07-29 23:50 ` [RESEND][PATCH] keys: Update comment for restrict_link_by_key_or_keyring_chain Andrew Zaborowski 2020-09-07 10:39 ` [RESEND][PATCH] keys: Handle missing Authority Key Identifier X509 extension Andrew Zaborowski 2020-09-07 10:39 ` [RESEND][PATCH] keys: Update comment for restrict_link_by_key_or_keyring_chain Andrew Zaborowski 2020-10-13 13:39 ` [RESEND][PATCH] keys: Handle missing Authority Key Identifier X509 extension Andrew Zaborowski 2020-10-13 13:39 ` [RESEND][PATCH] keys: Update comment for restrict_link_by_key_or_keyring_chain Andrew Zaborowski 2020-10-18 20:22 ` Jarkko Sakkinen [this message] 2020-10-18 20:22 ` [RESEND][PATCH] keys: Handle missing Authority Key Identifier X509 extension Jarkko Sakkinen 2020-05-04 9:08 [RESEND][PATCH] keys: Update comment for restrict_link_by_key_or_keyring_chain Andrew Zaborowski 2020-10-18 20:25 ` Jarkko Sakkinen 2020-10-18 20:25 ` Jarkko Sakkinen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201018202234.GA574776@kapsi.fi \ --to=jarkko@kernel.org \ --cc=keyrings@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.