Revert previous since it adds new symbols.

Requested by deraadt@

1 files changed, 1 insertions, 69 deletions

diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c
index 640a69e783..63054ab1e9 100644
--- a/src/lib/libtls/tls_config.c
+++ b/src/lib/libtls/tls_config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_config.c,v 1.23 2016/08/01 17:32:19 jsing Exp $ */
+/* $OpenBSD: tls_config.c,v 1.24 2016/08/02 07:47:11 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -166,7 +166,6 @@ tls_config_free(struct tls_config *config)
 
         free(config->error.msg);
 
-        free(config->alpn);
         free((char *)config->ca_file);
         free((char *)config->ca_mem);
         free((char *)config->ca_path);
@@ -250,73 +249,6 @@ tls_config_parse_protocols(uint32_t *protocols, const char *protostr)
         return (0);
 }
 
-static int
-tls_config_parse_alpn(struct tls_config *config, const char *alpn,
-    char **alpn_data, size_t *alpn_len)
-{
-        size_t buf_len, i, len;
-        char *buf = NULL;
-        char *s = NULL;
-        char *p, *q;
-
-        free(*alpn_data);
-        *alpn_data = NULL;
-        *alpn_len = 0;
-
-        if ((buf_len = strlen(alpn) + 1) > 65535) {
-                tls_config_set_errorx(config, "alpn too large");
-                goto err;
-        }
-
-        if ((buf = malloc(buf_len)) == NULL) {
-                tls_config_set_errorx(config, "out of memory");
-                goto err;
-        }
-
-        if ((s = strdup(alpn)) == NULL) {
-                tls_config_set_errorx(config, "out of memory");
-                goto err;
-        }
-
-        i = 0;
-        q = s;
-        while ((p = strsep(&q, ",")) != NULL) {
-                if ((len = strlen(p)) == 0) {
-                        tls_config_set_errorx(config,
-                            "alpn protocol with zero length");
-                        goto err;
-                }
-                if (len > 255) {
-                        tls_config_set_errorx(config,
-                            "alpn protocol too long");
-                        goto err;
-                }
-                buf[i++] = len & 0xff;
-                memcpy(&buf[i], p, len);
-                i += len;
-        }
-
-        free(s);
-
-        *alpn_data = buf;
-        *alpn_len = buf_len;
-
-        return (0);
-
- err:
-        free(buf);
-        free(s);
-
-        return (-1);
-}
-
-int
-tls_config_set_alpn(struct tls_config *config, const char *alpn)
-{
-        return tls_config_parse_alpn(config, alpn, &config->alpn,
-            &config->alpn_len);
-}
-
 int
 tls_config_set_ca_file(struct tls_config *config, const char *ca_file)
 {