From patchwork Wed Feb 22 15:17:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 2645 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp1032346vsf; Wed, 22 Feb 2017 11:25:40 -0800 (PST) X-Received: by 10.223.140.18 with SMTP id z18mr26016429wra.6.1487791540406; Wed, 22 Feb 2017 11:25:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z53si2873023wrz.204.2017.02.22.11.25.39; Wed, 22 Feb 2017 11:25:40 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70AAF687EE8; Wed, 22 Feb 2017 21:25:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from BAY004-OMC1S15.hotmail.com (bay004-omc1s15.hotmail.com [65.54.190.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE7B168824E for ; Wed, 22 Feb 2017 17:17:47 +0200 (EET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com ([65.54.190.59]) by BAY004-OMC1S15.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.23008); Wed, 22 Feb 2017 07:17:53 -0800 Received: from VE1EUR02FT011.eop-EUR02.prod.protection.outlook.com (10.152.12.56) by VE1EUR02HT131.eop-EUR02.prod.protection.outlook.com (10.152.13.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.10; Wed, 22 Feb 2017 15:17:51 +0000 Received: from VI1PR0201MB2414.eurprd02.prod.outlook.com (10.152.12.57) by VE1EUR02FT011.mail.protection.outlook.com (10.152.12.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.10 via Frontend Transport; Wed, 22 Feb 2017 15:17:51 +0000 Received: from VI1PR0201MB2414.eurprd02.prod.outlook.com ([10.168.64.10]) by VI1PR0201MB2414.eurprd02.prod.outlook.com ([10.168.64.10]) with mapi id 15.01.0919.018; Wed, 22 Feb 2017 15:17:51 +0000 From: Stefan _ To: FFmpeg development discussions and patches Thread-Topic: [PATCH] configure/rtmpdh: Fix OpenSSL 1.1.0 support Thread-Index: AQHSjR7Vx7qxbH/COUerXcobwDpQMQ== Date: Wed, 22 Feb 2017 15:17:51 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: authentication-results: ffmpeg.org; dkim=none (message not signed) header.d=none; ffmpeg.org; dmarc=none action=none header.from=live.de; x-incomingtopheadermarker: OriginalChecksum:F708D8399149946D4850D685AF58FE37F3451195F6ED3816ED46C1B4A2A2CF97; UpperCasedChecksum:C0C0C6F2D1F882658BCCAB10FCC570476EF801D9087371358F1FCFF178C65FA1; SizeAsReceived:7480; Count:34 x-ms-exchange-messagesentrepresentingtype: 1 x-incomingheadercount: 34 x-eopattributedmessage: 0 x-microsoft-exchange-diagnostics: 1; VE1EUR02HT131; 7:+8qwBXZ5RabF662czrvMQqgZRn3OygljDIxBXqSXlm6pSTiSLna/Ba313jIVxJj7jYAaa6my0dd2EDWiAQpSG340rEie2TeWgNMzPPAAQuqCCXVcpK6RldS148FK0xh8UppVAx1ewRlpDVkiRazYrDMN4OUWREB+nRKB06WrhWdU9KC1641yg2Fw8Ri2StD8uS9HuMxyZ+iaSdOXqvwdnN7+Y8SET75ndaA+btTtf2Qmon/L4c1xcPtf3fzg8vLEdBiXe0esKDLLjaqG3teeoJQ5jRY4KEumx0DC678T2ow/qrmqarNKUs56pNlCmb82qO8SXy8Si1tbwkZLANDTOQ== x-forefront-antispam-report: EFV:NLI; SFV:NSPM; SFS:(10019020)(98900012); DIR:OUT; SFP:1102; SCL:1; SRVR:VE1EUR02HT131; H:VI1PR0201MB2414.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; x-ms-office365-filtering-correlation-id: 97d43efa-863a-44bd-0293-08d45b35f747 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506561)(5061507331)(1603103135)(1601125242)(1701031045); SRVR:VE1EUR02HT131; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(432015087)(444000031); SRVR:VE1EUR02HT131; BCL:0; PCL:0; RULEID:; SRVR:VE1EUR02HT131; x-forefront-prvs: 022649CC2C spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2017 15:17:51.6911 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR02HT131 X-OriginalArrivalTime: 22 Feb 2017 15:17:54.0054 (UTC) FILETIME=[D6DD7A60:01D28D1E] X-Mailman-Approved-At: Wed, 22 Feb 2017 21:25:27 +0200 Subject: [FFmpeg-devel] [PATCH] configure/rtmpdh: Fix OpenSSL 1.1.0 support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 1) configure only looks for OPENSSL_init_ssl using pkg-config, this breaks in case pkg-config is not available (cross-compiling) 2) The rtmpdh code uses the DH struct from OpenSSL which was made private in the 1.1 series From ee02425f851d0c9cfb8a892f385394efe5b4fdda Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 22 Feb 2017 15:38:16 +0100 Subject: [PATCH 2/2] rtmpdh: Support OpenSSL 1.1.0 DH (struct dh_st) was made private in the 1.1 series, a replacement similar to the FF_DH struct for gcrypt/gmp is used instead. --- libavformat/rtmpdh.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/rtmpdh.h b/libavformat/rtmpdh.h index 2b250f595d..2d1489b193 100644 --- a/libavformat/rtmpdh.h +++ b/libavformat/rtmpdh.h @@ -48,10 +48,19 @@ typedef struct FF_DH { #elif CONFIG_OPENSSL #include #include +#include typedef BIGNUM *FFBigNum; +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL +typedef struct { + BIGNUM *p, *g; + BIGNUM *pub_key, *priv_key; + long length; +} FF_DH; +#else typedef DH FF_DH; #endif +#endif /** * Initialize a Diffie-Hellmann context. -- 2.11.1