mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 19:14:30 +04:00
2b99cd7d76
- Remove obsolete patch - Add patch replace NPN with ALPN for client connections \ because the default OpenSSL library does not enable NPN. - Add newly libstdcpp dependency Build system: aarch64 Build-tested: mediatek/filogic Run-tested: mediatek/filogic Signed-off-by: Biao Zhu <zhumouren0623@qq.com>
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 1d8ae53900e27a28fa31adb7f71f235ce919bafc Mon Sep 17 00:00:00 2001
|
|
From: Biao Zhu <zhumouren0623@qq.com>
|
|
Date: Tue, 2 Sep 2025 23:45:31 +0800
|
|
Subject: [PATCH] tls: replace NPN with ALPN for client connections
|
|
|
|
Signed-off-by: Biao Zhu <zhumouren0623@qq.com>
|
|
---
|
|
src/tls/openssl.c | 28 +++++++++-------------------
|
|
1 file changed, 9 insertions(+), 19 deletions(-)
|
|
|
|
--- a/src/tls/openssl.c
|
|
+++ b/src/tls/openssl.c
|
|
@@ -198,21 +198,6 @@ static int tls_context_server_alpn_selec
|
|
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;
|
|
@@ -283,10 +268,15 @@ int tls_context_alpn_set(void *ctx_backe
|
|
ctx);
|
|
}
|
|
else {
|
|
- SSL_CTX_set_next_proto_select_cb(
|
|
- ctx->ctx,
|
|
- tls_context_client_alpn_select_callback,
|
|
- ctx);
|
|
+ if (ctx->alpn == NULL) {
|
|
+ return -1;
|
|
+ }
|
|
+ if (SSL_CTX_set_alpn_protos(
|
|
+ ctx->ctx,
|
|
+ (const unsigned char *) &ctx->alpn[1],
|
|
+ (unsigned int) ctx->alpn[0]) != 0) {
|
|
+ return -1;
|
|
+ }
|
|
}
|
|
}
|
|
|