[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint()
From: |
Daniel P . Berrangé |
Subject: |
[PULL 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint() |
Date: |
Wed, 30 Jun 2021 12:56:07 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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>
---
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 3cbee762de..601fccc5ba 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 b264620b98..bdfa7ed3a5 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
- [PULL 0/7] crypto patches, Daniel P . Berrangé, 2021/06/30
- [PULL 1/7] crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper, Daniel P . Berrangé, 2021/06/30
- [PULL 2/7] block/nbd: Use qcrypto_tls_creds_check_endpoint(),
Daniel P . Berrangé <=
- [PULL 3/7] qemu-nbd: Use qcrypto_tls_creds_check_endpoint(), Daniel P . Berrangé, 2021/06/30
- [PULL 4/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint(), Daniel P . Berrangé, 2021/06/30
- [PULL 5/7] migration/tls: Use qcrypto_tls_creds_check_endpoint(), Daniel P . Berrangé, 2021/06/30
- [PULL 6/7] ui/vnc: Use qcrypto_tls_creds_check_endpoint(), Daniel P . Berrangé, 2021/06/30
- [PULL 7/7] crypto: Make QCryptoTLSCreds* structures private, Daniel P . Berrangé, 2021/06/30