From patchwork Mon Feb 8 08:34:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliusz Sosinowicz X-Patchwork-Id: 1437771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=y0MStub/; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DZCjq3fcKz9sCq for ; Tue, 9 Feb 2021 04:31:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=ycJWjn6qxsUKygTqo5xcaGrL7sWzKQrfB1+vu5taj/Y=; b=y0MStub/yk0qbkiPzHZZe5bnd4 eyDUFsHhal5mSo9vwPvaLIsV4xoSJ5+sOo9mwQAxynq8fFkrdOl6aaWjN5eYXndj7H/1qhmI1/MBy zdU67aVNhCGGdgxChqXc9Zu06JrxTvHqJXDOBx/JT3dy4z0XBpDuRNKv16/XJpIdshhzCnqwsNLoG YymVwwqrtMDA7fEFaEGRZhKfAhtYYcZsM2dWTJ4Bka7HH6AzP9vLIXcG9MJLg3bt9CEtDAlCQZj7/ hHr5d2698o/F1OJzDnGw6QFchD4vfi9dDFHOVRI9RAblV0T9vDrNWzUPJkJgJm1M0pkffj+QVbOst 1K7cp0hw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9AMr-0001yi-FB; Mon, 08 Feb 2021 17:30:33 +0000 Received: from p3plsmtpa07-01.prod.phx3.secureserver.net ([173.201.192.230]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l920J-0001HV-EU for hostap@lists.infradead.org; Mon, 08 Feb 2021 08:34:44 +0000 Received: from localhost.localdomain ([77.254.7.13]) by :SMTPAUTH: with ESMTPSA id 91zlltaBmede9920CleRUu; Mon, 08 Feb 2021 01:34:37 -0700 X-CMAE-Analysis: v=2.4 cv=KIWfsHJo c=1 sm=1 tr=0 ts=6020f79d a=wJoMW5e4oyNtTtYMQykkDQ==:117 a=wJoMW5e4oyNtTtYMQykkDQ==:17 a=VTTltBjBAAAA:8 a=tEktcVN2qJ67sRVWpz4A:9 a=on_vo79ac8RWgsiwd8Ea:22 X-SECURESERVER-ACCT: juliusz@wolfssl.com From: Juliusz Sosinowicz To: hostap@lists.infradead.org Subject: [PATCH] wolfSSL: wolfSSL_use_PrivateKey_* correct return codes Date: Mon, 8 Feb 2021 09:34:07 +0100 Message-Id: <20210208083407.6213-1-juliusz@wolfssl.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4xfM6jOxhTrF9WRpFLGdBml+vv274eRGYzi/roKcoSfUYoElKv2pRJ1/UslK1ccZHbPBoh1eFCu717OEtXW8t2I9JwDTKKaMXX9rQLjdVTwNwZZ9jzG0+A ArnOqernO9T1HeFuqKdSZwcNqqNUH5Fo5ewv37qU1PePe4H1WCfV/NIr49U9ZwQVYD9LtDmPaGvUrCDAe3yJLy6CGLEKSD74qFGDNl4uhliceiNCPxo6TDtr X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210208_033443_602417_64909DA0 X-CRM114-Status: UNSURE ( 9.23 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [173.201.192.230 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [173.201.192.230 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Mailman-Approved-At: Mon, 08 Feb 2021 12:30:32 -0500 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juliusz Sosinowicz Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The wolfSSL_use_PrivateKey_* APIs return 1 on success. 0 is also an error. Signed-off-by: Juliusz Sosinowicz --- src/crypto/tls_wolfssl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crypto/tls_wolfssl.c b/src/crypto/tls_wolfssl.c index ea8f7063b..cf482bfc3 100644 --- a/src/crypto/tls_wolfssl.c +++ b/src/crypto/tls_wolfssl.c @@ -534,7 +534,7 @@ static int tls_connection_private_key(void *tls_ctx, if (private_key_blob) { if (wolfSSL_use_PrivateKey_buffer(conn->ssl, private_key_blob, blob_len, - SSL_FILETYPE_ASN1) < 0) { + SSL_FILETYPE_ASN1) <= 0) { wpa_printf(MSG_INFO, "SSL: use private DER blob failed"); } else { @@ -545,11 +545,11 @@ static int tls_connection_private_key(void *tls_ctx, if (!ok && private_key) { if (wolfSSL_use_PrivateKey_file(conn->ssl, private_key, - SSL_FILETYPE_PEM) < 0) { + SSL_FILETYPE_PEM) <= 0) { wpa_printf(MSG_INFO, "SSL: use private key PEM file failed"); if (wolfSSL_use_PrivateKey_file(conn->ssl, private_key, - SSL_FILETYPE_ASN1) < 0) + SSL_FILETYPE_ASN1) <= 0) { wpa_printf(MSG_INFO, "SSL: use private key DER file failed");