From nobody Mon Dec 13 00:28:07 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 262DB18F3F0E; Mon, 13 Dec 2021 00:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JC2RC63LYz3RGK; Mon, 13 Dec 2021 00:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF7C5286B; Mon, 13 Dec 2021 00:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BD0S7Zr059814; Mon, 13 Dec 2021 00:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BD0S7vw059813; Mon, 13 Dec 2021 00:28:07 GMT (envelope-from git) Date: Mon, 13 Dec 2021 00:28:07 GMT Message-Id: <202112130028.1BD0S7vw059813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 26ede19e221a - stable/13 - libradius: fix no SSL build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 26ede19e221a38c1c651298fa4de92209fc1d36f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639355287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q23FpkL0rNGCEAtm2x4JAHplNE+YQw19E89WaTReWeE=; b=jPmg8645wV+2ntC93rD/Z9nomH2z87Li/eYqgZ0PGxMU3e6POCKxqWqQyzLLajdU5VEFOL Nnc/gloUKNGPVcXj5XTdOVHDrQwM9396UUwEPgahuYhOiv5qi6z2TmFQ8fa0JMmMHe4W2D x10ErBeS03eaC69BUTzRS8sQfVbKniJjbPWvB2O6+FOocs7VynNihxBkCc5hHeJjBn3m8e axhpSSQY6CocimPasAbb/qHtNB2T1wb/9LILNH9yrJ2mKL/ZQTGMtkZFc/XM4MJkJp4zSr RoznDdw9BH07D2pFUODa2nryTImCpc9HpMzk5a5fe0sVgsqANtTF1VnoLd5mkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639355287; a=rsa-sha256; cv=none; b=Vi0MVsciQrCVncjsXX61pLiD9poc9IRvCsv8GueybcpvM+lroHc14jdaKww4LOwNaTMrS4 d14U8OQZQur+W64rFLLRvpnOO1Ys78+GIBdB49iwksUQ1/RejKfvedPLbWgENe0y+pCJFV Bi9bc5nrJbRqJWfxGdEscj4bAln7fceBKV09G4J6wHv2Goe3SNa3kZhWZwl1cS5mI7116g 6VxQXs16SJ7mhWhvfeETDgttICCcQ82gPp5ntWDuAH3nZmmAyqzfh3kQy+Mt3P1j4k2ly5 okoqRwwpLNYDQazUPcZGkVinp4SxZA17SHi6O2IDhgR5OzFdreb2bUNJ7MUEhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=26ede19e221a38c1c651298fa4de92209fc1d36f commit 26ede19e221a38c1c651298fa4de92209fc1d36f Author: Cy Schubert AuthorDate: 2021-06-02 18:31:00 +0000 Commit: Ed Maste CommitDate: 2021-12-12 22:17:00 +0000 libradius: fix no SSL build int alen is only used with SSL. (cherry picked from commit 48b11217bf7e605e1c386e316cd6e935aceb4927) libradius: fix WITHOUT_OPENSSL build int alen is used only with SSL. Reported by: Michael Dexter, Build Option Survey MFC after: 3 days Fixes: 8d5c7813061d ("libradius: Fix input validation bugs") Sponsored by: The FreeBSD Foundation (cherry picked from commit a901f2af587f9cb068e2fca6b62f324bdde471d8) --- lib/libradius/radlib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libradius/radlib.c b/lib/libradius/radlib.c index 4d21887c4ee2..dd65eda285cb 100644 --- a/lib/libradius/radlib.c +++ b/lib/libradius/radlib.c @@ -187,8 +187,10 @@ is_valid_response(struct rad_handle *h, int srv, MD5_CTX ctx; unsigned char md5[MD5_DIGEST_LENGTH]; const struct rad_server *srvp; - int alen, len; + + int len; #ifdef WITH_SSL + int alen; HMAC_CTX *hctx; u_char resp[MSGSIZE], md[EVP_MAX_MD_SIZE]; u_int md_len; @@ -284,8 +286,9 @@ is_valid_request(struct rad_handle *h) MD5_CTX ctx; unsigned char md5[MD5_DIGEST_LENGTH]; const struct rad_server *srvp; - int alen, len; + int len; #ifdef WITH_SSL + int alen; HMAC_CTX *hctx; u_char resp[MSGSIZE], md[EVP_MAX_MD_SIZE]; u_int md_len;