6923d474f8
modified: proftpd.spec modified: proftpd.spec (cherry picked from commit 2e8dee883102d0c7f0691fdd4dfba6a66cead3f5)
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From 10a227b4d50e0a2cd2faf87926f58d865da44e43 Mon Sep 17 00:00:00 2001
|
|
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
|
|
Date: Tue, 3 Aug 2021 21:53:28 +0200
|
|
Subject: [PATCH] mod_radius: copy _only_ the password
|
|
|
|
---
|
|
contrib/mod_radius.c | 11 ++++++++---
|
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/contrib/mod_radius.c b/contrib/mod_radius.c
|
|
index 5092ca5e05..028c364ffd 100644
|
|
--- a/contrib/mod_radius.c
|
|
+++ b/contrib/mod_radius.c
|
|
@@ -2324,21 +2324,26 @@ static void radius_add_passwd(radius_packet_t *packet, unsigned char type,
|
|
|
|
pwlen = strlen((const char *) passwd);
|
|
|
|
+ /* Clear the buffers. */
|
|
+ memset(pwhash, '\0', sizeof(pwhash));
|
|
+
|
|
if (pwlen == 0) {
|
|
pwlen = RADIUS_PASSWD_LEN;
|
|
|
|
} if ((pwlen & (RADIUS_PASSWD_LEN - 1)) != 0) {
|
|
+ /* pwlen is not a multiple of RADIUS_PASSWD_LEN, need to prepare a proper buffer */
|
|
+ memcpy(pwhash, passwd, pwlen);
|
|
|
|
/* Round up the length. */
|
|
pwlen += (RADIUS_PASSWD_LEN - 1);
|
|
|
|
/* Truncate the length, as necessary. */
|
|
pwlen &= ~(RADIUS_PASSWD_LEN - 1);
|
|
+ } else {
|
|
+ /* pwlen is a multiple of RADIUS_PASSWD_LEN, we can just use it. */
|
|
+ memcpy(pwhash, passwd, pwlen);
|
|
}
|
|
|
|
- /* Clear the buffers. */
|
|
- memset(pwhash, '\0', sizeof(pwhash));
|
|
- memcpy(pwhash, passwd, pwlen);
|
|
|
|
/* Find the password attribute. */
|
|
attrib = radius_get_attrib(packet, RADIUS_PASSWORD);
|