From patchwork Fri Mar 30 07:23:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 8242 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2580246jad; Fri, 30 Mar 2018 00:24:20 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/+aqIkKlCzaSOwfqFPIcbqETDuOiWkEav+rkd5aTwjEXQCEu7uV196gDz00aNcEArzYyUp X-Received: by 10.28.64.11 with SMTP id n11mr1092592wma.62.1522394660388; Fri, 30 Mar 2018 00:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522394660; cv=none; d=google.com; s=arc-20160816; b=kHwckTRz0v+yQSutdApx/Kd1/FqHOEUlTMZbIJIOgElSdGzHOkTcCMUF3C9EYIwTlc 9lNYmCET2H68befOsHjPRRLBuD+h2kPJ51rkSStEi+CtKZzEZcFhojITkubnN87fOQfG MA3mMWFo0Q/AzsAubh/vJwcHrwnfG/NwUlHtY2nPKJqwehHrIi2fwSgVZYIieWkeUoGR oUEosbhevXC71THTtw5oYUljv8UQnHThE6Yn9yyxFs2KjNX/II4kLwKAJAubFwHGI/b3 i27DdYsvl/pEpghmeCs1rUCd4S3pHLi76ZDCKnabSFuB2fgfF3elvkUWgb+eM/pc6hYZ utcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :dkim-signature:delivered-to:arc-authentication-results; bh=qDuvnl14JECUdjTAq1+8G5vW9H8B5YaiwPSirUrXDxQ=; b=alEK7lzvqe7Sv+4uPr6f9vpPWmdC1G2Lk+JTs2EGZg7uqhJS+LRAVetRI1m00LYovn AgACIcyqKsUFXInCWGT77nGjdQPWW3aI3zVaX1KlVhISUtr4LIKcF3lxs82qqt79dFm1 wo3FfQJl8WM5hDOSv+LkxMGbd8hH/j1MYKvNsfGdOMh17hU5AeMWEBv/uxScBc7k91nM 2lo8gTOJGk2aJTn7xrDAEXKXwbxyB3iVn70SbSTADaGw09wVpyEhtsbNOjksQeLR6gMb 8IRHIIeMzGqgS8SZ02G8bNiRoflNB5OtU6nVeiwHohgDhOsFc1A/bjZ2Ybc3bcDB9ji0 FZsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ycbcr.xyz header.s=fm1 header.b=ZG2UrIkF; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=FBE+McBn; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d101si2596262wma.121.2018.03.30.00.24.13; Fri, 30 Mar 2018 00:24:20 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@ycbcr.xyz header.s=fm1 header.b=ZG2UrIkF; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=FBE+McBn; 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 D761E689F62; Fri, 30 Mar 2018 10:23:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B3F5689C34 for ; Fri, 30 Mar 2018 10:23:44 +0300 (EEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4C95421A1A for ; Fri, 30 Mar 2018 03:24:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 30 Mar 2018 03:24:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ycbcr.xyz; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=crtksjVhYwB6HOzuTpJjsnOHNuXTsYnTTLYYmFZvW bU=; b=ZG2UrIkFjykY+dzrLa+LuS7Hpll14usjZz4xfAHhWB7WCd8jiIPxxl3MA /B+ZVS7pywArN7SKF79x24wlQI6i2SqNSP5UIqPNDS7Db+mgl7SFUadVrMLxwg72 5GFE2sCz11rQd9qh6I/Wda8HU/4P2TjFLqqg8Wiyxz+dQu1Yd1t22+TH5t7puqJU aMGAYHS0SFOA7Y3IUdevU7u7cKelTxOKDE5YQRX4FLe26ieg1R1HYOJGrTKNp9+V 7OB/6dvp6L1fjf7XQULZ6ukFQ5OqMC4frU9RoRLkC2h90j2QitI8NybsiX6zrqRh NOz5WX0MvI/u+FLSJHxngzroNDhYg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=crtksjVhYwB6HOzuT pJjsnOHNuXTsYnTTLYYmFZvWbU=; b=FBE+McBnySqnpxtMMEnzNZeqpOXg2+/Se pftgVBqAFGojxta/CI5JgBIP+1WVxpT0vLm8ikbr38T0YVjVMRQw4pdpEdyw9IA0 gzErEsqV5RAk35z+Q5JdfpKSQVU03wJ6pbF4vqSK/n4ZIzuN1z/H0quzEQF7J4Cz n94LpshO15qzj/xHcZxJJ1WvMLyd/86DqPP21EiEhnv5ZdfmaSKT4wczt6h0ZQpu h2lN2L/KoAueH8ljqMhZK/P21SzTUhHUEY6IJ9zk4hYEInstIARCWatEeBfTP3KH J9ftxXBvZOoyawuotZnJitU1IH1TlbEWq+d6y5VEAmup3y9UQ9kag== X-ME-Sender: Received: from localhost.localdomain (lfbn-1-6134-202.w90-110.abo.wanadoo.fr [90.110.9.202]) by mail.messagingengine.com (Postfix) with ESMTPA id D5AE2E443C for ; Fri, 30 Mar 2018 03:24:01 -0400 (EDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 09:23:52 +0200 Message-Id: <20180330072352.18020-1-robux4@ycbcr.xyz> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] use bcrypt instead of the old wincrypt API 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When targeting Windows Vista and above The wincrypt API is deprecated and not allowed for Windows Store apps. --- configure | 4 +++- libavutil/random_seed.c | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 99570a1415..6d34728b83 100755 --- a/configure +++ b/configure @@ -2144,6 +2144,7 @@ SYSTEM_LIBRARIES=" vaapi_drm vaapi_x11 vdpau_x11 + bcrypt wincrypt " @@ -3442,7 +3443,7 @@ avformat_deps="avcodec avutil" avformat_suggest="libm network zlib" avresample_deps="avutil" avresample_suggest="libm" -avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia wincrypt" +avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi videotoolbox corefoundation corevideo coremedia bcrypt wincrypt" postproc_deps="avutil gpl" postproc_suggest="libm" swresample_deps="avutil" @@ -5827,6 +5828,7 @@ check_lib ole32 "windows.h" CoTaskMemFree -lole32 check_lib shell32 "windows.h shellapi.h" CommandLineToArgvW -lshell32 check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32 check_lib psapi "windows.h psapi.h" GetProcessMemoryInfo -lpsapi +check_cpp_condition windows.h "_WIN32_WINNT >= 0x0600" && check_lib bcrypt "windows.h bcrypt.h" BCryptGenRandom -lbcrypt check_lib android android/native_window.h ANativeWindow_acquire -landroid check_lib mediandk "stdint.h media/NdkImage.h" AImage_delete -lmediandk diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 881c23c8c8..d7186146d9 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -26,7 +26,9 @@ #if HAVE_IO_H #include #endif -#if HAVE_WINCRYPT +#if HAVE_BCRYPT +#include +#elif HAVE_WINCRYPT #include #include #endif @@ -121,7 +123,17 @@ uint32_t av_get_random_seed(void) { uint32_t seed; -#if HAVE_WINCRYPT +#if HAVE_BCRYPT + BCRYPT_ALG_HANDLE algo_handle; + NTSTATUS ret = BCryptOpenAlgorithmProvider(&algo_handle, BCRYPT_RNG_ALGORITHM, + MS_PRIMITIVE_PROVIDER, 0); + if (BCRYPT_SUCCESS(ret)) { + NTSTATUS ret = BCryptGenRandom(algo_handle, &seed, sizeof(seed), 0); + BCryptCloseAlgorithmProvider(algo_handle, 0); + if (BCRYPT_SUCCESS(ret)) + return seed; + } +#elif HAVE_WINCRYPT HCRYPTPROV provider; if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) {