OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-nbd: Use qcrypto_tls_creds_check_endpoint()

Browse Source 
Avoid accessing QCryptoTLSCreds internals by using
the qcrypto_tls_creds_check_endpoint() helper.

Tested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-06-28 18:09:10 +02:00 committed by Daniel P. Berrangé
parent 7b3b616838
commit 0279cd9535
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qemu-nbd.c
View File

@ -43,6 +43,7 @@
#include "io/channel-socket.h" #include "io/channel-socket.h"
#include "io/net-listener.h" #include "io/net-listener.h"
#include "crypto/init.h" #include "crypto/init.h"
#include "crypto/tlscreds.h"
#include "trace/control.h" #include "trace/control.h"
#include "qemu-version.h" #include "qemu-version.h"
@ -422,18 +423,12 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, bool list,
return NULL; return NULL;
} }
if (list) { if (!qcrypto_tls_creds_check_endpoint(creds,
if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) { list
error_setg(errp, ? QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT
"Expecting TLS credentials with a client endpoint"); : QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
return NULL; errp)) {
} return NULL;
} else {
if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
error_setg(errp,
"Expecting TLS credentials with a server endpoint");
return NULL;
}
} }
object_ref(obj); object_ref(obj);
return creds; return creds;