Skip to content

Commit f9a74eb

Browse files
committed
more fix
1 parent 36af2ea commit f9a74eb

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

src/ngx_http_lua_ssl_client_helloby.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,9 @@ ngx_http_lua_ffi_ssl_get_client_hello_server_name(ngx_http_request_t *r,
544544
#ifdef LIBRESSL_VERSION_NUMBER
545545
*err = "LibreSSL does not support by ssl_client_hello_by_lua*";
546546
return NGX_ERROR;
547+
#elif defined(OPENSSL_IS_AWSLC)
548+
*err = "AWS-LC does not support by ssl_client_hello_by_lua*";
549+
return NGX_ERROR;
547550
#else
548551
ngx_ssl_conn_t *ssl_conn;
549552
#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
@@ -634,6 +637,9 @@ ngx_http_lua_ffi_ssl_get_client_hello_ext(ngx_http_request_t *r,
634637
#ifdef LIBRESSL_VERSION_NUMBER
635638
*err = "LibreSSL does not support by ssl_client_hello_by_lua*";
636639
return NGX_ERROR;
640+
#elif defined(OPENSSL_IS_AWSLC)
641+
*err = "AWSLC does not support by ssl_client_hello_by_lua*";
642+
return NGX_ERROR;
637643
#else
638644
ngx_ssl_conn_t *ssl_conn;
639645

src/ngx_http_lua_ssl_export_keying_material.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ngx_http_lua_ffi_ssl_export_keying_material(ngx_http_request_t *r,
3131
u_char *out, size_t out_size, const char *label, size_t llen,
3232
const u_char *context, size_t ctxlen, int use_ctx, char **err)
3333
{
34-
#if defined(OPENSSL_IS_BORINGSSL)
34+
#if defined(OPENSSL_IS_BORINGSSL) && !defined(OPENSSL_IS_AWSLC)
3535
*err = "BoringSSL does not support SSL_export_keying_material";
3636
return NGX_ERROR;
3737
#elif defined(LIBRESSL_VERSION_NUMBER)

src/ngx_http_lua_ssl_ocsp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ ngx_http_lua_ffi_ssl_set_ocsp_status_resp(ngx_http_request_t *r,
511511
return NGX_ERROR;
512512
}
513513

514-
#ifdef SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE
514+
#if defined(SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE) || defined(OPENSSL_IS_AWSLC)
515515
if (SSL_get_tlsext_status_type(ssl_conn) == -1) {
516516
#else
517517
if (ssl_conn->tlsext_status_type == -1) {

t/140-ssl-c-api.t

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ my $openssl_version = eval { `$NginxBinary -V 2>&1` };
1111
if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
1212
plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
1313

14-
} elsif ($openssl_version =~ m/AWS-LC/) {
15-
plan(skip_all => "does not support AWS-LC");
1614
} else {
1715
plan tests => repeat_each() * (blocks() * 5 - 1);
1816
}

0 commit comments

Comments
 (0)