From 484acfbf59b8f49367bb64f1c1e6b3284714b5db Mon Sep 17 00:00:00 2001
From: David Goodwin <david@codepoets.co.uk>
Date: Sun, 27 Sep 2020 10:47:22 +0100
Subject: [PATCH] Remove the random_compat lib.

---
 common.php                    |  3 ---
 functions.inc.php             |  4 ----
 lib/block_random_int.php      | 17 -----------------
 lib/random_compat.phar.pubkey |  5 -----
 lib/random_compat.txt         |  4 ----
 psalm.xml                     |  1 -
 6 files changed, 34 deletions(-)
 delete mode 100644 lib/block_random_int.php
 delete mode 100644 lib/random_compat.phar.pubkey
 delete mode 100644 lib/random_compat.txt

diff --git a/common.php b/common.php
index daea0bad..5e93e225 100644
--- a/common.php
+++ b/common.php
@@ -68,9 +68,6 @@ Config::write($CONF);
 $PALANG = [];
 require_once("$incpath/languages/language.php");
 require_once("$incpath/functions.inc.php");
-if (extension_loaded('Phar') && ( version_compare(PHP_VERSION, '7.0.0') < 0)) {
-    require_once("$incpath/lib/random_compat.phar");
-}
 
 if (defined('POSTFIXADMIN_CLI')) {
     $language = 'en'; # TODO: make configurable or autodetect from locale settings
diff --git a/functions.inc.php b/functions.inc.php
index e1400bff..3cafb2dc 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -834,10 +834,6 @@ function encode_header($string, $default_charset = "utf-8") {
 }
 
 
-if (!function_exists('random_int')) { // PHP version < 7.0
-    require_once(dirname(__FILE__) . '/lib/block_random_int.php');
-}
-
 
 /**
  * Generate a random password of $length characters.
diff --git a/lib/block_random_int.php b/lib/block_random_int.php
deleted file mode 100644
index 5d6d9d0b..00000000
--- a/lib/block_random_int.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * This file should only be loaded if you're : 
- *  a. running PHP < 7.0, and
- *  b. have the php_crypt password hash configured, and
- *  c. have not loaded paragonie's random_compat library.
- *
- */
-
-if(function_exists('random_int')) {
-    return;
-}
-
-function random_int($a, $b) { // someone might not be using php_crypt or ask for password generation, in which case random_int() won't be called
-        die(__FILE__ . " Postfixadmin security: Please install https://github.com/paragonie/random_compat OR enable the 'Phar' extension.");
-}
diff --git a/lib/random_compat.phar.pubkey b/lib/random_compat.phar.pubkey
deleted file mode 100644
index eb50ebfc..00000000
--- a/lib/random_compat.phar.pubkey
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEEd+wCqJDrx5B4OldM0dQE0ZMX+lx1ZWm
-pui0SUqD4G29L3NGsz9UhJ/0HjBdbnkhIK5xviT0X5vtjacF6ajgcCArbTB+ds+p
-+h7Q084NuSuIpNb6YPfoUFgC/CL9kAoc
------END PUBLIC KEY-----
diff --git a/lib/random_compat.txt b/lib/random_compat.txt
deleted file mode 100644
index 5c7a8352..00000000
--- a/lib/random_compat.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Downloaded on 2018/04/29.
-
-https://github.com/paragonie/random_compat/releases/download/v2.0.12/random_compat.phar.pubkey
-https://github.com/paragonie/random_compat/releases/download/v2.0.12/random_compat.phar
diff --git a/psalm.xml b/psalm.xml
index 08df1553..df696107 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -12,7 +12,6 @@
             <directory name="tests" />
             <directory name="templates_c" />
             <directory name="lib/smarty" />
-            <file name="lib/block_random_int.php" />
             <directory name="ADDITIONS/" />
         </ignoreFiles>
     </projectFiles>