From 75a9b387ea155f9af3f3a24011789cb67c53dc49 Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Sun, 14 Feb 2021 18:29:37 +0000
Subject: [PATCH] Fix tests with gpg2

---
 tests/gnupg_oo_import.phpt       |  2 +-
 tests/gnupg_res_0001_import.phpt |  2 +-
 tests/gnupgt.inc                 | 50 +++++++++++++++++++++++++++-----
 tests/vars.inc                   |  2 +-
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/tests/gnupg_oo_import.phpt b/tests/gnupg_oo_import.phpt
index 80ed575..61c6dfd 100644
--- a/tests/gnupg_oo_import.phpt
+++ b/tests/gnupg_oo_import.phpt
@@ -5,7 +5,7 @@ import a new key into the keyring
 --FILE--
 <?php
 require_once "gnupgt.inc";
-gnupgt::delete_key();
+gnupgt::reset_key();
 
 $gpg = new gnupg();
 $gpg->seterrormode(gnupg::ERROR_WARNING);
diff --git a/tests/gnupg_res_0001_import.phpt b/tests/gnupg_res_0001_import.phpt
index ea21e94..a6644b8 100644
--- a/tests/gnupg_res_0001_import.phpt
+++ b/tests/gnupg_res_0001_import.phpt
@@ -5,7 +5,7 @@ import a new key into the keyring
 --FILE--
 <?php
 require_once "gnupgt.inc";
-gnupgt::delete_key();
+gnupgt::reset_key();
 
 $gpg = gnupg_init();
 gnupg_seterrormode($gpg, GNUPG_ERROR_WARNING);
diff --git a/tests/gnupgt.inc b/tests/gnupgt.inc
index 8aab3b6..dbfd0b9 100644
--- a/tests/gnupgt.inc
+++ b/tests/gnupgt.inc
@@ -10,7 +10,7 @@ class gnupgt {
     {
         global $testkey;
 
-        self::delete_key();
+        self::reset_key();
 
         $gpg = new gnupg();
         $gpg->import($testkey);
@@ -21,21 +21,55 @@ class gnupgt {
      */
     static public function delete_key()
     {
-        @unlink(__DIR__ . "/pubring.gpg");
-        @unlink(__DIR__ . "/secring.gpg");
-        @unlink(__DIR__ . "/pubring.kbx");
-        @unlink(__DIR__ . "/random_seed");
-        @unlink(__DIR__ . "/sshcontrol");
-        @unlink(__DIR__ . "/trustdb.gpg");
-        $privKeyDir = __DIR__ . '/private-keys-v1.d';
+        $homeDir = self::get_home_dir();
+        if (!is_dir($homeDir)) {
+            return;
+        }
+        @unlink("$homeDir/pubring.gpg");
+        @unlink("$homeDir/secring.gpg");
+        @unlink("$homeDir/pubring.kbx");
+		@unlink("$homeDir/pubring.kbx~");
+        @unlink("$homeDir/random_seed");
+        @unlink("$homeDir/sshcontrol");
+        @unlink("$homeDir/trustdb.gpg");
+        $privKeyDir = self::get_priv_key_dir();
         if (is_dir($privKeyDir)) {
             foreach (glob($privKeyDir . '/*.key') as $key) {
                 unlink($key);
             }
             rmdir($privKeyDir);
         }
+        rmdir($homeDir);
     }
 
+	/**
+	 * Initialize key directory.
+	 */
+	static public function init_key_dir()
+	{
+        mkdir(self::get_home_dir());
+        mkdir(self::get_priv_key_dir(), 0700);
+	}
+
+	/**
+	 * Reset all keys.
+	 */
+	static public function reset_key()
+	{
+		self::delete_key();
+		self::init_key_dir();
+	}
+
+    static private function get_home_dir()
+	{
+        return 	__DIR__ . '/home';
+	}
+
+	static private function get_priv_key_dir()
+	{
+		return 	self::get_home_dir() . '/private-keys-v1.d';
+	}
+
     /**
      * Print error message and return false.
      *
diff --git a/tests/vars.inc b/tests/vars.inc
index 3629f6c..02d2819 100644
--- a/tests/vars.inc
+++ b/tests/vars.inc
@@ -1,5 +1,5 @@
 <?php
-putenv("GNUPGHOME=".dirname(__FILE__));
+putenv("GNUPGHOME=".dirname(__FILE__) . '/home');
 error_reporting (E_ALL);
 $fingerprint = "2DF0DD02DC9B70B7F64F572E669E775E0A6284B3";
 $passphrase = "blabla";