From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PATCH v5 2/6] block/nbd: Use qcrypto_tls_creds_check_endpoint()
Date: Thu, 17 Jun 2021 14:18:26 +0200 [thread overview]
Message-ID: <20210617121830.2776182-3-philmd@redhat.com> (raw)
In-Reply-To: <20210617121830.2776182-1-philmd@redhat.com>
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nbd.c | 6 +++---
blockdev-nbd.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 616f9ae6c4d..b13a33c3d21 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -2159,9 +2159,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
return NULL;
}
- if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
- error_setg(errp,
- "Expecting TLS credentials with a client endpoint");
+ if (!qcrypto_tls_creds_check_endpoint(creds,
+ QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT,
+ errp)) {
return NULL;
}
object_ref(obj);
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index b264620b98d..bdfa7ed3a5a 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -108,9 +108,9 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
return NULL;
}
- if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- error_setg(errp,
- "Expecting TLS credentials with a server endpoint");
+ if (!qcrypto_tls_creds_check_endpoint(creds,
+ QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
+ errp)) {
return NULL;
}
object_ref(obj);
--
2.31.1
next prev parent reply other threads:[~2021-06-17 13:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 12:18 [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 1/6] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-17 12:18 ` Philippe Mathieu-Daudé [this message]
2021-06-17 12:18 ` [PATCH v5 3/6] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 4/6] migration/tls: " Philippe Mathieu-Daudé
2021-06-17 12:18 ` [PATCH v5 5/6] ui/vnc: " Philippe Mathieu-Daudé
2021-06-17 15:34 ` Richard Henderson
2021-06-18 8:35 ` Daniel P. Berrangé
2021-06-17 12:18 ` [PATCH v5 6/6] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-18 8:35 ` Daniel P. Berrangé
2021-06-28 3:56 ` [PATCH v5 0/6] " Akihiko Odaki
2021-06-28 13:22 ` Philippe Mathieu-Daudé
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=20210617121830.2776182-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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 NNTP newsgroup(s).