Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tls: removed alpn selector requirement #9599

Merged
merged 1 commit into from
Nov 17, 2024
Merged

tls: removed alpn selector requirement #9599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 59 additions & 58 deletions src/tls/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,54 @@ static void tls_context_destroy(void *ctx_backend)
flb_free(ctx);
}

static int tls_context_server_alpn_select_callback(SSL *ssl,
const unsigned char **out,
unsigned char *outlen,
const unsigned char *in,
unsigned int inlen,
void *arg)
{
int result;
struct tls_context *ctx;

ctx = (struct tls_context *) arg;

result = SSL_TLSEXT_ERR_NOACK;

if (ctx->alpn != NULL) {
result = SSL_select_next_proto((unsigned char **) out,
outlen,
(const unsigned char *) &ctx->alpn[1],
(unsigned int) ctx->alpn[0],
in,
inlen);

if (result == OPENSSL_NPN_NEGOTIATED) {
result = SSL_TLSEXT_ERR_OK;
}
else if (result == OPENSSL_NPN_NO_OVERLAP) {
result = SSL_TLSEXT_ERR_ALERT_FATAL;
}
}

return result;
}

static int tls_context_client_alpn_select_callback(SSL *ssl,
unsigned char **out,
unsigned char *outlen,
const unsigned char *in,
unsigned int inlen,
void *arg)
{
return tls_context_server_alpn_select_callback(ssl,
(const unsigned char **) out,
outlen,
in,
inlen,
arg);
}

int tls_context_alpn_set(void *ctx_backend, const char *alpn)
{
size_t wire_format_alpn_index;
Expand Down Expand Up @@ -205,58 +253,24 @@ int tls_context_alpn_set(void *ctx_backend, const char *alpn)
if (result != 0) {
result = -1;
}

return result;
}

static int tls_context_server_alpn_select_callback(SSL *ssl,
const unsigned char **out,
unsigned char *outlen,
const unsigned char *in,
unsigned int inlen,
void *arg)
{
int result;
struct tls_context *ctx;

ctx = (struct tls_context *) arg;

result = SSL_TLSEXT_ERR_NOACK;

if (ctx->alpn != NULL) {
result = SSL_select_next_proto((unsigned char **) out,
outlen,
(const unsigned char *) &ctx->alpn[1],
(unsigned int) ctx->alpn[0],
in,
inlen);

if (result == OPENSSL_NPN_NEGOTIATED) {
result = SSL_TLSEXT_ERR_OK;
else {
if (ctx->mode == FLB_TLS_SERVER_MODE) {
SSL_CTX_set_alpn_select_cb(
ctx->ctx,
tls_context_server_alpn_select_callback,
ctx);
}
else if (result == OPENSSL_NPN_NO_OVERLAP) {
result = SSL_TLSEXT_ERR_ALERT_FATAL;
else {
SSL_CTX_set_next_proto_select_cb(
ctx->ctx,
tls_context_client_alpn_select_callback,
ctx);
}
}

return result;
}

static int tls_context_client_alpn_select_callback(SSL *ssl,
unsigned char **out,
unsigned char *outlen,
const unsigned char *in,
unsigned int inlen,
void *arg)
{
return tls_context_server_alpn_select_callback(ssl,
(const unsigned char **) out,
outlen,
in,
inlen,
arg);
}

#ifdef _MSC_VER
static int windows_load_system_certificates(struct tls_context *ctx)
{
Expand Down Expand Up @@ -515,19 +529,6 @@ static void *tls_context_create(int verify,
ctx->debug_level = debug;
pthread_mutex_init(&ctx->mutex, NULL);

if (mode == FLB_TLS_SERVER_MODE) {
SSL_CTX_set_alpn_select_cb(
ssl_ctx,
tls_context_server_alpn_select_callback,
ctx);
}
else {
SSL_CTX_set_next_proto_select_cb(
ssl_ctx,
tls_context_client_alpn_select_callback,
ctx);
}

/* Verify peer: by default OpenSSL always verify peer */
if (verify == FLB_FALSE) {
SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_NONE, NULL);
Expand Down
Loading