You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2023/05/02 09:21:07 UTC
svn commit: r1909561 - in /httpd/httpd/branches/2.4.x: ./ changes-entries/tls-rustls-update.txt modules/tls/config2.m4 modules/tls/tls_core.c
Author: icing
Date: Tue May 2 09:21:07 2023
New Revision: 1909561
URL: http://svn.apache.org/viewvc?rev=1909561&view=rev
Log:
Backport of r1909558 from trunk:
*) 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.
Added:
httpd/httpd/branches/2.4.x/changes-entries/tls-rustls-update.txt
- copied unchanged from r1909558, httpd/httpd/trunk/changes-entries/tls-rustls-update.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/tls/config2.m4
httpd/httpd/branches/2.4.x/modules/tls/tls_core.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1909558
Modified: httpd/httpd/branches/2.4.x/modules/tls/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/tls/config2.m4?rev=1909561&r1=1909560&r2=1909561&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/tls/config2.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/tls/config2.m4 Tue May 2 09:21:07 2023
@@ -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],
Modified: httpd/httpd/branches/2.4.x/modules/tls/tls_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/tls/tls_core.c?rev=1909561&r1=1909560&r2=1909561&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/tls/tls_core.c (original)
+++ httpd/httpd/branches/2.4.x/modules/tls/tls_core.c Tue May 2 09:21:07 2023
@@ -507,8 +507,8 @@ static const rustls_certified_key *extra
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 {