diff options
| author | Stefan Eissing <icing@apache.org> | 2023-05-02 08:36:02 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2023-05-02 08:36:02 +0000 |
| commit | 918620a183d843fb393ed939423a25d42c1044ec (patch) | |
| tree | a2cf992aca4b830368cf506943eeaf02d1ad353d | |
| parent | 2b6da8e45d41dfc84eaab193871ba8bc976b94d5 (diff) | |
| download | httpd-918620a183d843fb393ed939423a25d42c1044ec.tar.gz | |
*) mod_tls: updating to rustls-ffi version 0.9.2 or higher.
Checking in configure for proper version installed. Code
fixes for changed clienthello member name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909558 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | changes-entries/tls-rustls-update.txt | 4 | ||||
| -rw-r--r-- | modules/tls/config2.m4 | 3 | ||||
| -rw-r--r-- | modules/tls/tls_core.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/changes-entries/tls-rustls-update.txt b/changes-entries/tls-rustls-update.txt new file mode 100644 index 0000000000..9008d9e0e1 --- /dev/null +++ b/changes-entries/tls-rustls-update.txt @@ -0,0 +1,4 @@ + *) mod_tls: updating to rustls-ffi version 0.9.2 or higher. + Checking in configure for proper version installed. Code + fixes for changed clienthello member name. + [Stefan Eissing]
\ No newline at end of file diff --git a/modules/tls/config2.m4 b/modules/tls/config2.m4 index af97178866..8a32490cb6 100644 --- a/modules/tls/config2.m4 +++ b/modules/tls/config2.m4 @@ -109,9 +109,10 @@ AC_DEFUN([APACHE_CHECK_RUSTLS],[ fi fi - AC_MSG_CHECKING([for rustls version >= 0.8.2]) + AC_MSG_CHECKING([for rustls version >= 0.9.2]) AC_TRY_COMPILE([#include <rustls.h>],[ rustls_version(); +rustls_acceptor_new(); ], [AC_MSG_RESULT(OK) ac_cv_rustls=yes], diff --git a/modules/tls/tls_core.c b/modules/tls/tls_core.c index 38c8873009..25479392f1 100644 --- a/modules/tls/tls_core.c +++ b/modules/tls/tls_core.c @@ -507,8 +507,8 @@ static const rustls_certified_key *extract_client_hello_values( ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, "extract client hello values"); if (!cc) goto cleanup; cc->client_hello_seen = 1; - if (hello->sni_name.len > 0) { - cc->sni_hostname = apr_pstrndup(c->pool, hello->sni_name.data, hello->sni_name.len); + if (hello->server_name.len > 0) { + cc->sni_hostname = apr_pstrndup(c->pool, hello->server_name.data, hello->server_name.len); ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "sni detected: %s", cc->sni_hostname); } else { |