[Git][debian-proftpd-team/proftpd][master] Apply patch for upstream issue #2411.

[Hilmar Preuße (@hilmar)]

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


Commits:
c1f07927 by Hilmar Preuße at 2026-10-27T21:57:13+01:00
Apply patch for upstream issue #2411.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/933abc9ae115ffc59e4b2a98495ec267bf341d23.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+proftpd-dfsg (1.3.9e~dfsg-2) UNRELEASED; urgency=medium
+
+  * apply patch for upstream issue #2411.
+
+ -- Hilmar Preuße <hille42 at debian.org>  Tue, 27 Oct 2026 21:36:28 +0100
+
 proftpd-dfsg (1.3.9e~dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/933abc9ae115ffc59e4b2a98495ec267bf341d23.diff
=====================================
@@ -0,0 +1,28 @@
+From 933abc9ae115ffc59e4b2a98495ec267bf341d23 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Tue, 27 Oct 2026 12:56:31 -0700
+Subject: [PATCH] Issue #2411: Fix regression in the handling of private keys
+ formatted using the OpenSSH-specific private key format, and which are not
+ passphrase-protected.
+
+---
+ contrib/mod_sftp/keys.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/mod_sftp/keys.c b/contrib/mod_sftp/keys.c
+index 5e848a84d..af842926b 100644
+--- a/contrib/mod_sftp/keys.c
++++ b/contrib/mod_sftp/keys.c
+@@ -3093,8 +3093,10 @@ static int decrypt_openssh_data(pool *p, const char *path,
+   uint32_t buflen, key_len, rounds, salt_len;
+   size_t passphrase_len;
+ 
+-  if (encrypted_data == NULL ||
+-      kdf_data == NULL) {
++  /* Note: kdf_data CAN legitimately be NULL here, as for keys which
++   * are not passphrase-encrypted (Issue #2411).
++   */
++  if (encrypted_data == NULL) {
+     pr_trace_msg(trace_channel, 3,
+       "'%s' key is missing required data", path);
+     errno = EINVAL;


=====================================
debian/patches/series
=====================================
@@ -19,3 +19,4 @@ odbc
 #d4ff72c0c32db68ef2cecfe08c53ac42a7bf85dd.diff
 #2148.diff
 #ca9a7469ced3a7baf8ab9cc97f7c6b4c5ee3de75.diff
+933abc9ae115ffc59e4b2a98495ec267bf341d23.diff



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

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/c1f079271f1fad575d45a02d2b49d93e5b5e0702
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help