From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
qemu-block@nongnu.org, "Leonardo Bras" <leobras.c@gmail.com>
Subject: [PATCH v3 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint()
Date: Tue, 15 Jun 2021 19:27:42 +0200 [thread overview]
Message-ID: <20210615172746.2212998-4-philmd@redhat.com> (raw)
In-Reply-To: <20210615172746.2212998-1-philmd@redhat.com>
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
chardev/char-socket.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index daa89fe5d1d..d0fb5459638 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1402,18 +1402,12 @@ static void qmp_chardev_open_socket(Chardev *chr,
return;
}
object_ref(OBJECT(s->tls_creds));
- if (is_listen) {
- if (s->tls_creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
- error_setg(errp, "%s",
- "Expected TLS credentials for server endpoint");
- return;
- }
- } else {
- if (s->tls_creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
- error_setg(errp, "%s",
- "Expected TLS credentials for client endpoint");
- return;
- }
+ if (!qcrypto_tls_creds_check_endpoint(s->tls_creds,
+ is_listen
+ ? QCRYPTO_TLS_CREDS_ENDPOINT_SERVER
+ : QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT,
+ errp)) {
+ return;
}
}
s->tls_authz = g_strdup(sock->tls_authz);
--
2.31.1
next prev parent reply other threads:[~2021-06-15 17:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 17:27 [PATCH v3 0/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() Philippe Mathieu-Daudé
2021-06-15 17:27 ` Philippe Mathieu-Daudé [this message]
2021-06-15 17:27 ` [PATCH v3 4/7] migration/tls: " Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 5/7] crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 6/7] ui/vnc: Use qcrypto_tls_session_check_role() Philippe Mathieu-Daudé
2021-06-15 17:27 ` [PATCH v3 7/7] crypto: Make QCryptoTLSCreds* structures private Philippe Mathieu-Daudé
2021-06-15 17:29 ` Philippe Mathieu-Daudé
2021-06-15 17:39 ` [PATCH v3 0/7] " 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=20210615172746.2212998-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=berrange@redhat.com \
--cc=leobras.c@gmail.com \
--cc=marcandre.lureau@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 NNTP newsgroup(s).