From patchwork Fri May 17 02:39:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1100798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="eMIrOXYT"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 454swG13Vzz9s55 for ; Fri, 17 May 2019 12:40:30 +1000 (AEST) Received: from localhost ([127.0.0.1]:40084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRSnM-0005QK-3e for incoming@patchwork.ozlabs.org; Thu, 16 May 2019 22:40:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRSmT-0005N7-Vg for qemu-devel@nongnu.org; Thu, 16 May 2019 22:39:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRSmS-00020F-Su for qemu-devel@nongnu.org; Thu, 16 May 2019 22:39:33 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:37399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hRSmS-0001z1-Hg for qemu-devel@nongnu.org; Thu, 16 May 2019 22:39:32 -0400 Received: by mail-pf1-x444.google.com with SMTP id g3so2874892pfi.4 for ; Thu, 16 May 2019 19:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WcaPjSSW8mCEGy+vfZffpT+ukMC7uteGhxOw5c2wJXo=; b=eMIrOXYTkmwdbKy0BVDOdex8ZRzpUfMt2rt4b2otHHA2EQkAH1bntzSRkGXeZWLxjw 6vG2a8zUMiGNOSDdHPlFqnvbdQMcduQBOb8uuyB4P+r0QBQW1CqGAo2ZIxLdz4ZLTjqW LWpKDqd72/ycLmktsQ25J9RaWGP6G+qM+VCBKgW61oyMSUaoV/AYrxa9lDStiJodHE9E fsPSBoCh3F5PGFJ5fPhByf5jvbL0XSF4PFhJtkOtSHc+wBgJQBGMPHxfi0WjJ7zeEMqE BOsBvDFZV1/Yz35aTE9Kf1Vk/N4VHc28Lv/ZpkoZaIcw3HWQbIQuHjCnhUjUmbDXIkUi Z+9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WcaPjSSW8mCEGy+vfZffpT+ukMC7uteGhxOw5c2wJXo=; b=b4nK+q8Hq8sr03lPg3dVWsRdaHpQQ4ttz1N9X8NOgkkH4sAsfLqadyRrOcpChxyFkv Zvb7QRoOeNspwpcq88J67htM0Zx3LDyuFRdJLVyPXrFcJGTXLrI+lbODrLMyLezuZgnb 2z4k7zmvII6QIvtbB/NZY7k1P3KMN8ewd0V4BmqGBWNMrPjU2TlKI7f9vH5k5t1yvU1a IKlHNBlOhVi2Jlk+H/16A2+HzAn+KqjZ0Eqj5SwTrSCa+HfZW2YSJuz6onQBdPxdD10J 0Yn/iATG/cE7yNM3At+PmrQll+x77rHBlZsiVGtYHzwtLiEcW7UurPxE4I7MVAyMT7pK 8HDA== X-Gm-Message-State: APjAAAXdh1tqxeAsD8Ht4MYHCkRvCUZrPo8OL0OrENU70vjJhSSXI7bW QWuILP5oPqC4ngMJ4VWd6XoWtmtBr1w= X-Google-Smtp-Source: APXvYqxMdAeSNFxLA4hUHR/ZkJ2EyqEF8U02Xq7k1Fr8dATDTzKgaPE2GBdHXI8meJRLfPsKRx0IeA== X-Received: by 2002:a65:5c89:: with SMTP id a9mr54354788pgt.334.1558060770900; Thu, 16 May 2019 19:39:30 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id w6sm6984152pge.30.2019.05.16.19.39.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 19:39:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 16 May 2019 19:39:02 -0700 Message-Id: <20190517023924.1686-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190517023924.1686-1-richard.henderson@linaro.org> References: <20190517023924.1686-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::444 Subject: [Qemu-devel] [PATCH v8 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: , Cc: lvivier@redhat.com, berrange@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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(-) 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 }