From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Lukas Straub" <lukasstraub2@web.de>,
qemu-devel@nongnu.org, qemu-block@nongnu.org,
"Leonardo Bras" <leobras.c@gmail.com>
Subject: Re: [PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint()
Date: Tue, 15 Jun 2021 17:51:11 +0100 [thread overview]
Message-ID: <YMjafxJWN5XOtC62@redhat.com> (raw)
In-Reply-To: <20210615164751.2192807-3-philmd@redhat.com>
On Tue, Jun 15, 2021 at 06:47:46PM +0200, Philippe Mathieu-Daudé wrote:
> Avoid accessing QCryptoTLSCreds internals by using
> the qcrypto_tls_creds_check_endpoint() helper.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> block/nbd.c | 3 ++-
> blockdev-nbd.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/block/nbd.c b/block/nbd.c
> index 616f9ae6c4d..c3523ebf785 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -2159,7 +2159,8 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
> return NULL;
> }
>
> - if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
> + if (!qcrypto_tls_creds_check_endpoint(creds,
> + QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT)) {
> error_setg(errp,
> "Expecting TLS credentials with a client endpoint");
I'd suggest we pass 'errp' into the qcrypto_tls_creds_check_endpoint
method, so we don't duplicate the error message in all callers.
> return NULL;
> diff --git a/blockdev-nbd.c b/blockdev-nbd.c
> index b264620b98d..b6023052ac7 100644
> --- a/blockdev-nbd.c
> +++ b/blockdev-nbd.c
> @@ -108,7 +108,8 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
> return NULL;
> }
>
> - if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
> + if (!qcrypto_tls_creds_check_endpoint(creds,
> + QCRYPTO_TLS_CREDS_ENDPOINT_SERVER)) {
> error_setg(errp,
> "Expecting TLS credentials with a server endpoint");
> return NULL;
> --
> 2.31.1
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2021-06-15 16:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 16:47 [PATCH v2 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
2021-06-15 16:51 ` Daniel P. Berrangé [this message]
2021-06-15 16:47 ` [PATCH v2 3/7] chardev/socket: " Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 4/7] migration/tls: " Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Philippe Mathieu-Daudé
2021-06-15 16:47 ` [PATCH v2 7/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 16:52 ` Daniel P. Berrangé
2021-06-15 17:16 ` Philippe Mathieu-Daudé
2021-06-15 17:21 ` Daniel P. Berrangé
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=YMjafxJWN5XOtC62@redhat.com \
--to=berrange@redhat.com \
--cc=leobras.c@gmail.com \
--cc=lukasstraub2@web.de \
--cc=marcandre.lureau@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).