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 a7245cece64fd06784a10c7d4ac0846bf1c89331..66ca1e718d97336e4f2e2ee586c255afb0f39bf4 100644 (file)
--- 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 73b39ff5ff71ca4fb3b584140df5c19dc9cba504..ac6822803d3f21df40cb1c924e178b9b80919699 100644 (file)
--- 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 61ee2a708a18e2bd91938a7d9cba192e64333106..1776c602eea4c95ba8bc35b4ef1a173ddfc2f506 100644 (file)
--- 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 1f05568d231589fda2df802bb31f5dc0dd18304b..fa6e7f819ea6426b659dd731787ed1459bf644cc 100644 (file)
--- 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 */