From patchwork Fri Mar 15 03:26:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160382 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp16271936jad; Thu, 14 Mar 2019 20:47:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZ8CsnJq9Q4gIG0DoMZ0sCeIGAvZDsiCTF1DGf8R9GTUkA95wpdfsGco7LgvE0nAQOKICT X-Received: by 2002:adf:f690:: with SMTP id v16mr758255wrp.139.1552621657087; Thu, 14 Mar 2019 20:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552621657; cv=none; d=google.com; s=arc-20160816; b=IJcJ9DTC1pp1e/z6cCPICkep6efBSPisGgveX968S5TOlUcMuxjQkraw+hTy5NWiJL QKmXJwzq7dQRauYx5RmQY57FXCYBvxor/SPIcW26UajyLJTL3Da5ccBBBm1nTiIxxZ+O xvdzP0nEzUSh804fFJxynoh+r8SScjRnFDCFErGWXQ4qeppcpcIiEq9KjruM0q0z/38G I4NR1D+dpkVcO+G8kOA0jcI3FlXUzZISfF4vlASUsfHxnJs79X5ymEBy/YWwKN+Bst4g 0415047JHRk3w+kwmpDuilckb7U2kHVI1PTsOHsBPJyKPNiKS9KC0o1XqguWoZq5rikJ e8tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=II4ZitPVyuBuTtikKVKTOwZYATc7zBTEhNb3dHQRGvg=; b=t1qEB+syVbh0vU7Ec5pab0xDXSD4TIWDaqgXgd6RilS5kNXvWq07Q5r1/4Mp6UlNp4 JC9NqygYy3QtiPV5u+0hurUOD/Q2E1cBHcR0MrjyexM9aaxVVPYlzs4EujDOPSmMrEvs VC3Ow2MhtGtEyQdjuOBpmcG150PmXhp7Y5VzXzjXAQRDvVMUSyp2xzVgTR2fkvPjPHeG 0elD64VW9Hh2Uy1Af0kMmtF+0u2iSn+bhdxjilUcqdwM1KpqTLiiw3EZkf7QEDjgiEsR UxrcYSRm7dkaI5VlyEQ+D9OgxIIVUPuhzcYLeO3HRu+BLlxIQr/dRc3sGn3MPBVnSWjo CL4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZaJWCpv2; 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 u1si398623wmc.133.2019.03.14.20.47.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Mar 2019 20:47: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=ZaJWCpv2; 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]:48873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4dom-0007UL-11 for patch@linaro.org; Thu, 14 Mar 2019 23:47:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4dcL-0004w5-7P for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4dUa-0002rk-E1 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:26:45 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:44653) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h4dUa-0002qw-5q for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:26:44 -0400 Received: by mail-pg1-x52f.google.com with SMTP id h34so5388525pgh.11 for ; Thu, 14 Mar 2019 20:26:44 -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; bh=II4ZitPVyuBuTtikKVKTOwZYATc7zBTEhNb3dHQRGvg=; b=ZaJWCpv2Xoa4WQlrvPawZrbWqnV6d5uw5TSXRYxCDyzbZt+OxV5K959CZffqefwQXH 02PUnNTkr1/NktsJbrsXnHCJM0bf/0aX82VkVWdSRHbFTkKQVt83fYUUmBa75eQXzJ3r JJ0kGw5N0doqk8BMOv7GLRO0ENgX9qojYdSNEfRcvdUSrpcX3I0LrHzvrXTbwlENyYQc 6HaFmwfJ9/9skiSpwajtxd4gBMi7pXAkzrFVLnJWDfJaZ8SKC2hFFkOnQOLnuo8OMz/p +2n8bL84nJH1AtTJVbZvVmCxdBU/h9BQ4Hoz0guHVw8hP3jd1sBpVdKoeSh2uo04YlBx /aBg== 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; bh=II4ZitPVyuBuTtikKVKTOwZYATc7zBTEhNb3dHQRGvg=; b=SQcx0RtDZCFfYcrNvc+a2C4WNZYuKFH/ADKT4RR1VT4wVwcVH7cQ0X9LJmA+tycg2t 9+UZRRK1uIfBEY/U1d2xL1PYT6JD+qoRLM7EgS6iHrK2gHsU+cq9vLCyVfzL8zedUcyZ vRB/VwPgyS/d9T70UGIT5OslqRvpud56uAYem7JRVfC6FbpmDi6m9YnSrg/uCJXm6KPO kIwnW/gC4j8Cvs6xI5WkD31EpO4iwHc36BfVEfqDuxQxhUzHDBWxd3ILhdt+hirKDcYb zpoe/2887WWOSbYUjSDfHoeMDpfc2hXDMr3ljA+N6/HpbI3pxQ99ytVGtW/aWhz0DY3D eB5g== X-Gm-Message-State: APjAAAWMbiKYa3GgMnjoTmWiDlalN8L4HYHt2cYFRuSNs5EwSmYqY4Vv qjSKhT38zEkBKbMrU6qT/xhTDn/1zrE= X-Received: by 2002:aa7:9102:: with SMTP id 2mr1682269pfh.179.1552620402842; Thu, 14 Mar 2019 20:26:42 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2019 20:26:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 20:26:14 -0700 Message-Id: <20190315032629.21234-9-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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52f Subject: [Qemu-devel] [PATCH v3 08/23] ui/vnc: Use gcrypto_random_bytes for start_auth_vnc 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: Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use a better interface for random numbers than rand(). Fail gracefully if for some reason we cannot use the crypto system. Cc: Gerd Hoffmann Signed-off-by: Richard Henderson --- v2: Use qcrypto_random_bytes, not qemu_getrandom, as there is no need for deterministic results for this interface. v3: Fail gracefully in the event qcrypto_random_bytes fails. --- ui/vnc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 2.17.2 Reviewed-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé diff --git a/ui/vnc.c b/ui/vnc.c index 785edf3af1..d83f4a6ff9 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -43,6 +43,7 @@ #include "crypto/hash.h" #include "crypto/tlscredsanon.h" #include "crypto/tlscredsx509.h" +#include "crypto/random.h" #include "qom/object_interfaces.h" #include "qemu/cutils.h" #include "io/dns-resolver.h" @@ -2547,16 +2548,6 @@ static void authentication_failed(VncState *vs) vnc_client_error(vs); } -static void make_challenge(VncState *vs) -{ - int i; - - srand(time(NULL)+getpid()+getpid()*987654+rand()); - - for (i = 0 ; i < sizeof(vs->challenge) ; i++) - vs->challenge[i] = (int) (256.0*rand()/(RAND_MAX+1.0)); -} - static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) { unsigned char response[VNC_AUTH_CHALLENGE_SIZE]; @@ -2628,7 +2619,16 @@ reject: void start_auth_vnc(VncState *vs) { - make_challenge(vs); + Error *err = NULL; + + if (qcrypto_random_bytes(vs->challenge, sizeof(vs->challenge), &err)) { + trace_vnc_auth_fail(vs, vs->auth, "cannot get random bytes", + error_get_pretty(err)); + error_free(err); + authentication_failed(vs); + return; + } + /* Send client a 'random' challenge */ vnc_write(vs, vs->challenge, sizeof(vs->challenge)); vnc_flush(vs);