[Git][debian-proftpd-team/proftpd][bookworm] Add patch from upstream to address issue 1694.

[Hilmar Preuße (@hilmar-guest)]

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


Commits:
678a6313 by Hilmar Preuße at 2023-11-07T23:50:48+01:00
Add patch from upstream to address issue 1694.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/upstream_1707.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+proftpd-dfsg (1.3.8+dfsg-4+deb12u2) UNRELEASED; urgency=medium
+
+  * Add patch from upstream to address issue 1694 (Closes: #1051236).
+
+ -- Hilmar Preusse <hille42 at web.de>  Tue, 07 Nov 2023 23:14:26 +0100
+
 proftpd-dfsg (1.3.8+dfsg-4+deb12u1) bookworm; urgency=medium
 
   * Now do not enable proftpd.socket to avoid conflicts at boot time.


=====================================
debian/patches/series
=====================================
@@ -17,3 +17,4 @@ upstream_bug_1597.diff
 01_disable_inet_connect_ipv4_test.diff
 02_disable_redis_sentinel_conn_new_test.diff
 03_disable_all_non_api_tests.diff
+upstream_1707.diff


=====================================
debian/patches/upstream_1707.diff
=====================================
@@ -0,0 +1,69 @@
+--- proftpd.orig/contrib/mod_sftp/kex.c
++++ proftpd/contrib/mod_sftp/kex.c
+@@ -52,6 +52,12 @@
+  */
+ #define SFTP_DH_PREF_MIN_LEN	2048
+ 
++/* Define the size of the buffer we use to compute H.  Note that this buffer
++ * needs to be large enough to contain the KEXINIT messages from both client
++ * and server; see Issue#1694.
++ */
++#define SFTP_KEX_H_BUFLEN	8192
++
+ extern pr_response_t *resp_list, *resp_err_list;
+ extern module sftp_module;
+ 
+@@ -312,7 +318,7 @@
+   unsigned char *buf, *ptr;
+   uint32_t buflen, bufsz;
+ 
+-  bufsz = buflen = 8192;
++  bufsz = buflen = SFTP_KEX_H_BUFLEN;
+ 
+   /* XXX Is this buffer large enough? Too large? */
+   ptr = buf = sftp_msg_getbuf(kex_pool, bufsz);
+@@ -441,7 +447,7 @@
+   unsigned char *buf, *ptr;
+   uint32_t buflen, bufsz;
+ 
+-  bufsz = buflen = 8192;
++  bufsz = buflen = SFTP_KEX_H_BUFLEN;
+ 
+   /* XXX Is this buffer large enough? Too large? */
+   ptr = buf = sftp_msg_getbuf(kex_pool, bufsz);
+@@ -590,7 +596,7 @@
+   unsigned char *buf, *ptr;
+   uint32_t buflen, bufsz;
+ 
+-  bufsz = buflen = 4096;
++  bufsz = buflen = SFTP_KEX_H_BUFLEN;
+ 
+   /* XXX Is this buffer large enough? Too large? */
+   ptr = buf = sftp_msg_getbuf(kex_pool, bufsz);
+@@ -704,7 +710,7 @@
+   unsigned char *buf, *ptr;
+   uint32_t buflen, bufsz;
+ 
+-  bufsz = buflen = 4096;
++  bufsz = buflen = SFTP_KEX_H_BUFLEN;
+ 
+   /* XXX Is this buffer large enough? Too large? */
+   ptr = buf = sftp_msg_getbuf(kex_pool, bufsz);
+@@ -4142,7 +4148,7 @@
+   unsigned char *buf, *ptr;
+   uint32_t buflen, bufsz;
+ 
+-  bufsz = buflen = 4096;
++  bufsz = buflen = SFTP_KEX_H_BUFLEN;
+ 
+   /* XXX Is this buffer large enough? Too large? */
+   ptr = buf = sftp_msg_getbuf(kex_pool, bufsz);
+@@ -4584,7 +4590,7 @@
+   unsigned char *buf, *ptr;
+   uint32_t buflen, bufsz;
+ 
+-  bufsz = buflen = 4096;
++  bufsz = buflen = SFTP_KEX_H_BUFLEN;
+ 
+   /* XXX Is this buffer large enough? Too large? */
+   ptr = buf = sftp_msg_getbuf(kex_pool, bufsz);



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

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