On 6/15/21 7:27 PM, Philippe Mathieu-Daudé wrote:
> Follow Daniel suggestion to simplify qcrypto TLS implementations,
> aiming to solve the OSX build failure.
>
> Since v2:
> - Add Error* argument (Daniel)
> - Move structure definitions to "tlscredspriv.h"
>
> Philippe Mathieu-Daudé (7):
> crypto/tlscreds: Introduce qcrypto_tls_creds_check_endpoint() helper
> block/nbd: Use qcrypto_tls_creds_check_endpoint()
> chardev/socket: Use qcrypto_tls_creds_check_endpoint()
> migration/tls: Use qcrypto_tls_creds_check_endpoint()
> crypto/tlssession: Introduce qcrypto_tls_creds_check_endpoint() helper
> ui/vnc: Use qcrypto_tls_session_check_role()
> crypto: Make QCryptoTLSCreds* structures private
>
> crypto/tlscredspriv.h | 45 ++++++++++++++++++++++++++++++
> include/crypto/tls-cipher-suites.h | 6 ----
> include/crypto/tlscreds.h | 29 +++++++++----------
> include/crypto/tlscredsanon.h | 12 --------
> include/crypto/tlscredspsk.h | 12 --------
> include/crypto/tlscredsx509.h | 10 -------
> include/crypto/tlssession.h | 14 ++++++++++
> block/nbd.c | 6 ++--
> blockdev-nbd.c | 6 ++--
> chardev/char-socket.c | 18 ++++--------
> crypto/tls-cipher-suites.c | 7 +++++
> crypto/tlscreds.c | 12 ++++++++
> crypto/tlscredsanon.c | 3 +-
> crypto/tlscredspsk.c | 3 +-
> crypto/tlscredsx509.c | 4 +--
> crypto/tlssession.c | 8 ++++++
> migration/tls.c | 6 +---
> ui/vnc.c | 6 ++--
> 18 files changed, 120 insertions(+), 87 deletions(-)
Sorry Daniel, today it is too hot inside :S
$ git checkout sev_builtin
error: Your local changes to the following files would be overwritten by
checkout:
include/crypto/tlscreds.h
include/crypto/tlssession.h
Please commit your changes or stash them before you switch branches.
Aborting
$ git diff
diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index 41b8939d417..2a8a8570109 100644
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -53,6 +53,7 @@ struct QCryptoTLSCredsClass {
* qcrypto_tls_creds_check_endpoint:
* @creds: pointer to a TLS credentials object
* @endpoint: type of network endpoint that will be using the credentials
+ * @errp: pointer to a NULL-initialized error object
*
* Check whether the credentials is setup according to
* the type of @endpoint argument.
diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h
index 657a2c05521..2fb0bb02d9f 100644
--- a/include/crypto/tlssession.h
+++ b/include/crypto/tlssession.h
@@ -166,6 +166,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoTLSSession,
qcrypto_tls_session_free)
* qcrypto_tls_session_check_role:
* @creds: pointer to a TLS credentials object
* @endpoint: role of the TLS session, client or server
+ * @errp: pointer to a NULL-initialized error object
*
* Check whether the session object operates according to
* the role of the @endpoint argument.