Compare commits
2 Commits
master
...
fix-sanita
Author | SHA1 | Date |
---|---|---|
|
de24e5f436 | |
|
102ea9409d |
|
@ -33,8 +33,7 @@
|
||||||
#define CYTOPLASM_VERSION_BETA 0
|
#define CYTOPLASM_VERSION_BETA 0
|
||||||
#define CYTOPLASM_VERSION_STABLE (!CYTOPLASM_VERSION_ALPHA && !CYTOPLASM_VERSION_BETA)
|
#define CYTOPLASM_VERSION_STABLE (!CYTOPLASM_VERSION_ALPHA && !CYTOPLASM_VERSION_BETA)
|
||||||
|
|
||||||
#define XSTRINGIFY(x) #x
|
#define STRINGIFY(x) #x
|
||||||
#define STRINGIFY(x) XSTRINGIFY(x)
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* @Nm Cytoplasm
|
* @Nm Cytoplasm
|
||||||
|
|
|
@ -621,7 +621,7 @@ HttpParseHeaders(Stream * fp)
|
||||||
|
|
||||||
strncpy(headerValue, headerPtr, len);
|
strncpy(headerValue, headerPtr, len);
|
||||||
|
|
||||||
Free(HashMapSet(headers, headerKey, headerValue));
|
HashMapSet(headers, headerKey, headerValue);
|
||||||
Free(headerKey);
|
Free(headerKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,14 @@ TlsInitClient(int fd, const char *serverName)
|
||||||
OpenSSLCookie *cookie;
|
OpenSSLCookie *cookie;
|
||||||
char errorStr[256];
|
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));
|
cookie = Malloc(sizeof(OpenSSLCookie));
|
||||||
if (!cookie)
|
if (!cookie)
|
||||||
{
|
{
|
||||||
|
@ -81,14 +89,12 @@ TlsInitClient(int fd, const char *serverName)
|
||||||
|
|
||||||
cookie->method = TLS_client_method();
|
cookie->method = TLS_client_method();
|
||||||
cookie->ctx = SSL_CTX_new(cookie->method);
|
cookie->ctx = SSL_CTX_new(cookie->method);
|
||||||
cookie->fd = fd;
|
|
||||||
if (!cookie->ctx)
|
if (!cookie->ctx)
|
||||||
{
|
{
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
cookie->ssl = SSL_new(cookie->ctx);
|
cookie->ssl = SSL_new(cookie->ctx);
|
||||||
SSL_set_tlsext_host_name(cookie->ssl, serverName);
|
|
||||||
if (!cookie->ssl)
|
if (!cookie->ssl)
|
||||||
{
|
{
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -289,7 +295,9 @@ TlsClose(void *cookie)
|
||||||
SSL_free(ssl->ssl);
|
SSL_free(ssl->ssl);
|
||||||
SSL_CTX_free(ssl->ctx);
|
SSL_CTX_free(ssl->ctx);
|
||||||
|
|
||||||
|
#if 0
|
||||||
close(ssl->fd);
|
close(ssl->fd);
|
||||||
|
#endif
|
||||||
|
|
||||||
Free(ssl);
|
Free(ssl);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue