[Git][debian-proftpd-team/proftpd][buster] Cannot disable client-initiated renegotiation for FTPS #1119 .

[Hilmar Preuße]

Hilmar Preuße pushed to branch buster at Debian ProFTPD Team / proftpd


Commits:
ba0be904 by Hilmar Preusse at 2020-10-05T21:40:34+02:00
Cannot disable client-initiated renegotiation for FTPS #1119 .

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/upstream_pull_1076


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.6-4+deb10u6) buster-security; urgency=medium
+
+  * Add patch for Issue #1119: Cannot disable client-initiated
+    renegotiation for FTPS
+    https://github.com/proftpd/proftpd/issues/1119
+
+ -- Hilmar Preusse <hille42 at web.de>  Mon, 05 Oct 2020 21:17:00 +0200
+
 proftpd-dfsg (1.3.6-4+deb10u5) buster; urgency=medium
 
   * Patch for upstream Issue #656 (Closes: #951412)


=====================================
debian/patches/series
=====================================
@@ -24,3 +24,4 @@ Issue-903-Ensure-that-we-do-not-reuse-already-destro.patch
 Issue-903-We-want-to-remove-the-data-transfer-comman.patch
 upstream_pull_657
 upstream_pull_885
+upstream_pull_1076


=====================================
debian/patches/upstream_pull_1076
=====================================
@@ -0,0 +1,17 @@
+Index: proftpd-dfsg-1.3.6/contrib/mod_tls.c
+===================================================================
+--- proftpd-dfsg-1.3.6.orig/contrib/mod_tls.c
++++ proftpd-dfsg-1.3.6/contrib/mod_tls.c
+@@ -951,7 +951,10 @@ static void tls_info_cb(const SSL *ssl,
+     }
+ 
+   } else if (where & SSL_CB_HANDSHAKE_DONE) {
+-    if (ssl == ctrl_ssl) {
++    /* ctrl_ssl is NULL if this is our initial ctrl SSL, and the handshake has
++     * not be completed yet.
++     */
++    if (ctrl_ssl == NULL) {
+       if (tls_ctrl_need_init_handshake == FALSE) {
+         int reused;
+ 
+



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/ba0be904d34258e60252a5789367ce257c333347

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/ba0be904d34258e60252a5789367ce257c333347
You're receiving this email because of your account on salsa.debian.org.