From patchwork Fri Mar 30 12:44: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: 8243 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2849257jad; Fri, 30 Mar 2018 05:45:11 -0700 (PDT) X-Google-Smtp-Source: AIpwx49UrFa+sywzIYdjgw1aGBAgkFetw3gkAMMVpQgPY7orHGdF3CleteNNgBrsLEfIY1gEmfo0 X-Received: by 10.28.15.83 with SMTP id 80mr2150925wmp.151.1522413911477; Fri, 30 Mar 2018 05:45:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522413911; cv=none; d=google.com; s=arc-20160816; b=xWrYQFylRZuJW24ekw2fXxz4k2RN4X3/K/qtgk22OqandeeAmkzmxoys/S+8AMlwmU BgXlI84Bb+d2eNQ0qskrJKdBXHUvm3RDTZWLEYp4967pkVU6ijtbZzM6zCZpbplTTLGT rtVQtTyZLNY340/uZygvr+AIeKzTumB8qe0zo3i0fDNnS5PvVV7XAcUS/EYWJvWpkGLl XPDQ0AUXQraeK2S8ExyBfm2iKTAK+0Q5HRVPyMFmSzlxtBA8cTaI5DncvupVL37KWaux ReU2Y+2116U/fMZFgpF9Mt0W7jIlhkq0mLI/7PAuV+GywkK288xYnNrJO0X+bovteiAR EIjw== 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=PjUlMGBxA+m7uO5GrtT9m+IogHkQ6trm7yAfW81VNXE=; b=HinPFWJbzsFNgmLciuv08qqth0Zix+kSvKScTBN/T1ynmCiFSHvFIMrdzsF0T7NK71 sh3NLgp1n4+EXLGoXf5j8gKF9BUG3+aCj30kuHuik9/bbKOPFWrhaZhMhOb3PGYlOuzj Dex+WPj5LH4aEmsbdu6kKJjLZ7b9pmgz1pnjjr78f3jesfIOqLkikBznuFvKMZ0aBoXz SMFWwEZ/1ljiEAgs4lEMgIetZvHjLByTxatJYQWj1t2KNWgXuqup5WDk2iJxcMnr52zI I3abzUWZZOs/R0yTCK+EsfiUvnBCd/3K8KlZiqTQOnczsB9/9YJBOIzblR2walGRzlEy Wp+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ycbcr.xyz header.s=fm1 header.b=dhIYezA2; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=jIN8vo8L; 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 x9si2980088wmx.89.2018.03.30.05.45.10; Fri, 30 Mar 2018 05:45:11 -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=dhIYezA2; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=jIN8vo8L; 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 B278A68186B; Fri, 30 Mar 2018 15:44:49 +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 F2C4968067F for ; Fri, 30 Mar 2018 15:44:42 +0300 (EEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7C96220B5F for ; Fri, 30 Mar 2018 08:44:59 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 30 Mar 2018 08:44:59 -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=daQNqt8rxCzpO2BY2qqRi3WKFiM5I3/Hn8I3uqlWn Wc=; b=dhIYezA2GryqifDDfs1LusqspSPQ74hMepeOPbFfBfeDlfwnM3By/7s3l YR2hWZgm9TpFGnhGkKKpOVA7wy8o9uad986mYS73PfJ5mtOpdQ6EWLYL+WDZ9fUd mIldHJzMfmi0qAl1afwMlXZZvK9sNqxw70V6PzczIss2Vutq+v5yo293sAzGe+4m V9x51+j1tOjsSN1whDclOblMH/ZKNydwMJGvALG9v+2AP/tJGSEJXQV1fRIijXuL lNEYmwc1EnYDx/JapTgdKs8l8bRT1J+QTDBAvBQa6MEO8oFMb/PHmP089uTPmm/Q njIGyTMxCGbX6FiYMyDIbLqjC/rtg== 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=daQNqt8rxCzpO2BY2 qqRi3WKFiM5I3/Hn8I3uqlWnWc=; b=jIN8vo8LE7+D1dJIF+Gt0+TFkPbxicIZi XOFHM+GqP/JwxoaaQIDxM+++hx8Nf8fpCMTRu/Q8yjDGwApdVN6aeqD/NTO5bq1M +R+FJ4SAFFNqgwCbuLfLOQL5ZM1DViERdgMv6HcTuxYk/Sz56fXOCRngihZPTHCV wlA5VTaB8za+42YIPU/pHQaIYu828DzHvMXEhmIAhrTM/LLP/HAZM4rjcXSdoSzT g6pmR3AlJj1VbO6F5GsoEsl2ZiMwQwvyRuXy7207UD+gBWNTx/ANXUEKbDx0EAQF puwfhIX8OTmiRWDSFnIgHzAGMgloIIc2MEzJ9++26ymA0c/zjnR9g== 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 034DB10255 for ; Fri, 30 Mar 2018 08:44:58 -0400 (EDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 14:44:52 +0200 Message-Id: <20180330124452.4800-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" Remove the wincrypt API calls since we don't support XP anymore and bcrypt is available since Vista, even on Windows Store builds. --- configure | 6 +++--- libavutil/random_seed.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 99570a1415..dae52d8f3b 100755 --- a/configure +++ b/configure @@ -2141,10 +2141,10 @@ SYSTEM_FUNCS=" " SYSTEM_LIBRARIES=" + bcrypt vaapi_drm vaapi_x11 vdpau_x11 - wincrypt " TOOLCHAIN_FEATURES=" @@ -3442,7 +3442,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" postproc_deps="avutil gpl" postproc_suggest="libm" swresample_deps="avutil" @@ -5823,9 +5823,9 @@ check_header asm/types.h check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)" check_lib advapi32 "windows.h" RegCloseKey -ladvapi32 +check_lib bcrypt "windows.h bcrypt.h" BCryptGenRandom -lbcrypt 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_lib android android/native_window.h ANativeWindow_acquire -landroid diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 881c23c8c8..ae13a27b8a 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -26,9 +26,8 @@ #if HAVE_IO_H #include #endif -#if HAVE_WINCRYPT -#include -#include +#if HAVE_BCRYPT +#include #endif #include #include @@ -121,13 +120,14 @@ uint32_t av_get_random_seed(void) { uint32_t seed; -#if HAVE_WINCRYPT - HCRYPTPROV provider; - if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) { - BOOL ret = CryptGenRandom(provider, sizeof(seed), (PBYTE) &seed); - CryptReleaseContext(provider, 0); - if (ret) +#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; } #endif