[Git][debian-proftpd-team/proftpd][master] [PATCH] Issue #674: Update mod_sftp to handle changed APIs in OpenSSL

[Hilmar Preuße]

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


Commits:
a74b8f3d by Hilmar Preuße at 2018-05-29T23:46:27+02:00
[PATCH] Issue #674: Update mod_sftp to handle changed APIs in OpenSSL

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/github_pr_710
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 proftpd-dfsg (1.3.6-3) UNRELEASED; urgency=medium
 
   [ Hilmar Preuße ]
+  * Pick github_pr_710.patch from upstream:
+    [PATCH] Issue #674: Update mod_sftp to handle changed APIs in OpenSSL
+
   * Run configure w/ --disable-xattr only on kfreebsd to fix FTBFS.
     (Closes: #897168)
   * Do create /run/proftpd also in postinst, if not exists yet.


=====================================
debian/patches/github_pr_710
=====================================
--- /dev/null
+++ b/debian/patches/github_pr_710
@@ -0,0 +1,58 @@
+From e2f77c00e217eeb94459e104322b9a7d02c257e0 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Sun, 27 May 2018 16:11:24 -0700
+Subject: [PATCH] Issue #674: Update mod_sftp to handle changed APIs in OpenSSL
+ 1.1.x releases.
+
+---
+ contrib/mod_sftp/keys.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/contrib/mod_sftp/keys.c b/contrib/mod_sftp/keys.c
+index 4a3c460db..efd1ff981 100644
+--- a/contrib/mod_sftp/keys.c
++++ b/contrib/mod_sftp/keys.c
+@@ -1,6 +1,6 @@
+ /*
+  * ProFTPD - mod_sftp key mgmt (keys)
+- * Copyright (c) 2008-2017 TJ Saunders
++ * Copyright (c) 2008-2018 TJ Saunders
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -2780,7 +2780,7 @@ static const unsigned char *dsa_sign_data(pool *p, const unsigned char *data,
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+     !defined(HAVE_LIBRESSL)
+-  DSA_SIG_get0(&sig_r, &sig_s, sig);
++  DSA_SIG_get0(sig, &sig_r, &sig_s);
+ #else
+   sig_r = sig->r;
+   sig_s = sig->s;
+@@ -2960,7 +2960,7 @@ static const unsigned char *ecdsa_sign_data(pool *p, const unsigned char *data,
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+     !defined(HAVE_LIBRESSL)
+-  ECDSA_SIG_get0(&sig_r, &sig_s, sig);
++  ECDSA_SIG_get0(sig, &sig_r, &sig_s);
+ #else
+   sig_r = sig->r;
+   sig_s = sig->s;
+@@ -3307,7 +3307,7 @@ int sftp_keys_verify_signed_data(pool *p, const char *pubkey_algo,
+       dsa_sig = DSA_SIG_new();
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+     !defined(HAVE_LIBRESSL)
+-      DSA_SIG_get0(&sig_r, &sig_s, dsa_sig);
++      DSA_SIG_get0(sig, &sig_r, &sig_s);
+ #else
+       sig_r = dsa_sig->r;
+       sig_s = dsa_sig->s;
+@@ -3426,7 +3426,7 @@ int sftp_keys_verify_signed_data(pool *p, const char *pubkey_algo,
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+     !defined(HAVE_LIBRESSL)
+-      ECDSA_SIG_get0(&sig_r, &sig_s, ecdsa_sig);
++      ECDSA_SIG_get0(ecdsa_sig, &sig_r, &sig_s);
+ #else
+       sig_r = ecdsa_sig->r;
+       sig_s = ecdsa_sig->s;


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ upstream_4335
 upstream_4336
 upstream_4312
 upstream_4312_fix_version
+github_pr_710



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

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