From cbfeb6aa01018fb4924c012bfdde59bfc441520c Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 27 Mar 2021 12:55:32 -0700
Subject: [PATCH] Use standard function for reading an entire file

---
 webmin/gnupg-lib.pl | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/webmin/gnupg-lib.pl b/webmin/gnupg-lib.pl
index 0c0d41ea9..99a0ac9e1 100755
--- a/webmin/gnupg-lib.pl
+++ b/webmin/gnupg-lib.pl
@@ -159,7 +159,7 @@ while(1) {
 close($fh);
 &reset_environment();
 unlink($srcfile);
-my $dst = &read_entire_file($dstfile);
+my $dst = &read_file_contents($dstfile);
 unlink($dstfile);
 if ($dst) {
 	${$_[1]} = $dst;
@@ -207,7 +207,7 @@ while(1) {
 close($fh);
 &reset_environment();
 unlink($srcfile);
-my $dst = &read_entire_file($dstfile);
+my $dst = &read_file_contents($dstfile);
 unlink($dstfile);
 if (!$keyid) {
 	return $text{'gnupg_ecryptid'};
@@ -272,7 +272,7 @@ while(1) {
 	}
 close($fh);
 unlink($srcfile);
-my $dst = &read_entire_file($dstfile);
+my $dst = &read_file_contents($dstfile);
 unlink($dstfile);
 if ($error || $seen_pass > 1) {
 	return "<pre>$wait_for_input</pre>";
@@ -333,18 +333,6 @@ else {
 	}
 }
 
-# read_entire_file(file)
-sub read_entire_file
-{
-my ($rv, $buf);
-open(FILE, "<".$_[0]) || return undef;
-while(read(FILE, $buf, 1024) > 0) {
-	$rv .= $buf;
-	}
-close(FILE);
-return $rv;
-}
-
 # write_entire_file(file, data)
 sub write_entire_file
 {