From patchwork Fri May 10 17:30:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163906 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2666507ilr; Fri, 10 May 2019 10:31:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwOawSi9IxRTnNJvX+jTiFyYOx2ty3jCGdiKvll6wAPt6450dCrhfNQWHHjgR7pEWnyfxst X-Received: by 2002:aa7:ca54:: with SMTP id j20mr12496488edt.23.1557509497033; Fri, 10 May 2019 10:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557509497; cv=none; d=google.com; s=arc-20160816; b=Q7UKNe/BvSEGSnflkFzPJQGNAwdk9EoIIFeowTfoedF1hwCn1gS+qH755evQ9laQUG X6WGAjqNFsq93IoCSlINHUTG2YBXXTz/F/psnmqPrx7OKnTGwFBrBPqizA8Q7ruu/Ql9 6t8+dswKe9P514khuYn4q/jK/TQSlF4r5fcekB4Ur+hJ+JgeuXZv3L0/2ocZj23fJO2C o1Lfu7L6vKPYDU2J2uXc09iJfWMEHCXFQVBl0HFQCA3MOhPSHueKOW3WA8Lo6fVoZ0b1 Jd/OXqaMHH9ygiVMh3PkxgcHelEdv7ngrU5cYVoantlcCFo+WXuTB/f2ehmCzZiKJm1h uEyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=WcaPjSSW8mCEGy+vfZffpT+ukMC7uteGhxOw5c2wJXo=; b=BV36MdOMTrafrM+t5HT5T1euoUepVkxDpJZFXMkwXbHN3pOx1UK1qiUiRoiYMXNaY/ sNmlgPdRsvLnLwWei9PZDyrnOfS1m6mlSzVnU1zUTDHIFI+zCDTrY7vWoH/Qqhtku/hg dV50vusQokS0/c/NzOe4PtxRgkJ/tWkFQIdQ6dC/+P0wxOGhShFd/NLITlU4UzPL2H5/ fsOER5OA1ORuV61HSLeCcqhrg+ikVZThJpkgu02RgIyBSwou9XYLMZ8r3mTqyQ2+dRtN iEWfswNCmRdpNWXVAYNp97LGcLI5WPNnE8DZeKr3SBOLZfu89i3KnK0pHB08+uJhEW/+ Fibw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xAjEu1X4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r12si3286043eja.193.2019.05.10.10.31.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 10:31:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xAjEu1X4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:47486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9Mt-0007L8-TJ for patch@linaro.org; Fri, 10 May 2019 13:31:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9MH-0007It-Mo for qemu-devel@nongnu.org; Fri, 10 May 2019 13:30:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP9MG-0005zW-Kf for qemu-devel@nongnu.org; Fri, 10 May 2019 13:30:57 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:45948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP9MG-0005zH-Ey for qemu-devel@nongnu.org; Fri, 10 May 2019 13:30:56 -0400 Received: by mail-pg1-x542.google.com with SMTP id i21so3315306pgi.12 for ; Fri, 10 May 2019 10:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WcaPjSSW8mCEGy+vfZffpT+ukMC7uteGhxOw5c2wJXo=; b=xAjEu1X4VlwRNknwmCYR+OOCLDvWztfWn8u8HXL2EOv1yj13dUGgXj20X7w/OaSivF rNvoEyyBkHTS2a723pigY9zxxhaJ6uqFF3oTOF498ZLQSqGXEQkujln9Cica1O57I/wb HJzBcqNke4rvAV74vwV6rMrwnYt5YImMGdOS91S1bvm1lCe0iBwnmYqOLUaJKadk9vma krOvoxFt2kdGlamxH2HhL2tqJZxNYyTzm4tPNhCu7eiwnZtaoARcBBnrkLGly/wz4ZB3 2JCPBGdj3CmePAXZTmz/qbR2Zb3JNAmvewTtX8HRxgrBhC+F6MA+9OXsdAB5Bi9wrVb3 cy6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WcaPjSSW8mCEGy+vfZffpT+ukMC7uteGhxOw5c2wJXo=; b=H/37sbIeO7BUzawcBwbkZZq9yavTeATFKy5etOVKQHik5NBGMZPEKCIgO+r6f/Nzs0 UuZo/Fa3WI4SX7uBQnmL65NvGrdblgb5vyDepC1bpc9v+UFJsQODuSCw1VpLWZDNeP5F DmyOp+CKzD9j3g9MGQrQyUm717OBpJzOvv7RKwrdCMUjlF5yGikskv2f7RaYUIvdHDfw u1qKw5rqmkQpSI+tTB+3r36DY+IRb31EUnNQbQ50+EiuzVjWfy8iMRVI3AdHvj3Xwwcu e8F526Qo5Wy9oDhSA4yAaNiFBHCQ5fduOInoRFsdakwNoYUr/Hf3D/Ee/r8P/ytsTHnw E4lw== X-Gm-Message-State: APjAAAV8DnsK9eROcTsGz+N2Dad5XM2uby+OrkrVPGvWCJUQcRBx2b4k tUBYitjG8IRQd3OynkVi/BenFcToLUk= X-Received: by 2002:a63:2c4a:: with SMTP id s71mr15157285pgs.373.1557509455148; Fri, 10 May 2019 10:30:55 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id v64sm7936792pfv.106.2019.05.10.10.30.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 10:30:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 10:30:27 -0700 Message-Id: <20190510173049.28171-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510173049.28171-1-richard.henderson@linaro.org> References: <20190510173049.28171-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v6 03/25] crypto: Reverse code blocks in random-platform.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use #ifdef _WIN32 instead of #ifndef _WIN32. This will make other tests easier to sequence. Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Signed-off-by: Richard Henderson --- crypto/random-platform.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) -- 2.17.1 diff --git a/crypto/random-platform.c b/crypto/random-platform.c index 7541b4cae7..f995fc0ef1 100644 --- a/crypto/random-platform.c +++ b/crypto/random-platform.c @@ -32,7 +32,14 @@ static int fd; /* a file handle to either /dev/urandom or /dev/random */ int qcrypto_random_init(Error **errp) { -#ifndef _WIN32 +#ifdef _WIN32 + if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, + CRYPT_SILENT | CRYPT_VERIFYCONTEXT)) { + error_setg_win32(errp, GetLastError(), + "Unable to create cryptographic provider"); + return -1; + } +#else /* TBD perhaps also add support for BSD getentropy / Linux * getrandom syscalls directly */ fd = open("/dev/urandom", O_RDONLY); @@ -44,15 +51,7 @@ int qcrypto_random_init(Error **errp) error_setg(errp, "No /dev/urandom or /dev/random found"); return -1; } -#else - if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, - CRYPT_SILENT | CRYPT_VERIFYCONTEXT)) { - error_setg_win32(errp, GetLastError(), - "Unable to create cryptographic provider"); - return -1; - } #endif - return 0; } @@ -60,7 +59,15 @@ int qcrypto_random_bytes(uint8_t *buf G_GNUC_UNUSED, size_t buflen G_GNUC_UNUSED, Error **errp) { -#ifndef _WIN32 +#ifdef _WIN32 + if (!CryptGenRandom(hCryptProv, buflen, buf)) { + error_setg_win32(errp, GetLastError(), + "Unable to read random bytes"); + return -1; + } + + return 0; +#else int ret = -1; int got; @@ -82,13 +89,5 @@ int qcrypto_random_bytes(uint8_t *buf G_GNUC_UNUSED, ret = 0; cleanup: return ret; -#else - if (!CryptGenRandom(hCryptProv, buflen, buf)) { - error_setg_win32(errp, GetLastError(), - "Unable to read random bytes"); - return -1; - } - - return 0; #endif }