From patchwork Thu Jun 9 15:37:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Feytons X-Patchwork-Id: 633002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rQTxk0XVbz9sdm for ; Fri, 10 Jun 2016 01:39:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=x5HnfVOI; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 49750B92621; Thu, 9 Jun 2016 17:38:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Thu, 9 Jun 2016 17:38:11 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E2A4FB925F5 for ; Thu, 9 Jun 2016 17:37:54 +0200 (CEST) X-policyd-weight: using cached result; rate:hard: -7 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 9 Jun 2016 17:37:54 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id k184so11616727wme.2 for ; Thu, 09 Jun 2016 08:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uoPNKc8YYkWV7bJsqt2S/mGLrq7RgiMxWPnfhfhmHcU=; b=x5HnfVOIenQ9PKYtpKUkeNPsb/JX9Fcnan4K8WH+r4pSqCYVHfH8e6Q/TAPNDOJMIL tDSqs90HXuDV75VfDmr6dLZK3fCSroYeslNnpxyFbqv0LzwnSkWcTHPjRElCW0naKZOa xWsgwVBvsdSaLOmR8k1Y3GputoSQXAeeIylz2sS1LSZYBWABm3PGLeaYXQQ1TOqsFDj/ Zk43ogNH2HoO5st0aiglBdyNDTCcH1IJAMruH643CP3tjoLdc+L5A6XEY3wsuK17zFRy PVs2rpiQkJZbqLECleXAtb6gtwqqvHJIMd9tk3J1gunnFOpSJGRUl2wcTbaKwH/AUGsK KnbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uoPNKc8YYkWV7bJsqt2S/mGLrq7RgiMxWPnfhfhmHcU=; b=W9/1VrIuEFESmXeOvCeoJt70JHBLlhC+n6YAGJBENZHqK/E90MWaxL7Smvn5A4rZoP 3IEHMnckZmslJBevwTqqm/EKG0ceJVjJHpeFG+t4BN4Sy2XsNjRtTxLt3qWy723hzDe4 EhzwNDCnsjcO6uzxP9BSNoFd+P5n90t7u272Q0vC63POkYo81n84Gh3GO/Os1RWuhsg+ utVzIgzw/zU/Bp+f8OSdcE6lcVRZZ/ms5TZWF5ZJ9rdNbEZSZPhswStS4fzCuLPE/zq5 Mmj++hzzE0hW264DlbmLhNEpWdo7Owc9aZ16HOe0vDsuRJon/YW6tSjFsZ8vh7QMSM8h L6Qw== X-Gm-Message-State: ALyK8tIaMwi6ECZsuQP2l8zFN8cXn5TczRXf1fSWaB9YzY5rfcvvU3grzlEh1VnRb9Re3Q== X-Received: by 10.194.81.8 with SMTP id v8mr10323047wjx.155.1465486674561; Thu, 09 Jun 2016 08:37:54 -0700 (PDT) Received: from cplx1020.edegem.eu.thmulti.com ([141.11.62.7]) by smtp.gmail.com with ESMTPSA id u70sm21198834wmd.4.2016.06.09.08.37.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jun 2016 08:37:53 -0700 (PDT) From: Dirk Feytons To: openwrt-devel@lists.openwrt.org Date: Thu, 9 Jun 2016 17:37:17 +0200 Message-Id: <1465486639-28346-5-git-send-email-dirk.feytons@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1465486639-28346-1-git-send-email-dirk.feytons@gmail.com> References: <1465486639-28346-1-git-send-email-dirk.feytons@gmail.com> Subject: [OpenWrt-Devel] [PATCH v2 4/6] openssl: add option to disable PSK support X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Dirk Feytons --- package/libs/openssl/Config.in | 5 +++++ package/libs/openssl/Makefile | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in index 492b042..7224b65 100644 --- a/package/libs/openssl/Config.in +++ b/package/libs/openssl/Config.in @@ -30,6 +30,11 @@ config OPENSSL_WITH_NPN default n prompt "Enable NPN support" +config OPENSSL_WITH_PSK + bool + default y + prompt "Enable PSK support" + config OPENSSL_ENGINE_DIGEST bool depends on OPENSSL_ENGINE_CRYPTO diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index b82e18d..2fbb566 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -36,7 +36,8 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_OPENSSL_HARDWARE_SUPPORT \ CONFIG_OPENSSL_WITH_DEPRECATED \ CONFIG_OPENSSL_WITH_COMPRESSION \ - CONFIG_OPENSSL_WITH_NPN + CONFIG_OPENSSL_WITH_NPN \ + CONFIG_OPENSSL_WITH_PSK include $(INCLUDE_DIR)/package.mk @@ -137,6 +138,10 @@ ifndef CONFIG_OPENSSL_WITH_NPN OPENSSL_OPTIONS += no-nextprotoneg endif +ifndef CONFIG_OPENSSL_WITH_PSK + OPENSSL_OPTIONS += no-psk +endif + ifeq ($(CONFIG_x86_64),y) OPENSSL_TARGET:=linux-x86_64-openwrt OPENSSL_MAKEFLAGS += LIBDIR=lib