@@ -429,29 +429,6 @@ construct_name_value(const char *name, const char *value, struct gc_arena *gc)

     return BSTR(&out);

 }

-bool

-deconstruct_name_value(const char *str, const char **name, const char **value, struct gc_arena *gc)

-{

-    char *cp;

-

-    ASSERT(str);

-    ASSERT(name && value);

-

-    *name = cp = string_alloc(str, gc);

-    *value = NULL;

-

-    while ((*cp))

-    {

-        if (*cp == '=' && !*value)

-        {

-            *cp = 0;

-            *value = cp + 1;

-        }

-        ++cp;

-    }

-    return *name && *value;

-}

-

 static bool

 env_string_equal(const char *s1, const char *s2)

 {

@@ -2190,16 +2190,6 @@ read_string_alloc(struct buffer *buf)

     return str;

 }

-void

-read_string_discard(struct buffer *buf)

-{

-    char *data = read_string_alloc(buf);

-    if (data)

-    {

-        free(data);

-    }

-}

-

 /*

  * Handle the reading and writing of key data to and from

  * the TLS control channel (cleartext).

@@ -803,12 +803,6 @@ tls_ctx_load_cert_file(struct tls_root_ctx *ctx, const char *cert_file,

     tls_ctx_load_cert_file_and_copy(ctx, cert_file, cert_file_inline, NULL);

 }

-void

-tls_ctx_free_cert_file(X509 *x509)

-{

-    X509_free(x509);

-}

-

 int

 tls_ctx_load_priv_file(struct tls_root_ctx *ctx, const char *priv_key_file,

                        const char *priv_key_file_inline