From patchwork Tue Jun  6 13:17:27 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz>
X-Patchwork-Id: 771865
X-Patchwork-Delegate: trini@ti.com
Return-Path: <u-boot-bounces@lists.denx.de>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
	by ozlabs.org (Postfix) with ESMTP id 3whsgJ4sX9z9s74
	for <incoming@patchwork.ozlabs.org>;
	Tue,  6 Jun 2017 23:17:48 +1000 (AEST)
Authentication-Results: ozlabs.org;
	dkim=fail reason="signature verification failed" (1024-bit key;
	secure) header.d=nic.cz header.i=@nic.cz header.b="lsOc1zs3";
	dkim-atps=neutral
Received: by lists.denx.de (Postfix, from userid 105)
	id 4F301C21D6B; Tue,  6 Jun 2017 13:17:43 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
X-Spam-Level: 
X-Spam-Status: No, score=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,
	T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0
Received: from lists.denx.de (localhost [IPv6:::1])
	by lists.denx.de (Postfix) with ESMTP id 5C860C21C38;
	Tue,  6 Jun 2017 13:17:41 +0000 (UTC)
Received: by lists.denx.de (Postfix, from userid 105)
	id 63EADC21C38; Tue,  6 Jun 2017 13:17:40 +0000 (UTC)
Received: from mail.nic.cz (mail.nic.cz [217.31.204.67])
	by lists.denx.de (Postfix) with ESMTPS id 08F8AC21C2A
	for <u-boot@lists.denx.de>; Tue,  6 Jun 2017 13:17:40 +0000 (UTC)
Received: from dellmb.labs.office.nic.cz (unknown
	[IPv6:2001:1488:fffe:6:cac7:3539:7f1f:463])
	by mail.nic.cz (Postfix) with ESMTP id 9DC906244C;
	Tue,  6 Jun 2017 15:17:39 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default;
	t=1496755059; bh=6jzCGzgwapQEcKugB6je3r1jtbiUNKLvpiYxXNq5L7g=;
	h=From:To:Date;
	b=lsOc1zs3lWAyGtFXLYeqjsLDddmyB4D1wpyMBcNcQydTNB3StKC6wKtNiECFOFCTo
	XGoiDEHxP6kVx/4GMumK3cTOHtczkHbKf45FxdqV0vGwR8sgjT+1HGwBBscTuzrwec
	6gkQrCROxBTJA3oGkjwg8QrQGzai8tyTkLDspSh8=
From: Marek Behun <marek.behun@nic.cz>
To: u-boot@lists.denx.de
Date: Tue,  6 Jun 2017 15:17:27 +0200
Message-Id: <20170606131727.14182-1-marek.behun@nic.cz>
X-Mailer: git-send-email 2.13.0
MIME-Version: 1.0
X-Virus-Scanned: clamav-milter 0.99.2 at mail
X-Virus-Status: Clean
Subject: [U-Boot] [PATCH] tools/kwbimage: Support building with LibreSSL
X-BeenThere: u-boot@lists.denx.de
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: U-Boot discussion <u-boot.lists.denx.de>
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
List-Post: <mailto:u-boot@lists.denx.de>
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=subscribe>
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

From: Marek Behún <marek.behun@nic.cz>

The kwbimage utility fails to compile when LibreSSL is present on
the host system instead of OpenSSL. This one-line patch resolves
this.

Signed-off-by: Marek Behun <marek.behun@nic.cz>

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index edef560faf..5830549d26 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -24,7 +24,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 static void RSA_get0_key(const RSA *r,
                  const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
 {