This reverts commit edea818371bd7179b55f38d3b113d342251d8f9b. The workaround for the GNUTLS bug was not correct and it was decided to rely on GNUTLS being patched by distros instead, or users manually disabling use of the problematic ciphers.
Signed-off-by: Daniel P. Berrangé <[email protected]> --- include/io/channel.h | 1 - io/channel-tls.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/io/channel.h b/include/io/channel.h index c90ace20d53..834ba7c3098 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -47,7 +47,6 @@ enum QIOChannelFeature { QIO_CHANNEL_FEATURE_WRITE_ZERO_COPY, QIO_CHANNEL_FEATURE_READ_MSG_PEEK, QIO_CHANNEL_FEATURE_SEEKABLE, - QIO_CHANNEL_FEATURE_CONCURRENT_IO, }; diff --git a/io/channel-tls.c b/io/channel-tls.c index 05317ed5a38..5b0524e68dd 100644 --- a/io/channel-tls.c +++ b/io/channel-tls.c @@ -261,11 +261,6 @@ void qio_channel_tls_handshake(QIOChannelTLS *ioc, { QIOTask *task; - if (qio_channel_has_feature(QIO_CHANNEL(ioc), - QIO_CHANNEL_FEATURE_CONCURRENT_IO)) { - qcrypto_tls_session_require_thread_safety(ioc->session); - } - task = qio_task_new(OBJECT(ioc), func, opaque, destroy); -- 2.56.0
