[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 2/6] block/nbd: Use qcrypto_tls_creds_check_endpoint()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 2/6] block/nbd: Use qcrypto_tls_creds_check_endpoint() |
Date: |
Thu, 17 Jun 2021 14:18:26 +0200 |
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
- [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private, Philippe Mathieu-Daudé, 2021/06/17
- [PATCH v5 1/6] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper, Philippe Mathieu-Daudé, 2021/06/17
- [PATCH v5 2/6] block/nbd: Use qcrypto_tls_creds_check_endpoint(),
Philippe Mathieu-Daudé <=
- [PATCH v5 3/6] chardev/socket: Use qcrypto_tls_creds_check_endpoint(), Philippe Mathieu-Daudé, 2021/06/17
- [PATCH v5 4/6] migration/tls: Use qcrypto_tls_creds_check_endpoint(), Philippe Mathieu-Daudé, 2021/06/17
- [PATCH v5 5/6] ui/vnc: Use qcrypto_tls_creds_check_endpoint(), Philippe Mathieu-Daudé, 2021/06/17
- [PATCH v5 6/6] crypto: Make QCryptoTLSCreds* structures private, Philippe Mathieu-Daudé, 2021/06/17
- Re: [PATCH v5 0/6] crypto: Make QCryptoTLSCreds* structures private, Akihiko Odaki, 2021/06/27