This reverts commit eb3618e9e259ef93f5a1a76867fbccae540fcd61. 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]> --- migration/tls.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/migration/tls.c b/migration/tls.c index 89ba52de02a..b7914831923 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -88,10 +88,6 @@ void migration_tls_channel_process_incoming(QIOChannel *ioc, Error **errp) trace_migration_tls_incoming_handshake_start(); qio_channel_set_name(QIO_CHANNEL(tioc), "migration-tls-incoming"); - if (migrate_postcopy_ram() || migrate_return_path()) { - qio_channel_set_feature(QIO_CHANNEL(tioc), - QIO_CHANNEL_FEATURE_CONCURRENT_IO); - } qio_channel_tls_handshake(tioc, migration_tls_incoming_handshake, NULL, @@ -142,11 +138,6 @@ void migration_tls_channel_connect(MigrationState *s, QIOChannel *ioc, trace_migration_tls_outgoing_handshake_start(); qio_channel_set_name(QIO_CHANNEL(tioc), "migration-tls-outgoing"); - - if (migrate_postcopy_ram() || migrate_return_path()) { - qio_channel_set_feature(QIO_CHANNEL(tioc), - QIO_CHANNEL_FEATURE_CONCURRENT_IO); - } qio_channel_tls_handshake(tioc, migration_tls_outgoing_handshake, s, -- 2.56.0
