From: yasuoka <yasuoka@openbsd.org>
Date: Mon, 23 Oct 2023 00:58:32 +0000 (+0000)
Subject: Fix radiusd(8) to fixup MPPE-{Send,Recv}-Key and Tunnel-Password
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0fcb242214a810fdb1e5308434e359b342dffced;p=openbsd

Fix radiusd(8) to fixup MPPE-{Send,Recv}-Key and Tunnel-Password
attributes of the response properly.
---

diff --git a/usr.sbin/radiusd/radiusd.c b/usr.sbin/radiusd/radiusd.c
index 22fd6b50572..733344a5019 100644
--- a/usr.sbin/radiusd/radiusd.c
+++ b/usr.sbin/radiusd/radiusd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radiusd.c,v 1.32 2023/09/08 05:56:22 yasuoka Exp $	*/
+/*	$OpenBSD: radiusd.c,v 1.33 2023/10/23 00:58:32 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2013, 2023 Internet Initiative Japan Inc.
@@ -787,7 +787,7 @@ radiusd_access_response_fixup(struct radius_query *q)
 			news = olds;
 
 		/* RFC 2865 Tunnel-Password */
-		attrlen = sizeof(attrlen);
+		attrlen = sizeof(attrbuf);
 		if (radius_get_raw_attr(q->res, RADIUS_TYPE_TUNNEL_PASSWORD,
 		    attrbuf, &attrlen) == 0) {
 			radius_attr_unhide(news, req_auth,
@@ -802,7 +802,7 @@ radiusd_access_response_fixup(struct radius_query *q)
 		}
 
 		/* RFC 2548 Microsoft MPPE-{Send,Recv}-Key */
-		attrlen = sizeof(attrlen);
+		attrlen = sizeof(attrbuf);
 		if (radius_get_vs_raw_attr(q->res, RADIUS_VENDOR_MICROSOFT,
 		    RADIUS_VTYPE_MPPE_SEND_KEY, attrbuf, &attrlen) == 0) {
 
@@ -817,7 +817,7 @@ radiusd_access_response_fixup(struct radius_query *q)
 			radius_put_vs_raw_attr(q->res, RADIUS_VENDOR_MICROSOFT,
 			    RADIUS_VTYPE_MPPE_SEND_KEY, attrbuf, attrlen);
 		}
-		attrlen = sizeof(attrlen);
+		attrlen = sizeof(attrbuf);
 		if (radius_get_vs_raw_attr(q->res, RADIUS_VENDOR_MICROSOFT,
 		    RADIUS_VTYPE_MPPE_RECV_KEY, attrbuf, &attrlen) == 0) {