diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-06-28 18:09:11 +0200 |
|---|---|---|
| committer | Michael Roth <michael.roth@amd.com> | 2021-10-14 16:27:24 -0500 |
| commit | 0a7e2c99f9cbe6c64e0e7ba002d362d0e4b6dc5c (patch) | |
| tree | bbecae716b7245e1f92de96dbce807e7c746084e | |
| parent | 8d5c255a2569b01c56b32783da93b1c2f15c7deb (diff) | |
chardev/socket: Use qcrypto_tls_creds_check_endpoint()
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit 8612df2ebef9ff1f880fe76d223a3369b9c98db2)
Signed-off-by: Michael Roth <michael.roth@amd.com>
| -rw-r--r-- | chardev/char-socket.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index daa89fe5d1..d0fb545963 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); |