From patchwork Fri Mar 15 03:26:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160378 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp16269874jad; Thu, 14 Mar 2019 20:44:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqwP6j3d30SS1tzLAmvLJDwrfS94t6l94bXnJr9ri2Skkq+Rp8/7L3FNK7FL/b1qfinbGtYw X-Received: by 2002:a1c:6589:: with SMTP id z131mr513264wmb.120.1552621472200; Thu, 14 Mar 2019 20:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552621472; cv=none; d=google.com; s=arc-20160816; b=Uc+fTlu1JdDMElozw499/elm4qyg0bY8JbriynOSQU3mY+8htIK9PlvSvuevhtImhN 1dGj/38dsAIYv+Wvv2v0yxW4O4nYOdletBaRguT+CaAXTLPGoAqspBOemGxI33WuR1GE PU1lSct2+07YE4L0KllK1Q/Hzo3OQZa2+2ZG83bjBS06mjOy7SkNZDBOoyhwF39URErE dJslk4QgBvKuHNYDt8RR3b7hiATXuvHSKFqPmuPGesXh9hdp1cNrP0gRquYghziGt9nf IOksUy6ga0BtO9Nx9DOwKKubxdPdSlGpbQhZac1cWifPLnr+UXCcIixDS8NeL9irxcvL XSvg== 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=rp2FmjqCfIvvSwDyOgXPZwMlq+i+lzvSkjm1+zs+Ank=; b=S3Y/12MGkD8OKECud1JKkjujUmyWNnCzwTesOFsVvPz2jN/C32oqXvVghRvTkYKqEz 9EafU+W1gfi53xHjfbFN8PVjtzOBOQNuAHEh+oP8lKpgTyW+Nem+dPkGbG7eRMCRfphR /9tA4PyGwX6JmRuvqwBNK/CIoG7P4l2sZqPPVlAOk9egET5Kl52FKhGm0peqgxKTF3AI TZWV46+hH6vAj2Q+iq8AWTU5emCRFas8SA7jeNpCGuKPKCXMiFffyUdhSYnY27Jj5iph DiCXPEGan2eASQAo+IhV9YrekqBYAr/r6skNct7ejbwM0JNwUAqWohXOJHc6Eb+Zm6Qs vaUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yFmKn+l4; 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 l5si459537wrm.255.2019.03.14.20.44.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Mar 2019 20:44:32 -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=yFmKn+l4; 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]:48813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4dln-0004WJ-3O for patch@linaro.org; Thu, 14 Mar 2019 23:44:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4dcM-0004w5-3F for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:34:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4dUS-0002iV-4m for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:26:36 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:46030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h4dUR-0002hi-SZ for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:26:36 -0400 Received: by mail-pg1-x532.google.com with SMTP id 125so5384082pgc.12 for ; Thu, 14 Mar 2019 20:26:35 -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=rp2FmjqCfIvvSwDyOgXPZwMlq+i+lzvSkjm1+zs+Ank=; b=yFmKn+l4D2p9RttjLYlPe8ahK/Ep3s3PMi2Yagx1BdPp/VZY4ZEYw6PObDg3ZQeO3x DMYi0widVvQpgVeDYrCI7YDbpWtDPI9JToM7WXytrtDxKrtUHyMCvfLGz5D9XTXYz9nn MdGmVqEzIHiMlAZ2eDJguWxOph0iSViSvYg21j2HwwW7WOdp1pAM5BtJN2exJ86/xmuP Eq9UyYMXFesVa0/JWw5mZqKHSARoXMSSBTgktmvNxK/9g2mGLcgKrlwiXRpnJxJ2Ofz6 qf91jl3mCH1MVyTn4M/qoNuC6QGQ+tbnhTlvrfQsL62T1Ylq8SY7Bxl0lHa2zXUKZ6Bh fOGw== 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=rp2FmjqCfIvvSwDyOgXPZwMlq+i+lzvSkjm1+zs+Ank=; b=S15LYkynTg3RFGI5Laihxq/2ayFh+9savrLHCEdQ1jVBFzKxm8E/uR3M+tjaUo+qVu vKW7IYtG+1SqVPdiTa+V3D0xXeREEqfxZqtPt8JlllYvCgMFJuXkaSNp7XOlX0Pux0Nw 0iAX8gTQZ+ye8S3wot5dYAzR9R7yKaoOuk/CY4d9fh2kioJPyu0gptN0mWAkRWHp1WC/ g7sVi17Xol/eF3PdgmIFq5IofJuCzlZgCj/pURICJ9pbCarHIiHKMgXf5UVMZvznPiZh cEI8JltZHDhqK4XVJSdN5E+8Jj+XZHXk2g4GzHx41cucLzseUnhO4A2cb46PqOhNSIZn FDHA== X-Gm-Message-State: APjAAAXzanh2uwtfKcHMmDhySh+qf0gBoJm8gDQijH27zgk8eWLeVUXE ZjXB6C/Qdnt/RemttFPvtS2zBTi8S1w= X-Received: by 2002:a17:902:b618:: with SMTP id b24mr1739608pls.73.1552620394496; Thu, 14 Mar 2019 20:26:34 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id d26sm690816pfn.86.2019.03.14.20.26.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2019 20:26:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 20:26:08 -0700 Message-Id: <20190315032629.21234-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190315032629.21234-1-richard.henderson@linaro.org> References: <20190315032629.21234-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::532 Subject: [Qemu-devel] [PATCH v3 02/23] 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: 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.2 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 }