From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 14 Jun 2023 11:31:36 +0000 (+0300)
Subject: lib-ssl-iostream: Remove unnecessary ssl_iostream_settings_drop_stream_only()
X-Git-Tag: 2.4.1~1512
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7cb745d73ffa130e088a1b16a322b5faa7ec409;p=thirdparty%2Fdovecot%2Fcore.git

lib-ssl-iostream: Remove unnecessary ssl_iostream_settings_drop_stream_only()
---

diff --git a/src/lib-ssl-iostream/iostream-ssl-context-cache.c b/src/lib-ssl-iostream/iostream-ssl-context-cache.c
index a7245cece6..66ca1e718d 100644
--- a/src/lib-ssl-iostream/iostream-ssl-context-cache.c
+++ b/src/lib-ssl-iostream/iostream-ssl-context-cache.c
@@ -67,7 +67,6 @@ ssl_iostream_context_cache_get(const struct ssl_iostream_settings *set,
 				  ssl_iostream_context_cache_hash,
 				  ssl_iostream_context_cache_cmp);
 	}
-	ssl_iostream_settings_drop_stream_only(&lookup.set);
 
 	ctx = hash_table_lookup(ssl_iostream_contexts, &lookup);
 	if (ctx != NULL) {
diff --git a/src/lib-ssl-iostream/iostream-ssl-private.h b/src/lib-ssl-iostream/iostream-ssl-private.h
index 73b39ff5ff..ac6822803d 100644
--- a/src/lib-ssl-iostream/iostream-ssl-private.h
+++ b/src/lib-ssl-iostream/iostream-ssl-private.h
@@ -59,9 +59,6 @@ void iostream_ssl_module_init(const struct iostream_ssl_vfuncs *vfuncs);
    treated equal. */
 bool ssl_iostream_settings_equals(const struct ssl_iostream_settings *set1,
 				  const struct ssl_iostream_settings *set2);
-/* Clear out all stream-only settings, so only settings useful for a context
-   are left. */
-void ssl_iostream_settings_drop_stream_only(struct ssl_iostream_settings *set);
 
 void ssl_iostream_unref(struct ssl_iostream **ssl_io);
 
diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
index 61ee2a708a..1776c602ee 100644
--- a/src/lib-ssl-iostream/iostream-ssl.c
+++ b/src/lib-ssl-iostream/iostream-ssl.c
@@ -319,10 +319,6 @@ bool ssl_iostream_settings_equals(const struct ssl_iostream_settings *set1,
 	return memcmp(&set1_nonstr, &set2_nonstr, sizeof(set1_nonstr)) == 0;
 }
 
-void ssl_iostream_settings_drop_stream_only(struct ssl_iostream_settings *set ATTR_UNUSED)
-{
-}
-
 const char *ssl_iostream_get_cipher(struct ssl_iostream *ssl_io,
 				    unsigned int *bits_r)
 {
diff --git a/src/lib-ssl-iostream/iostream-ssl.h b/src/lib-ssl-iostream/iostream-ssl.h
index 1f05568d23..fa6e7f819e 100644
--- a/src/lib-ssl-iostream/iostream-ssl.h
+++ b/src/lib-ssl-iostream/iostream-ssl.h
@@ -12,8 +12,7 @@ struct ssl_iostream_cert {
 
 struct ssl_iostream_settings {
 	/* NOTE: when updating, remember to update:
-	   ssl_iostream_settings_string_offsets[],
-	   ssl_iostream_settings_drop_stream_only() */
+	   ssl_iostream_settings_string_offsets[] */
 	const char *min_protocol; /* context-only */
 	const char *cipher_list; /* context-only, TLSv1.2 and below only */
 	const char *ciphersuites; /* context-only, TLSv1.3 only */