rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

mod_ssl: fix request body buffering w/TLSv1.3 PHA (#1775146)

Browse Source
This commit is contained in:
Joe Orton 2019-11-21 16:56:37 +00:00
parent 401f5d1ca7
commit b3ceae982a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
httpd-2.4.41-r1870095.patch → httpd-2.4.41-r1870095+.patch
View File

@ -1,7 +1,6 @@
# ./pullrev.sh 1870095
# ./pullrev.sh 1870095 1870097
http://svn.apache.org/viewvc?view=revision&revision=1870095
https://bugzilla.redhat.com/show_bug.cgi?id=1775146
http://svn.apache.org/viewvc?view=revision&revision=1870097
--- httpd-2.4.41/modules/ssl/ssl_engine_kernel.c
+++ httpd-2.4.41/modules/ssl/ssl_engine_kernel.c
@ -98,22 +97,21 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1775146
}
}
@@ -1132,7 +1144,18 @@
@@ -1132,6 +1144,17 @@
}
}
+ /* Fill reneg buffer if required. */
if (change_vmode) {
+ if (change_vmode) {
+ rc = fill_reneg_buffer(r, dc);
+ if (rc) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO()
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10228)
+ "could not buffer message body to allow "
+ "TLS Post-Handshake Authentication to proceed");
+ return rc;
+ }
+ }
+
+ if (change_vmode) {
if (change_vmode) {
char peekbuf[1];
if (r->connection->master) {

2
httpd.spec
View File

@ -87,7 +87,7 @@ Patch42: httpd-2.4.41-r1828172+.patch
Patch58: httpd-2.4.34-r1738878.patch
Patch60: httpd-2.4.34-enable-sslv3.patch
Patch61: httpd-2.4.41-r1865749.patch
Patch62: httpd-2.4.41-r1870095.patch
Patch62: httpd-2.4.41-r1870095+.patch
# Security fixes