mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-15 07:19:18 +00:00
Make redbean SSL more tunable
This change enables SSL compression. It significantly reduces the network load of the testing infrastructure, for free, since this revision didn't need to change any runit protocol code. However we turn it off by default in redbean since no browsers support it. It turns out that some TLSv1.0 clients (e.g. curl command on RHEL5) will send an SSLv2-style ClientHello. These types of clients are usually ten+ years old and were designed to interop with servers ten years older than them. Your redbean is now able to interop with these clients even though redbean doesn't actually support SSLv2 or SSLv3. Please note that the -B flag may be passed to disable this along with TLSv1.0, TLSv1.1, 3DES, &c The following Lua APIs have been added to redbean: - ProgramSslCompression(bool) - ProgramSslCiphersuite(name:str) - ProgramSslPresharedKey(key:str,identity:str) Lastly the DHE ciphersuites have been enabled. IANA recommends DHE and with old clients like RHEL5 it's the only perfect forward secrecy they implement.
This commit is contained in:
Justine Tunney
parent
d86027fe90
commit
53b9f83e1c
15 changed files with 567 additions and 227 deletions
99
tool/decode/base64.c
Normal file
99
tool/decode/base64.c
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2021 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/stdio/stdio.h"
|
||||
#include "libc/str/str.h"
|
||||
|
||||
/**
|
||||
* @fileoverview base64 stream coder
|
||||
*
|
||||
* Does `openssl base64 [-d]` as a 20kb αcτµαlly pδrταblε εxεcµταblε.
|
||||
*/
|
||||
|
||||
#define CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
|
||||
|
||||
const signed char kBase64[256] = {
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x00
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x10
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, 62, -1, 63, // 0x20
|
||||
52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, // 0x30
|
||||
-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 0x40
|
||||
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, 63, // 0x50
|
||||
-1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 0x60
|
||||
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, // 0x70
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x80
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x90
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xa0
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xb0
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xc0
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xd0
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xe0
|
||||
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xf0
|
||||
};
|
||||
|
||||
void Encode(void) {
|
||||
int a, b, c, w;
|
||||
while ((a = getchar()) != -1) {
|
||||
b = getchar();
|
||||
c = getchar();
|
||||
w = a << 020;
|
||||
if (b != -1) w |= b << 010;
|
||||
if (c != -1) w |= c;
|
||||
putchar(CHARS[(w >> 18) & 077]);
|
||||
putchar(CHARS[(w >> 12) & 077]);
|
||||
putchar(b != -1 ? CHARS[(w >> 6) & 077] : '=');
|
||||
putchar(c != -1 ? CHARS[w & 077] : '=');
|
||||
}
|
||||
putchar('\n');
|
||||
}
|
||||
|
||||
int Get(void) {
|
||||
int c;
|
||||
while ((c = getchar()) != -1) {
|
||||
if ((c = kBase64[c]) != -1) break;
|
||||
}
|
||||
return c;
|
||||
}
|
||||
|
||||
void Decode(void) {
|
||||
int a, b, c, d, w;
|
||||
while ((a = Get()) != -1 && (b = Get()) != -1) {
|
||||
c = Get();
|
||||
d = Get();
|
||||
w = a << 18 | b << 12;
|
||||
if (c != -1) w |= c << 6;
|
||||
if (d != -1) w |= d;
|
||||
putchar((w & 0xFF0000) >> 020);
|
||||
if (c != -1) putchar((w & 0x00FF00) >> 010);
|
||||
if (d != -1) putchar((w & 0x0000FF) >> 000);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
if (argc == 1) {
|
||||
Encode();
|
||||
} else if (argc == 2 && !strcmp(argv[1], "-d")) {
|
||||
Decode();
|
||||
} else {
|
||||
fputs("usage: ", stderr);
|
||||
fputs(argv[0], stderr);
|
||||
fputs(" [-d]\n", stderr);
|
||||
return 1;
|
||||
}
|
||||
return ferror(stdin) || ferror(stdout) ? 1 : 0;
|
||||
}
|
||||
|
|
@ -471,7 +471,7 @@ FUNCTIONS
|
|||
DecodeBase64(ascii:str) → binary:str
|
||||
Turns ASCII into binary, in a permissive way that ignores
|
||||
characters outside the base64 alphabet, such as whitespace. See
|
||||
decodebase64.c.
|
||||
decodebase64.c.
|
||||
|
||||
DecodeLatin1(iso-8859-1:str) → utf-8:str
|
||||
Turns ISO-8859-1 string into UTF-8.
|
||||
|
|
@ -850,6 +850,86 @@ FUNCTIONS
|
|||
If this option is programmed then redbean will not transmit a
|
||||
Server Name Indicator (SNI) when performing Fetch() requests.
|
||||
|
||||
ProgramSslCompression(bool)
|
||||
This option may be used to enable SSL DEFLATE support. This
|
||||
can harden against cryptanalysis but we leave it off by
|
||||
default since (1) we already have compression at the HTTP
|
||||
layer and (2) there doesn't appear to be any browsers or
|
||||
open source software that support it.
|
||||
|
||||
ProgramSslPresharedKey(key:str, identity:str)
|
||||
This function can be used to enable the PSK ciphersuites
|
||||
which simplify SSL and enhance its performance in controlled
|
||||
environments. `key` may contain 1..32 bytes of random binary
|
||||
data and identity is usually a short plaintext string. The
|
||||
first time this function is called, the preshared key will
|
||||
be added to both the client and the server SSL configs. If
|
||||
it's called multiple times, then the remaining keys will be
|
||||
added to the server, which is useful if you want to assign
|
||||
separate keys to each client, each of which needs a separate
|
||||
identity too. If this function is called multiple times with
|
||||
the same identity string, then the latter call will overwrite
|
||||
the prior. If a preshared key is supplied and no certificates
|
||||
or key-signing-keys are programmed, then redbean won't bother
|
||||
auto-generating any serving certificates and will instead use
|
||||
only PSK ciphersuites.
|
||||
|
||||
ProgramSslCiphersuite(name:str)
|
||||
This function may be called multiple times to specify which
|
||||
ciphersuites should be used in the server and client. The
|
||||
default list, ordered by preference, is as follows:
|
||||
|
||||
ECDHE-ECDSA-AES256-GCM-SHA384
|
||||
ECDHE-ECDSA-AES128-GCM-SHA256
|
||||
ECDHE-ECDSA-CHACHA20-POLY1305-SHA256
|
||||
ECDHE-PSK-AES256-GCM-SHA384
|
||||
ECDHE-PSK-AES128-GCM-SHA256
|
||||
ECDHE-PSK-CHACHA20-POLY1305-SHA256
|
||||
ECDHE-RSA-AES256-GCM-SHA384
|
||||
ECDHE-RSA-AES128-GCM-SHA256
|
||||
ECDHE-RSA-CHACHA20-POLY1305-SHA256
|
||||
DHE-RSA-AES256-GCM-SHA384
|
||||
DHE-RSA-AES128-GCM-SHA256
|
||||
DHE-RSA-CHACHA20-POLY1305-SHA256
|
||||
ECDHE-ECDSA-AES128-CBC-SHA256
|
||||
ECDHE-RSA-AES256-CBC-SHA384
|
||||
ECDHE-RSA-AES128-CBC-SHA256
|
||||
DHE-RSA-AES256-CBC-SHA256
|
||||
DHE-RSA-AES128-CBC-SHA256
|
||||
ECDHE-PSK-AES256-CBC-SHA384
|
||||
ECDHE-PSK-AES128-CBC-SHA256
|
||||
ECDHE-ECDSA-AES256-CBC-SHA
|
||||
ECDHE-ECDSA-AES128-CBC-SHA
|
||||
ECDHE-RSA-AES256-CBC-SHA
|
||||
ECDHE-RSA-AES128-CBC-SHA
|
||||
DHE-RSA-AES256-CBC-SHA
|
||||
DHE-RSA-AES128-CBC-SHA
|
||||
ECDHE-PSK-AES256-CBC-SHA
|
||||
ECDHE-PSK-AES128-CBC-SHA
|
||||
RSA-AES256-GCM-SHA384
|
||||
RSA-AES128-GCM-SHA256
|
||||
RSA-AES256-CBC-SHA256
|
||||
RSA-AES128-CBC-SHA256
|
||||
RSA-AES256-CBC-SHA
|
||||
RSA-AES128-CBC-SHA
|
||||
PSK-AES256-GCM-SHA384
|
||||
PSK-AES128-GCM-SHA256
|
||||
PSK-CHACHA20-POLY1305-SHA256
|
||||
PSK-AES256-CBC-SHA384
|
||||
PSK-AES128-CBC-SHA256
|
||||
PSK-AES256-CBC-SHA
|
||||
PSK-AES128-CBC-SHA
|
||||
ECDHE-RSA-3DES-EDE-CBC-SHA
|
||||
DHE-RSA-3DES-EDE-CBC-SHA
|
||||
ECDHE-PSK-3DES-EDE-CBC-SHA
|
||||
RSA-3DES-EDE-CBC-SHA
|
||||
PSK-3DES-EDE-CBC-SHA
|
||||
|
||||
The names above are canonical to redbean and were simplified
|
||||
programmatically from the official IANA names. This function
|
||||
will accept the IANA names too. In most cases it will accept
|
||||
the OpenSSL and GnuTLS naming convention as well.
|
||||
|
||||
IsDaemon() → bool
|
||||
Returns true if -d flag was passed to redbean.
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ TOOL_NET_DIRECTDEPS = \
|
|||
LIBC_ZIPOS \
|
||||
NET_HTTP \
|
||||
NET_HTTPS \
|
||||
TOOL_BUILD_LIB \
|
||||
THIRD_PARTY_GDTOA \
|
||||
THIRD_PARTY_GETOPT \
|
||||
THIRD_PARTY_LUA \
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
#include "libc/runtime/runtime.h"
|
||||
#include "libc/sock/sock.h"
|
||||
#include "libc/stdio/append.internal.h"
|
||||
#include "libc/stdio/hex.internal.h"
|
||||
#include "libc/stdio/stdio.h"
|
||||
#include "libc/str/str.h"
|
||||
#include "libc/str/undeflate.h"
|
||||
|
|
@ -119,6 +120,7 @@
|
|||
#include "third_party/regex/regex.h"
|
||||
#include "third_party/zlib/zlib.h"
|
||||
#include "tool/build/lib/case.h"
|
||||
#include "tool/build/lib/psk.h"
|
||||
|
||||
/**
|
||||
* @fileoverview redbean - single-file distributable web server
|
||||
|
|
@ -248,6 +250,22 @@ static struct Unmaplist {
|
|||
} * p;
|
||||
} unmaplist;
|
||||
|
||||
static struct Psks {
|
||||
size_t n;
|
||||
struct Psk {
|
||||
char *key;
|
||||
size_t key_len;
|
||||
char *identity;
|
||||
size_t identity_len;
|
||||
char *s;
|
||||
} * p;
|
||||
} psks;
|
||||
|
||||
static struct Suites {
|
||||
size_t n;
|
||||
uint16_t *p;
|
||||
} suites;
|
||||
|
||||
static struct Certs {
|
||||
size_t n;
|
||||
struct Cert {
|
||||
|
|
@ -1467,10 +1485,14 @@ static void WipeKeySigningKeys(void) {
|
|||
}
|
||||
|
||||
static void WipeServingKeys(void) {
|
||||
size_t i;
|
||||
if (uniprocess) return;
|
||||
/* TODO(jart): We need to figure out MbedTLS ownership semantics here. */
|
||||
/* mbedtls_ssl_ticket_free(&ssltick); */
|
||||
/* mbedtls_ssl_key_cert_free(conf.key_cert); */
|
||||
for (i = 0; i < psks.n; ++i) {
|
||||
mbedtls_platform_zeroize(psks.p[i].key, psks.p[i].key_len);
|
||||
}
|
||||
}
|
||||
|
||||
static bool CertHasCommonName(const mbedtls_x509_crt *cert,
|
||||
|
|
@ -1570,6 +1592,21 @@ static int TlsRoute(void *ctx, mbedtls_ssl_context *ssl,
|
|||
return ok1 || ok2 ? 0 : -1;
|
||||
}
|
||||
|
||||
static int TlsRoutePsk(void *ctx, mbedtls_ssl_context *ssl,
|
||||
const unsigned char *identity, size_t identity_len) {
|
||||
size_t i;
|
||||
for (i = 0; i < psks.n; ++i) {
|
||||
if (SlicesEqual((void *)identity, identity_len, psks.p[i].identity,
|
||||
psks.p[i].identity_len)) {
|
||||
DEBUGF("TlsRoutePsk(%`'.*s)", identity_len, identity);
|
||||
mbedtls_ssl_set_hs_psk(ssl, psks.p[i].key, psks.p[i].key_len);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
VERBOSEF("TlsRoutePsk(%`'.*s) not found", identity_len, identity);
|
||||
return -1;
|
||||
}
|
||||
|
||||
static bool TlsSetup(void) {
|
||||
int r;
|
||||
oldin.p = inbuf.p;
|
||||
|
|
@ -1590,9 +1627,10 @@ static bool TlsSetup(void) {
|
|||
reader = SslRead;
|
||||
writer = SslWrite;
|
||||
WipeServingKeys();
|
||||
VERBOSEF("SHAKEN %s %s %s", DescribeClient(),
|
||||
mbedtls_ssl_get_ciphersuite(&ssl),
|
||||
mbedtls_ssl_get_version(&ssl));
|
||||
VERBOSEF("SHAKEN %s %s %s%s %s", DescribeClient(),
|
||||
mbedtls_ssl_get_ciphersuite(&ssl), mbedtls_ssl_get_version(&ssl),
|
||||
ssl.session->compression ? " COMPRESSED" : "",
|
||||
ssl.curve ? ssl.curve->name : "");
|
||||
return true;
|
||||
} else if (r == MBEDTLS_ERR_SSL_WANT_READ) {
|
||||
LockInc(&shared->c.handshakeinterrupts);
|
||||
|
|
@ -1878,7 +1916,7 @@ static void LoadCertificates(void) {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (!havecert) {
|
||||
if (!havecert && (!psks.n || ksk.key)) {
|
||||
if ((ksk = GetKeySigningKey()).key) {
|
||||
DEBUGF("generating ssl certificates using %`'s",
|
||||
gc(FormatX509Name(&ksk.cert->subject)));
|
||||
|
|
@ -2431,14 +2469,20 @@ static ssize_t Send(struct iovec *iov, int iovlen) {
|
|||
return rc;
|
||||
}
|
||||
|
||||
static bool IsSslCompressed(void) {
|
||||
return usessl && ssl.session->compression;
|
||||
}
|
||||
|
||||
static char *CommitOutput(char *p) {
|
||||
uint32_t crc;
|
||||
size_t outbuflen;
|
||||
if (!contentlength) {
|
||||
outbuflen = appendz(outbuf).i;
|
||||
if (istext && outbuflen >= 100) {
|
||||
p = stpcpy(p, "Vary: Accept-Encoding\r\n");
|
||||
if (!IsTiny() && ClientAcceptsGzip()) {
|
||||
if (!IsTiny() && !IsSslCompressed()) {
|
||||
p = stpcpy(p, "Vary: Accept-Encoding\r\n");
|
||||
}
|
||||
if (!IsTiny() && !IsSslCompressed() && ClientAcceptsGzip()) {
|
||||
gzipped = true;
|
||||
crc = crc32_z(0, outbuf, outbuflen);
|
||||
WRITE32LE(gzip_footer + 0, crc);
|
||||
|
|
@ -4824,6 +4868,49 @@ static int LuaProgramPidPath(lua_State *L) {
|
|||
return LuaProgramString(L, ProgramPidPath);
|
||||
}
|
||||
|
||||
static int LuaProgramSslPresharedKey(lua_State *L) {
|
||||
#ifndef UNSECURE
|
||||
struct Psk psk;
|
||||
size_t n1, n2, i;
|
||||
const char *p1, *p2;
|
||||
p1 = luaL_checklstring(L, 1, &n1);
|
||||
p2 = luaL_checklstring(L, 2, &n2);
|
||||
if (!n1 || n1 > MBEDTLS_PSK_MAX_LEN || !n2) {
|
||||
luaL_argerror(L, 1, "bad preshared key length");
|
||||
unreachable;
|
||||
}
|
||||
psk.key = memcpy(malloc(n1), p1, n1);
|
||||
psk.key_len = n1;
|
||||
psk.identity = memcpy(malloc(n2), p2, n2);
|
||||
psk.identity_len = n2;
|
||||
for (i = 0; i < psks.n; ++i) {
|
||||
if (SlicesEqual(psk.identity, psk.identity_len, psks.p[i].identity,
|
||||
psks.p[i].identity_len)) {
|
||||
mbedtls_platform_zeroize(psks.p[i].key, psks.p[i].key_len);
|
||||
free(psks.p[i].key);
|
||||
free(psks.p[i].identity);
|
||||
psks.p[i] = psk;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
psks.p = realloc(psks.p, ++psks.n * sizeof(*psks.p));
|
||||
psks.p[psks.n - 1] = psk;
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int LuaProgramSslCiphersuite(lua_State *L) {
|
||||
mbedtls_ssl_ciphersuite_t *suite;
|
||||
if (!(suite = GetCipherSuite(luaL_checkstring(L, 1)))) {
|
||||
luaL_argerror(L, 1, "unsupported or unknown ciphersuite");
|
||||
unreachable;
|
||||
}
|
||||
suites.p = realloc(suites.p, (++suites.n + 1) * sizeof(*suites.p));
|
||||
suites.p[suites.n - 1] = suite->id;
|
||||
suites.p[suites.n - 0] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int LuaProgramPrivateKey(lua_State *L) {
|
||||
#ifndef UNSECURE
|
||||
size_t n;
|
||||
|
|
@ -4885,6 +4972,13 @@ static int LuaEvadeDragnetSurveillance(lua_State *L) {
|
|||
return LuaProgramBool(L, &evadedragnetsurveillance);
|
||||
}
|
||||
|
||||
static int LuaProgramSslCompression(lua_State *L) {
|
||||
#ifndef UNSECURE
|
||||
conf.disable_compression = confcli.disable_compression = !lua_toboolean(L, 1);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int LuaGetLogLevel(lua_State *L) {
|
||||
lua_pushinteger(L, __log_level);
|
||||
return 1;
|
||||
|
|
@ -5321,8 +5415,11 @@ static const luaL_Reg kLuaFuncs[] = {
|
|||
{"ProgramPort", LuaProgramPort}, //
|
||||
{"ProgramPrivateKey", LuaProgramPrivateKey}, //
|
||||
{"ProgramRedirect", LuaProgramRedirect}, //
|
||||
{"ProgramSslCiphersuite", LuaProgramSslCiphersuite}, //
|
||||
{"ProgramSslClientVerify", LuaProgramSslClientVerify}, //
|
||||
{"ProgramSslCompression", LuaProgramSslCompression}, //
|
||||
{"ProgramSslFetchVerify", LuaProgramSslFetchVerify}, //
|
||||
{"ProgramSslPresharedKey", LuaProgramSslPresharedKey}, //
|
||||
{"ProgramSslTicketLifetime", LuaProgramSslTicketLifetime}, //
|
||||
{"ProgramTimeout", LuaProgramTimeout}, //
|
||||
{"ProgramUid", LuaProgramUid}, //
|
||||
|
|
@ -6015,7 +6112,8 @@ static char *ServeAsset(struct Asset *a, const char *path, size_t pathlen) {
|
|||
} else {
|
||||
return ServeError(500, "Internal Server Error");
|
||||
}
|
||||
} else if (!IsTiny() && msg.method != kHttpHead && ClientAcceptsGzip() &&
|
||||
} else if (!IsTiny() && msg.method != kHttpHead && !IsSslCompressed() &&
|
||||
ClientAcceptsGzip() &&
|
||||
((contentlength >= 100 && StartsWithIgnoreCase(ct, "text/")) ||
|
||||
(contentlength >= 1000 && MeasureEntropy(content, 1000) < 6))) {
|
||||
p = ServeAssetCompressed(a);
|
||||
|
|
@ -6165,8 +6263,9 @@ static bool HandleMessage(void) {
|
|||
} else {
|
||||
LockInc(&shared->c.badmessages);
|
||||
connectionclose = true;
|
||||
LOGF("%s sent garbage %`'s", DescribeClient(),
|
||||
VisualizeControlCodes(inbuf.p, MIN(128, amtread), 0));
|
||||
if ((p = DumpHexc(inbuf.p, MIN(amtread, 256), 0))) {
|
||||
LOGF("%s sent garbage %s", DescribeClient(), p);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if (!msgsize) {
|
||||
|
|
@ -6219,6 +6318,14 @@ static void InitRequest(void) {
|
|||
InitHttpMessage(&msg, kHttpRequest);
|
||||
}
|
||||
|
||||
static bool IsSsl(unsigned char c) {
|
||||
if (c == 22) return true;
|
||||
if (!(c & 128)) return false;
|
||||
/* RHEL5 sends SSLv2 hello but supports TLS */
|
||||
DEBUGF("%s SSLv2 hello D:", DescribeClient());
|
||||
return true;
|
||||
}
|
||||
|
||||
static void HandleMessages(void) {
|
||||
bool once;
|
||||
ssize_t rc;
|
||||
|
|
@ -6239,7 +6346,7 @@ static void HandleMessages(void) {
|
|||
#ifndef UNSECURE
|
||||
if (!once) {
|
||||
once = true;
|
||||
if (inbuf.p[0] == 22) {
|
||||
if (IsSsl(inbuf.p[0])) {
|
||||
if (TlsSetup()) {
|
||||
continue;
|
||||
} else {
|
||||
|
|
@ -6605,6 +6712,16 @@ static void TlsInit(void) {
|
|||
MBEDTLS_SSL_TRANSPORT_STREAM, suite);
|
||||
mbedtls_ssl_config_defaults(&confcli, MBEDTLS_SSL_IS_CLIENT,
|
||||
MBEDTLS_SSL_TRANSPORT_STREAM, suite);
|
||||
if (suites.n) {
|
||||
mbedtls_ssl_conf_ciphersuites(&conf, suites.p);
|
||||
mbedtls_ssl_conf_ciphersuites(&confcli, suites.p);
|
||||
}
|
||||
if (psks.n) {
|
||||
mbedtls_ssl_conf_psk_cb(&conf, TlsRoutePsk, 0);
|
||||
DCHECK_EQ(0,
|
||||
mbedtls_ssl_conf_psk(&confcli, psks.p[0].key, psks.p[0].key_len,
|
||||
psks.p[0].identity, psks.p[0].identity_len));
|
||||
}
|
||||
if (sslticketlifetime > 0) {
|
||||
mbedtls_ssl_ticket_setup(&ssltick, mbedtls_ctr_drbg_random, &rng,
|
||||
MBEDTLS_CIPHER_AES_256_GCM, sslticketlifetime);
|
||||
|
|
@ -6628,6 +6745,7 @@ static void TlsInit(void) {
|
|||
mbedtls_ssl_conf_authmode(&confcli, MBEDTLS_SSL_VERIFY_NONE);
|
||||
}
|
||||
mbedtls_ssl_set_bio(&ssl, &g_bio, TlsSend, 0, TlsRecv);
|
||||
conf.disable_compression = confcli.disable_compression = true;
|
||||
DCHECK_EQ(0, mbedtls_ssl_conf_alpn_protocols(&conf, kAlpn));
|
||||
DCHECK_EQ(0, mbedtls_ssl_conf_alpn_protocols(&confcli, kAlpn));
|
||||
DCHECK_EQ(0, mbedtls_ssl_setup(&ssl, &conf));
|
||||
|
|
@ -6638,6 +6756,11 @@ static void TlsInit(void) {
|
|||
static void TlsDestroy(void) {
|
||||
#ifndef UNSECURE
|
||||
size_t i;
|
||||
for (i = 0; i < psks.n; ++i) {
|
||||
mbedtls_platform_zeroize(psks.p[i].key, psks.p[i].key_len);
|
||||
free(psks.p[i].key);
|
||||
free(psks.p[i].identity);
|
||||
}
|
||||
mbedtls_ssl_free(&ssl);
|
||||
mbedtls_ssl_free(&sslcli);
|
||||
mbedtls_ctr_drbg_free(&rng);
|
||||
|
|
@ -6651,9 +6774,11 @@ static void TlsDestroy(void) {
|
|||
/* mbedtls_x509_crt_free(certs.p[i].cert); */
|
||||
/* mbedtls_pk_free(certs.p[i].key); */
|
||||
/* } */
|
||||
free(certs.p), certs.p = 0, certs.n = 0;
|
||||
free(ports.p), ports.p = 0, ports.n = 0;
|
||||
free(ips.p), ips.p = 0, ips.n = 0;
|
||||
Free(&suites.p), suites.n = 0;
|
||||
Free(&certs.p), certs.n = 0;
|
||||
Free(&ports.p), ports.n = 0;
|
||||
Free(&psks.p), psks.n = 0;
|
||||
Free(&ips.p), ips.n = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue