Commit a090187 used the name mangling override, because the QAPI name
'QCryptoTLSCredsEndpoint' would have generated enumeration constants
with the rather unsatisfactory Q_CRYPTOTLS_CREDS_ENDPOINT_CLIENT
prefix without it. It now generates QCryptoTLSCredsEndpoint without
it, which is just fine.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
crypto/tlscredsanon.c | 6 +++---
crypto/tlscredsx509.c | 6 +++---
crypto/tlssession.c | 6 +++---
include/crypto/tlssession.h | 2 +-
qapi/crypto.json | 1 -
tests/test-crypto-tlscredsx509.c | 6 +++---
tests/test-crypto-tlssession.c | 12 ++++++------
ui/vnc-auth-vencrypt.c | 2 +-
ui/vnc-ws.c | 2 +-
ui/vnc.c | 2 +-
10 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index 3f03c70..84460ec 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -38,7 +38,7 @@ qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds,
trace_qcrypto_tls_creds_anon_load(creds,
creds->parent_obj.dir ? creds->parent_obj.dir : "<nodir>");
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (creds->parent_obj.endpoint == QCryptoTLSCredsEndpoint_server) {
if (qcrypto_tls_creds_get_path(&creds->parent_obj,
QCRYPTO_TLS_CREDS_DH_PARAMS,
false, &dhparams, errp) < 0) {
@@ -79,7 +79,7 @@ qcrypto_tls_creds_anon_load(QCryptoTLSCredsAnon *creds,
static void
qcrypto_tls_creds_anon_unload(QCryptoTLSCredsAnon *creds)
{
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_client) {
+ if (creds->parent_obj.endpoint == QCryptoTLSCredsEndpoint_client) {
if (creds->data.client) {
gnutls_anon_free_client_credentials(creds->data.client);
creds->data.client = NULL;
@@ -141,7 +141,7 @@ qcrypto_tls_creds_anon_prop_get_loaded(Object *obj,
{
QCryptoTLSCredsAnon *creds = QCRYPTO_TLS_CREDS_ANON(obj);
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (creds->parent_obj.endpoint == QCryptoTLSCredsEndpoint_server) {
return creds->data.server != NULL;
} else {
return creds->data.client != NULL;
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index 9137da3..bf97524 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -549,7 +549,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
trace_qcrypto_tls_creds_x509_load(creds,
creds->parent_obj.dir ? creds->parent_obj.dir : "<nodir>");
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (creds->parent_obj.endpoint == QCryptoTLSCredsEndpoint_server) {
if (qcrypto_tls_creds_get_path(&creds->parent_obj,
QCRYPTO_TLS_CREDS_X509_CA_CERT,
true, &cacert, errp) < 0 ||
@@ -583,7 +583,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
if (creds->sanityCheck &&
qcrypto_tls_creds_x509_sanity_check(creds,
- creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server,
+ creds->parent_obj.endpoint == QCryptoTLSCredsEndpoint_server,
cacert, cert, errp) < 0) {
goto cleanup;
}
@@ -626,7 +626,7 @@ qcrypto_tls_creds_x509_load(QCryptoTLSCredsX509 *creds,
}
}
- if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (creds->parent_obj.endpoint == QCryptoTLSCredsEndpoint_server) {
if (qcrypto_tls_creds_get_dh_params_file(&creds->parent_obj, dhparams,
&creds->parent_obj.dh_params,
errp) < 0) {
diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index bd0bac4..0c77f85 100644
--- a/crypto/tlssession.c
+++ b/crypto/tlssession.c
@@ -116,7 +116,7 @@ qcrypto_tls_session_new(QCryptoTLSCreds *creds,
goto error;
}
- if (endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (endpoint == QCryptoTLSCredsEndpoint_server) {
ret = gnutls_init(&session->handle, GNUTLS_SERVER);
} else {
ret = gnutls_init(&session->handle, GNUTLS_CLIENT);
@@ -138,7 +138,7 @@ qcrypto_tls_session_new(QCryptoTLSCreds *creds,
gnutls_strerror(ret));
goto error;
}
- if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (creds->endpoint == QCryptoTLSCredsEndpoint_server) {
ret = gnutls_credentials_set(session->handle,
GNUTLS_CRD_ANON,
acreds->data.server);
@@ -171,7 +171,7 @@ qcrypto_tls_session_new(QCryptoTLSCreds *creds,
goto error;
}
- if (creds->endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (creds->endpoint == QCryptoTLSCredsEndpoint_server) {
/* This requests, but does not enforce a client cert.
* The cert checking code later does enforcement */
gnutls_certificate_server_set_request(session->handle,
diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h
index 1d9c7aa..411e8e0 100644
--- a/include/crypto/tlssession.h
+++ b/include/crypto/tlssession.h
@@ -63,7 +63,7 @@
* sess = qcrypto_tls_session_new(creds,
* "vnc.example.com",
* NULL,
- * QCRYPTO_TLS_CREDS_ENDPOINT_client,
+ * QCryptoTLSCredsEndpoint_client,
* errp);
* if (sess == NULL) {
* return -1;
diff --git a/qapi/crypto.json b/qapi/crypto.json
index b058b14..34c1422 100644
--- a/qapi/crypto.json
+++ b/qapi/crypto.json
@@ -17,5 +17,4 @@
# Since: 2.5
##
{ 'enum': 'QCryptoTLSCredsEndpoint',
- 'prefix': 'QCRYPTO_TLS_CREDS_ENDPOINT',
'data': ['client', 'server']}
diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx509.c
index a1e2d51..b97650c 100644
--- a/tests/test-crypto-tlscredsx509.c
+++ b/tests/test-crypto-tlscredsx509.c
@@ -48,7 +48,7 @@ static QCryptoTLSCreds
*test_tls_creds_create(QCryptoTLSCredsEndpoint endpoint,
parent,
"testtlscreds",
errp,
- "endpoint", (endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server ?
+ "endpoint", (endpoint == QCryptoTLSCredsEndpoint_server ?
"server" : "client"),
"dir", certdir,
"verify-peer", "yes",
@@ -111,8 +111,8 @@ static void test_tls_creds(const void *opaque)
creds = test_tls_creds_create(
(data->isServer ?
- QCRYPTO_TLS_CREDS_ENDPOINT_server :
- QCRYPTO_TLS_CREDS_ENDPOINT_client),
+ QCryptoTLSCredsEndpoint_server :
+ QCryptoTLSCredsEndpoint_client),
CERT_DIR,
&err);
diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c
index 4620086..ce0a146 100644
--- a/tests/test-crypto-tlssession.c
+++ b/tests/test-crypto-tlssession.c
@@ -69,10 +69,10 @@ static QCryptoTLSCreds
*test_tls_creds_create(QCryptoTLSCredsEndpoint endpoint,
Object *creds = object_new_with_props(
TYPE_QCRYPTO_TLS_CREDS_X509,
parent,
- (endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server ?
+ (endpoint == QCryptoTLSCredsEndpoint_server ?
"testtlscredsserver" : "testtlscredsclient"),
&err,
- "endpoint", (endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_server ?
+ "endpoint", (endpoint == QCryptoTLSCredsEndpoint_server ?
"server" : "client"),
"dir", certdir,
"verify-peer", "yes",
@@ -160,13 +160,13 @@ static void test_crypto_tls_session(const void *opaque)
CLIENT_CERT_DIR QCRYPTO_TLS_CREDS_X509_CLIENT_KEY) == 0);
clientCreds = test_tls_creds_create(
- QCRYPTO_TLS_CREDS_ENDPOINT_client,
+ QCryptoTLSCredsEndpoint_client,
CLIENT_CERT_DIR,
&err);
g_assert(clientCreds != NULL);
serverCreds = test_tls_creds_create(
- QCRYPTO_TLS_CREDS_ENDPOINT_server,
+ QCryptoTLSCredsEndpoint_server,
SERVER_CERT_DIR,
&err);
g_assert(serverCreds != NULL);
@@ -182,11 +182,11 @@ static void test_crypto_tls_session(const void *opaque)
/* Now the real part of the test, setup the sessions */
clientSess = qcrypto_tls_session_new(
clientCreds, data->hostname, NULL,
- QCRYPTO_TLS_CREDS_ENDPOINT_client, &err);
+ QCryptoTLSCredsEndpoint_client, &err);
serverSess = qcrypto_tls_session_new(
serverCreds, NULL,
data->wildcards ? "tlssessionacl" : NULL,
- QCRYPTO_TLS_CREDS_ENDPOINT_server, &err);
+ QCryptoTLSCredsEndpoint_server, &err);
g_assert(clientSess != NULL);
g_assert(serverSess != NULL);
diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
index 201cfc9..f2593da 100644
--- a/ui/vnc-auth-vencrypt.c
+++ b/ui/vnc-auth-vencrypt.c
@@ -132,7 +132,7 @@ static int protocol_client_vencrypt_auth(VncState *vs,
uint8_t *data, size_t len
vs->tls = qcrypto_tls_session_new(vs->vd->tlscreds,
NULL,
vs->vd->tlsaclname,
- QCRYPTO_TLS_CREDS_ENDPOINT_server,
+ QCryptoTLSCredsEndpoint_server,
&err);
if (!vs->tls) {
VNC_DEBUG("Failed to setup TLS %s\n",
diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 3804b73..fab39c7 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -68,7 +68,7 @@ void vncws_tls_handshake_io(void *opaque)
vs->tls = qcrypto_tls_session_new(vs->vd->tlscreds,
NULL,
vs->vd->tlsaclname,
- QCRYPTO_TLS_CREDS_ENDPOINT_server,
+ QCryptoTLSCredsEndpoint_server,
&err);
if (!vs->tls) {
VNC_DEBUG("Failed to setup TLS %s\n",
diff --git a/ui/vnc.c b/ui/vnc.c
index 0cd19f6..711f664 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3634,7 +3634,7 @@ void vnc_display_open(const char *id, Error **errp)
}
object_ref(OBJECT(vs->tlscreds));
- if (vs->tlscreds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_server) {
+ if (vs->tlscreds->endpoint != QCryptoTLSCredsEndpoint_server) {
error_setg(errp,
"Expecting TLS credentials with a server endpoint");
goto fail;
--
2.4.3
