[Git][debian-proftpd-team/proftpd][master] Add patch for upstream #1769.

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

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


Commits:
4076f2b5 by Hilmar Preuße at 2024-05-22T09:15:33+02:00
Add patch for upstream #1769.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/85ff1cb9fb2feaae9928b50d05afd657fec3cfb4.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.8.b+dfsg-3) UNRELEASED; urgency=medium
+
+  * Patches:
+    - Fetch pubkey from certificate before extracting its
+      parameters (upstream #1769)
+
+ -- Hilmar Preusse <hille42 at web.de>  Wed, 22 May 2024 09:12:08 +0200
+
 proftpd-dfsg (1.3.8.b+dfsg-2) unstable; urgency=medium
 
   * Add libnsl-dev to BD (Closes: #1066117).


=====================================
debian/patches/85ff1cb9fb2feaae9928b50d05afd657fec3cfb4.diff
=====================================
@@ -0,0 +1,23 @@
+From 85ff1cb9fb2feaae9928b50d05afd657fec3cfb4 Mon Sep 17 00:00:00 2001
+From: Manuel Mausz <manuel at mausz.at>
+Date: Thu, 11 Jan 2024 00:38:52 +0000
+Subject: [PATCH] Fetch pubkey from certificate before extracting its
+ parameters (#1769)
+
+This line has accidentally been removed in 028ce3
+---
+ contrib/mod_tls.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/contrib/mod_tls.c b/contrib/mod_tls.c
+index a092b8e15..b0c97c118 100644
+--- a/contrib/mod_tls.c
++++ b/contrib/mod_tls.c
+@@ -10054,6 +10054,7 @@ static void tls_setup_cert_environ(pool *p, const char *env_prefix,
+     bio = BIO_new(BIO_s_mem());
+ #if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(HAVE_LIBRESSL)) || \
+     (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER >= 0x3050000L)
++    pubkey = X509_get_X509_PUBKEY(cert);
+     X509_PUBKEY_get0_param(NULL, NULL, NULL, (X509_ALGOR **) &algo, pubkey);
+ #else
+     pubkey = cert->cert_info->key;


=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@ odbc
 01_disable_inet_connect_ipv4_test.diff
 02_disable_redis_sentinel_conn_new_test.diff
 #03_disable_all_non_api_tests.diff
+85ff1cb9fb2feaae9928b50d05afd657fec3cfb4.diff



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

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/4076f2b572fe36bddfde84f9ebc1375bc6a5145e
You're receiving this email because of your account on salsa.debian.org.