From patchwork Fri Sep 27 12:45:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 836 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id eHS3OFORjl09MwAAIUCqbw for ; Fri, 27 Sep 2019 18:46:43 -0400 Received: from proxy14.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id 6Gp+OFORjl0xFQAAvGGmqA ; Fri, 27 Sep 2019 18:46:43 -0400 Received: from smtp16.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy14.mail.ord1d.rsapps.net with LMTP id 6FtCOFORjl1gfwAAtEH5vw ; Fri, 27 Sep 2019 18:46:43 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp16.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=fail (p=none; dis=none) header.from=openvpn.net X-Suspicious-Flag: YES X-Classification-ID: ad2d2218-e178-11e9-8519-bc305bf036a4-1-1 Received: from [216.105.38.7] ([216.105.38.7:44232] helo=lists.sourceforge.net) by smtp16.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id F8/E9-08084-3519E8D5; Fri, 27 Sep 2019 18:46:43 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iDz08-0003xY-Lp; Fri, 27 Sep 2019 22:46:12 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iDz06-0003xG-F8 for openvpn-devel@lists.sourceforge.net; Fri, 27 Sep 2019 22:46:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tYkMbAoNOTXP1Q0noBR8JxHub60689wft1cV7Ea0zXo=; b=HOwEsr0hAVYeCW/2Dae4HJv4UV Xb0wV9xq2GgLkgpVTo0mlWvm8Vr0g21vjgi/Y13gr8uXav12nmKl3wW46ZFdKvIEFov9coMYioIyn tt+RDIu5FLLjOFFOztZPDuvxNwd1qRY48VB8odw9yh2qAGRiWwLrq8zzhTI8PLlXxzhs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=tYkMbAoNOTXP1Q0noBR8JxHub60689wft1cV7Ea0zXo=; b=DjDtWcYPcZVBwybC3asiIjOoFC wq8ccoR0ewET7eUPJUlOj/CMVLWmmEy9kZby7CdJZuc7RxOeGpPdxMh4eKoq+y0Fsbe6VdkEhoTMD 2YUoLQiXya0WSIy855iEuBiViIgmpLFCIv1t1dZdcvwfZDJl9Dj4jJEeFi/hh3pOyIhE=; Received: from mx0.basenordic.cloud ([185.212.44.139]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1iDz05-00995n-AZ for openvpn-devel@lists.sourceforge.net; Fri, 27 Sep 2019 22:46:10 +0000 Received: from localhost (unknown [IPv6:::1]) by mx0.basenordic.cloud (Postfix) with ESMTP id 89A68837ABD for ; Fri, 27 Sep 2019 22:45:54 +0000 (UTC) Received: from mx0.basenordic.cloud ([127.0.0.1]) by localhost (winterfell.topphemmelig.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iHrO2yXonTay for ; Sat, 28 Sep 2019 00:45:53 +0200 (CEST) Received: from zimbra.sommerseth.email (zimbra.sommerseth.email [172.16.33.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx0.basenordic.cloud (Postfix) with ESMTPS id AC866837AB8 for ; Sat, 28 Sep 2019 00:45:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.sommerseth.email (Postfix) with ESMTP id 5355841EB84D for ; Sat, 28 Sep 2019 00:45:50 +0200 (CEST) Received: from zimbra.sommerseth.email ([127.0.0.1]) by localhost (zimbra.sommerseth.email [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id iiFOyypzi3VC for ; Sat, 28 Sep 2019 00:45:50 +0200 (CEST) Received: from optimus.homebase.sommerseths.net (optimus.homebase.sommerseths.net [10.35.0.233]) by zimbra.sommerseth.email (Postfix) with ESMTPS id 17E3641EB84C for ; Sat, 28 Sep 2019 00:45:50 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Sat, 28 Sep 2019 00:45:35 +0200 Message-Id: <20190927224536.27480-3-davids@openvpn.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927224536.27480-1-davids@openvpn.net> References: <20190927224536.27480-1-davids@openvpn.net> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1iDz05-00995n-AZ Subject: [Openvpn-devel] [PATCH 2/3] auth-token: Fix compiler complaints with --disable-management X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox When building with --disable-management, the compiler complains with implicit declaration of function ‘ssl_clean_auth_token’. This is due to the ssl_clean_auth_token() function being declared inside an #ifdef ENABLE_MANAGEMENT fence where it should not be. Signed-off-by: David Sommerseth Acked-by: Gert Doering --- src/openvpn/ssl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index e98c54c7..a944ca3a 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -431,6 +431,8 @@ void ssl_purge_auth(const bool auth_user_pass_only); void ssl_set_auth_token(const char *token); +bool ssl_clean_auth_token(void); + #ifdef ENABLE_MANAGEMENT /* * ssl_get_auth_challenge will parse the server-pushed auth-failed @@ -439,8 +441,6 @@ void ssl_set_auth_token(const char *token); */ void ssl_purge_auth_challenge(void); -bool ssl_clean_auth_token(void); - void ssl_put_auth_challenge(const char *cr_str); #endif