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

feature: support AWS-LC SSL Library. #2357

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

feature: support AWS-LC SSL Library. #2357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f07d7d2
feature: support AWS-LC SSL Library.
devhaozi Sep 5, 2024
340b496
feature: add AWS-LC patches and tests
devhaozi Sep 6, 2024
32b392d
fix: remove test patch
devhaozi Sep 6, 2024
3095503
fix: patch
devhaozi Sep 6, 2024
44fe442
fix: patch
devhaozi Sep 6, 2024
870f062
feature: update ci to jammy
devhaozi Sep 6, 2024
b42b049
fix: patch
devhaozi Sep 6, 2024
a01e9f7
fix: patch
devhaozi Sep 6, 2024
e7c8e2a
fix: patch
devhaozi Sep 6, 2024
6a6e085
fix: patch
devhaozi Sep 6, 2024
696d948
chore: test stream-lua-nginx-module
devhaozi Sep 6, 2024
a8e5bfc
fix: skip some tests
devhaozi Sep 6, 2024
8a41b5c
fix: skip 140 test
devhaozi Sep 6, 2024
09ed48f
chore: finish test
devhaozi Sep 6, 2024
0f47978
fix: error
devhaozi Sep 6, 2024
7f5cf8a
Merge branch 'master' into master
devhaozi Sep 19, 2024
3c61cd9
Merge branch 'openresty:master' into master
devhaozi Oct 9, 2024
2a4a6b8
feat: optimize
devhaozi Oct 9, 2024
a0e14c3
feat: optimize
devhaozi Oct 9, 2024
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
Prev Previous commit
Next Next commit
fix: patch
  • Loading branch information
@devhaozi
devhaozi committed Sep 6, 2024
commit b42b0495840437fab0daf9b32a0d7023d9ba2b00
120 changes: 0 additions & 120 deletions util/aws-lc-nginx-tests.patch
View file
Open in desktop

This file was deleted.

36 changes: 18 additions & 18 deletions util/aws-lc-nginx.patch → util/nginx-1.27.1-aws-lc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
diff --git a/nginx-1.27.1/src/event/ngx_event_openssl.h b/nginx-1.27.1/src/event/ngx_event_openssl.h
index c062f91..447f003 100644
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
--- a/nginx-1.27.1/src/event/ngx_event_openssl.h
+++ b/nginx-1.27.1/src/event/ngx_event_openssl.h
@@ -25,7 +25,7 @@
#endif
#include <openssl/evp.h>
Expand All @@ -11,10 +11,10 @@ index c062f91..447f003 100644
#include <openssl/hkdf.h>
#include <openssl/chacha.h>
#else
diff --git a/src/event/quic/ngx_event_quic.c b/src/event/quic/ngx_event_quic.c
diff --git a/nginx-1.27.1/src/event/quic/ngx_event_quic.c b/nginx-1.27.1/src/event/quic/ngx_event_quic.c
index b0cf056..c1ba43f 100644
--- a/src/event/quic/ngx_event_quic.c
+++ b/src/event/quic/ngx_event_quic.c
--- a/nginx-1.27.1/src/event/quic/ngx_event_quic.c
+++ b/nginx-1.27.1/src/event/quic/ngx_event_quic.c
@@ -969,7 +969,7 @@ ngx_quic_handle_payload(ngx_connection_t *c, ngx_quic_header_t *pkt)
return NGX_DECLINED;
}
Expand All @@ -24,10 +24,10 @@ index b0cf056..c1ba43f 100644
/* OpenSSL provides read keys for an application level before it's ready */

if (pkt->level == ssl_encryption_application && !c->ssl->handshaked) {
diff --git a/src/event/quic/ngx_event_quic_protection.c b/src/event/quic/ngx_event_quic_protection.c
diff --git a/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.c b/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.c
index 88e6954..cd67eac 100644
--- a/src/event/quic/ngx_event_quic_protection.c
+++ b/src/event/quic/ngx_event_quic_protection.c
--- a/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.c
+++ b/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.c
@@ -30,7 +30,7 @@ static uint64_t ngx_quic_parse_pn(u_char **pos, ngx_int_t len, u_char *mask,

static ngx_int_t ngx_quic_crypto_open(ngx_quic_secret_t *s, ngx_str_t *out,
Expand Down Expand Up @@ -160,10 +160,10 @@ index 88e6954..cd67eac 100644
uint32_t cnt;

if (ctx == NULL) {
diff --git a/src/event/quic/ngx_event_quic_protection.h b/src/event/quic/ngx_event_quic_protection.h
diff --git a/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.h b/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.h
index 34cfee6..20cd910 100644
--- a/src/event/quic/ngx_event_quic_protection.h
+++ b/src/event/quic/ngx_event_quic_protection.h
--- a/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.h
+++ b/nginx-1.27.1/src/event/quic/ngx_event_quic_protection.h
@@ -24,7 +24,7 @@
#define NGX_QUIC_MAX_MD_SIZE 48

Expand All @@ -173,10 +173,10 @@ index 34cfee6..20cd910 100644
#define ngx_quic_cipher_t EVP_AEAD
#define ngx_quic_crypto_ctx_t EVP_AEAD_CTX
#else
diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c
diff --git a/nginx-1.27.1/src/event/quic/ngx_event_quic_ssl.c b/nginx-1.27.1/src/event/quic/ngx_event_quic_ssl.c
index 7872783..163e0c5 100644
--- a/src/event/quic/ngx_event_quic_ssl.c
+++ b/src/event/quic/ngx_event_quic_ssl.c
--- a/nginx-1.27.1/src/event/quic/ngx_event_quic_ssl.c
+++ b/nginx-1.27.1/src/event/quic/ngx_event_quic_ssl.c
@@ -11,6 +11,7 @@


Expand All @@ -194,9 +194,9 @@ index 7872783..163e0c5 100644
if (SSL_set_quic_early_data_context(ssl_conn, p, clen) == 0) {
ngx_log_error(NGX_LOG_INFO, c->log, 0,
"quic SSL_set_quic_early_data_context() failed");
diff -r 5e9239920061 -r dfffc67d286b src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c Mon Feb 26 20:00:30 2024 +0000
+++ b/src/event/ngx_event_openssl.c Mon Feb 26 20:00:32 2024 +0000
diff --git a/nginx-1.27.1/src/event/ngx_event_openssl.h b/nginx-1.27.1/src/event/ngx_event_openssl.h
--- a/nginx-1.27.1/src/event/ngx_event_openssl.c Mon Feb 26 20:00:30 2024 +0000
+++ b/nginx-1.27.1/src/event/ngx_event_openssl.c Mon Feb 26 20:00:32 2024 +0000
@@ -5163,6 +5163,72 @@
return NGX_OK;
}
Expand Down
Loading