From patchwork Mon Jul 20 10:53:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathaniel Filardo X-Patchwork-Id: 1332188 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=uwAX6v5l; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MWe48YWJ; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B9JXc44kpz9s1x for ; Mon, 20 Jul 2020 20:55:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=65STgbF3qcXP0TaOYPYenS3VHEcxXeN//hafs8mm2dE=; b=uwAX6v5lfinLRO/VZpD4pSH7G pZE1F44R4V9lqrAuoUqG8fVGemjxsGUtrUYX3sPZVwD3033Z3oWN9R2UORfkBW3KJ4+JBX+7aRIsX Kkv4uN3mzZkBwfN0RQNnYgHuWSe37x2QuvU3B886wLHR3JZvArk+sVnKrO3MBDX7hdTB5Z6M2nJnk YgLhxAQ2ML4AyplWi5Fh24MSN20KHFsjrbTuuKY4gM1t5iWALOiNNGtr2jvHgbSQg89EYkh62sdBb Bv6K46a/uJ4XBsuqtGU5GZE9OZnakNMVeURCBl6ZZ0UMu6nKA+btVW2s+lo7re2G7aalYcM6C04Ff 2zs7yYHxQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTQ7-00040g-CJ; Mon, 20 Jul 2020 10:53:19 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTQ1-0003z7-MY for openwrt-devel@lists.openwrt.org; Mon, 20 Jul 2020 10:53:14 +0000 Received: by mail-wm1-x343.google.com with SMTP id 17so24703093wmo.1 for ; Mon, 20 Jul 2020 03:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/Deia6dl8EXCYxShuy8A4rcyWC0BSWaWbq/g92sO/Fo=; b=MWe48YWJ6OYMwqavTP/I/OKowre9oTobxy7pFV9A0ci+CXFxObwxM36WacCgyiMya6 JTT4HQIdolVxOQUlx7/zJqA9saVMLC4sZKS2Z+Qam8i7NFtXZT1Q8bUHU3bvNDEjD2qY E3mAmztC+DnqVZm0DXvxaxTkmSrRuvaDSpXgDZW/qlOFpLZtbj8Bm5+w2G4ZX2oIF/+a pjP6dTvCKGgL3JU/javdcx0m3XmpGuIMi+K6QTJICzms4gQt3M6AA0JCo79wRYwB9pKA 6t4+BtF8d1ADMe6GzA7wGxnXJuA0J6RfYabc91Xuvj54H6kMru7ROpDB9QUzlz4XmJUV S/0w== 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=/Deia6dl8EXCYxShuy8A4rcyWC0BSWaWbq/g92sO/Fo=; b=RZyF1uQ41arfuTRwfXvtcTJlJCr0Edd/fgA9nn+mpKuG1OVrmZA/axNMcgbeL8pc1z pghESoVem+2gw7g1bAiJ1VrA/fy3WzchKCHfYoLyhKxT7+uFhW4VJvDrQtDKWM6lnSBS Vb//GAAtKaOhi7MOGNrg5DDnnUjA0SPnq+Rd2xJ9Qro27fUQvX1QX/iU7p4HOvXi5p8a /TllFd4IUMY1BGgTac7zZy9Kllnppmo8F4Szm1Y57QK8V4vv7r3t54py1MAuBr3WwC0r 91YZfbbquZ36T9XXcXSsTYsWiLfz6RoOUen+2wNfdsFRjA1ZgTJNFwEZQ532uTTnoOEa h2bw== X-Gm-Message-State: AOAM533s3oYzcIroavvTcUAMLRwwJqBsFfvS+UU4BSV8yHWjWHzSUDRf ZnOc/JCIq3m77zSISem1CNKJK2URvrk= X-Google-Smtp-Source: ABdhPJwZ7VLmzfiLCZclT8z1GfsDrM5any3F93or96wGinwR6tGUfYN0tA28xNmPjMuSWONzWJzdrw== X-Received: by 2002:a05:600c:21cb:: with SMTP id x11mr19938353wmj.141.1595242392416; Mon, 20 Jul 2020 03:53:12 -0700 (PDT) Received: from pf.fritz.box ([2a02:8010:63ca:0:ad41:fb8f:65c1:1e24]) by smtp.gmail.com with ESMTPSA id x18sm32079991wrq.13.2020.07.20.03.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 03:53:11 -0700 (PDT) From: nwfilardo@gmail.com To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 4/4] urngd: Add source information to log message Date: Mon, 20 Jul 2020 11:53:04 +0100 Message-Id: <20200720105304.1090741-4-nwfilardo@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200712205739.238197-1-nwfilardo@gmail.com> References: <20200712205739.238197-1-nwfilardo@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200720_065313_750215_8DCB521E X-CRM114-Status: UNSURE ( 8.68 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:343 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [nwfilardo[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nathaniel Wesley Filardo , =?utf-8?q?Petr_=C5=A0tet?= =?utf-8?q?iar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Nathaniel Wesley Filardo Now that entropy can come from two places, indicate which Signed-off-by: Nathaniel Wesley Filardo --- urngd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/urngd.c b/urngd.c index 1168674..9eedb6b 100644 --- a/urngd.c +++ b/urngd.c @@ -78,7 +78,8 @@ static inline bool entropy_file_available(struct urngd *u) return (u->file_fd.fd >= 0) && !(u->file_fd.registered); } -static size_t write_entropy(struct urngd *u, struct rand_pool_info *rpi) +static size_t write_entropy(struct urngd *u, struct rand_pool_info *rpi, + const char *src) { int ret; ret = ioctl(u->rnd_fd.fd, RNDADDENTROPY, rpi); @@ -86,8 +87,8 @@ static size_t write_entropy(struct urngd *u, struct rand_pool_info *rpi) ERROR("error injecting entropy: %s\n", strerror(errno)); return 0; } else { - DEBUG(1, "injected %ub (%ub of entropy)\n", - rpi->buf_size, rpi->entropy_count/8); + DEBUG(1, "injected %ub (%ub of entropy) from %s\n", + rpi->buf_size, rpi->entropy_count/8, src); ret = rpi->buf_size; } @@ -109,7 +110,7 @@ static size_t gather_jitter_entropy(struct urngd *u) rpi->buf_size = ENTROPYPOOLBYTES; rpi->entropy_count = 8 * ENTROPYBYTES; - ret = write_entropy(u, rpi); + ret = write_entropy(u, rpi, "jitter"); memset_secure(&rpi->buf, 0, ENTROPYPOOLBYTES);