From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 May 2018 19:31:12 +0000 (+0100)
Subject: entropy: Don't show message for HWRNGs any more
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b656e7f40a3e0082681a63d2a2c0d4eea885906;p=people%2Fms%2Fipfire-2.x.git

entropy: Don't show message for HWRNGs any more

We cannot reliably detect this with the new kernel
and therefore cannot show this.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
index e5db5c212c..d7a9ca5d89 100644
--- a/html/cgi-bin/entropy.cgi
+++ b/html/cgi-bin/entropy.cgi
@@ -51,14 +51,9 @@ if ( $querry[0] ne~ "") {
 	# Check for hardware support.
 	my $message;
 	my $message_colour = $Header::colourred;
-	if (&has_hwrng()) {
-		$message = $Lang::tr{'system has hwrng'};
-		$message_colour = $Header::colourgreen;
-	} elsif (&has_rdrand()) {
+	if (&has_rdrand()) {
 		$message = $Lang::tr{'system has rdrand'};
 		$message_colour = $Header::colourgreen;
-	} else {
-		$message = $Lang::tr{'no hardware random number generator'};
 	}
 
 	my $rngd_status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
@@ -67,9 +62,13 @@ if ( $querry[0] ne~ "") {
 	}
 
 	&Header::openbox('100%', 'center', $Lang::tr{'hardware support'});
-	print <<EOF;
-		<p style="color: $message_colour; text-align: center;">$message</p>
+	if ($message) {
+		print <<EOF;
+			<p style="color: $message_colour; text-align: center;">$message</p>
+EOF
+	}
 
+	print <<EOF;
 		<table width='80%' cellspacing='1' class='tbl'>
 			<tr>
 				<th align='center'><b>$Lang::tr{'service'}</b></th>
@@ -89,10 +88,6 @@ EOF
 	&Header::closepage();
 }
 
-sub has_hwrng() {
-	return (-c "/dev/hwrng");
-}
-
 sub has_rdrand() {
 	open(FILE, "/proc/cpuinfo") or return 0;
 	my @cpuinfo = <FILE>;