From patchwork Fri Feb 19 19:54:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruben Undheim X-Patchwork-Id: 585397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [IPv6:2a01:4f8:191:444b::2:7]) by ozlabs.org (Postfix) with ESMTP id 0003F14030F for ; Sat, 20 Feb 2016 06:54:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=eN+ytE/a; dkim-atps=neutral Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 239E919B68; Fri, 19 Feb 2016 19:54:12 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) by lists.osmocom.org (Postfix) with ESMTP id 4B34019B58 for ; Fri, 19 Feb 2016 19:54:10 +0000 (UTC) Received: by mail-wm0-x22f.google.com with SMTP id g62so92194881wme.1 for ; Fri, 19 Feb 2016 11:54:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=yKI61JEMyTVD8B1Y2+NMqv1WcidOwG85wlkd0Xj/hbA=; b=eN+ytE/aV4pf5rLx+GbUCI48ZcDUd/+yG7XSj4GcBMc8UCLr51ggtsR5K2D87JXgbk iOPfHqN4ptQRXgHhOmDhPZDC8reUgHaIbGhUmgGxMek+NtJtf/N+RHyvgblzr2bANCcp IhovqM7ev0mZ5/AX/ocm+0cp+BBd7Sw+tla5h66AX9OFrqdQ2dKXafYJQnMjVIm/ZfQf MguKgwmAxDOoQ2l3GpD2Xh+ibHJscblMigHZA22gKM+gwCiZvrP9B9y77Si6sERwI08K Setu4Gq6OQt5w30zbwYgNHD9dOSHYIK/8JB6Luu4Fy60XP8H8BNQY2LyUK374gHR/ev/ tEEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=yKI61JEMyTVD8B1Y2+NMqv1WcidOwG85wlkd0Xj/hbA=; b=hzvU6O1XrAVJ1Cxhl1wpw1G2L/P3Yf8/JgswilkTGkOYDwmbdcEViI2OFWWf3XiHpZ nfJS3vlZLfuJb9rVux04KiKH5xtPs1guv2rx83KH0//BcYGE1lCt9JAplHVRb8t9FdFE N0nANTiKK5HUcPf5cHvu9IYy201AtpPNs2nGxId15H/ZNB3CcdjYKOu5dOPGapl073zk a7dR2YSOBqNMtuJp6M5LhDo/i9WleatzPA1ZPvuPo8mXt3j+6GM3N6thAvYWjHHmSzfe WD+/G/Lpmr8TLWT5Jx4LxJeOGElZgOhr69upc3kOeZoWIKurCUZOReBxuLFkowBAZniL wKxQ== X-Gm-Message-State: AG10YOS2N5708gcI1ql1wTPT6HY421ZPCH9kaMmp6JJ0OYuEsOSTk5W7YyiugwcROFZqTg== X-Received: by 10.28.65.5 with SMTP id o5mr11537710wma.75.1455911650672; Fri, 19 Feb 2016 11:54:10 -0800 (PST) Received: from macbookair (84-52-245.3.3p.ntebredband.no. [84.52.245.3]) by smtp.gmail.com with ESMTPSA id et11sm12587988wjc.30.2016.02.19.11.54.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Feb 2016 11:54:10 -0800 (PST) Date: Fri, 19 Feb 2016 20:54:07 +0100 From: Ruben Undheim To: Holger Freyther Subject: Re: License exception for OpenSSL Message-ID: <20160219195407.GA7366@macbookair> References: <20160219185410.GA15737@macbookair> <1D30431E-0CF5-4EF5-9C36-FF72D659A979@freyther.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1D30431E-0CF5-4EF5-9C36-FF72D659A979@freyther.de> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Development of the OpenBSC GSM base station controller List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: openbsc@lists.osmocom.org Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" > 1.) You link against libgnutls-openssl-dev which provides a wrapper for RAND_bytes. > > 2.) We move to GNUtls (or gcrypt?) to call the function that RAND_bytes is wrapped around (after reading the documentation) > > 3.) We use GNU nettle and their yarrow-256 implementation (assuming that is a smart move)? Thanks. I did #1. Here's the patch: It seems to work. Luckily the SSL library isn't used for anything advanced. Cool if you also figure out a way to solve this upstream! Cheers Ruben Index: openbsc/openbsc/configure.ac =================================================================== --- openbsc.orig/openbsc/configure.ac 2016-02-19 20:39:10.824145024 +0100 +++ openbsc/openbsc/configure.ac 2016-02-19 20:39:10.820145095 +0100 @@ -27,7 +27,8 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1) -PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5) +#PKG_CHECK_MODULES(LIBCRYPTO, gnutls) +AC_SUBST(LIBCRYPTO_LIBS, -lgnutls-openssl) # Enabke/disable the NAT? AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])], Index: openbsc/openbsc/src/libmsc/auth.c =================================================================== --- openbsc.orig/openbsc/src/libmsc/auth.c 2016-02-19 20:13:19.417462737 +0100 +++ openbsc/openbsc/src/libmsc/auth.c 2016-02-19 20:40:13.607032169 +0100 @@ -27,7 +27,7 @@ #include -#include +#include #include Index: openbsc/openbsc/src/libmsc/db.c =================================================================== --- openbsc.orig/openbsc/src/libmsc/db.c 2016-02-19 20:13:19.421462672 +0100 +++ openbsc/openbsc/src/libmsc/db.c 2016-02-19 20:40:27.318789122 +0100 @@ -38,7 +38,7 @@ #include #include -#include +#include /* Semi-Private-Interface (SPI) for the subscriber code */ void subscr_direct_free(struct gsm_subscriber *subscr); Index: openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c =================================================================== --- openbsc.orig/openbsc/src/osmo-bsc_nat/bsc_nat.c 2016-02-19 20:13:19.433462478 +0100 +++ openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c 2016-02-19 20:39:58.791294787 +0100 @@ -69,7 +69,7 @@ #include -#include +#include #include "../../bscconfig.h"