All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Akihiko Odaki" <akihiko.odaki@gmail.com>,
	qemu-block@nongnu.org
Subject: [PATCH v6 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint()
Date: Mon, 28 Jun 2021 18:09:09 +0200	[thread overview]
Message-ID: <20210628160914.2461906-3-philmd@redhat.com> (raw)
In-Reply-To: <20210628160914.2461906-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 3cbee762de8..601fccc5bac 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -1839,9 +1839,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



  parent reply	other threads:[~2021-06-28 16:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-28 16:09 [PATCH v6 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-28 16:09 ` [PATCH v6 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-28 16:09 ` Philippe Mathieu-Daudé [this message]
2021-06-28 16:09 ` [PATCH v6 3/7] qemu-nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
2021-06-28 19:53   ` Eric Blake
2021-06-29  2:52   ` Akihiko Odaki
2021-06-29  7:01     ` Philippe Mathieu-Daudé
2021-06-29 13:30       ` Akihiko Odaki
2021-06-28 16:09 ` [PATCH v6 4/7] chardev/socket: " Philippe Mathieu-Daudé
2021-06-28 16:09 ` [PATCH v6 5/7] migration/tls: " Philippe Mathieu-Daudé
2021-06-28 16:09 ` [PATCH v6 6/7] ui/vnc: " Philippe Mathieu-Daudé
2021-06-28 16:09 ` [PATCH v6 7/7] crypto: Make QCryptoTLSCreds* structures private 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=20210628160914.2461906-3-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=akihiko.odaki@gmail.com \
    --cc=berrange@redhat.com \
    --cc=qemu-block@nongnu.org \
    --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 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.