Merge pull request 'Fix HTTP header leakage' (#39) from lda/Cytoplasm:fix-duplicate-leak into master

Reviewed-on: Telodendria/Cytoplasm#39

include/Cytoplasm/Cytoplasm.h

@@ -33,7 +33,8 @@
 #define CYTOPLASM_VERSION_BETA 0
 #define CYTOPLASM_VERSION_STABLE (!CYTOPLASM_VERSION_ALPHA && !CYTOPLASM_VERSION_BETA)
 
-#define STRINGIFY(x) #x
+#define XSTRINGIFY(x) #x
+#define STRINGIFY(x) XSTRINGIFY(x)
 
 /***
  * @Nm Cytoplasm

src/Http.c

@@ -621,7 +621,7 @@ HttpParseHeaders(Stream * fp)
 
         strncpy(headerValue, headerPtr, len);
 
-        HashMapSet(headers, headerKey, headerValue);
+        Free(HashMapSet(headers, headerKey, headerValue));
         Free(headerKey);
     }
 

src/Tls/TlsOpenSSL.c

@@ -71,14 +71,6 @@ TlsInitClient(int fd, const char *serverName)
     OpenSSLCookie *cookie;
     char errorStr[256];
 
-    /*
-     * TODO: Seems odd that this isn't needed to make the
-     * connection... we should figure out how to verify the
-     * certificate matches the server we think we're
-     * connecting to.
-     */
-    (void) serverName;
-
     cookie = Malloc(sizeof(OpenSSLCookie));
     if (!cookie)
     {
@@ -89,12 +81,14 @@ TlsInitClient(int fd, const char *serverName)
 
     cookie->method = TLS_client_method();
     cookie->ctx = SSL_CTX_new(cookie->method);
+    cookie->fd = fd;
     if (!cookie->ctx)
     {
         goto error;
     }
 
     cookie->ssl = SSL_new(cookie->ctx);
+    SSL_set_tlsext_host_name(cookie->ssl, serverName);
     if (!cookie->ssl)
     {
         goto error;