prevent deprecation notice in PHP 8.0 and above

syseleven · Jul 20, 2022 · 412102d · 412102d
1 parent 50b7e0e
commit 412102d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.30b2 (2022-07-20)
+
+* prevent deprecation notice in PHP 8.0 and above
+
 # 0.30b1 (2022-02-01)
 
 * specify columns on insert to be more robust regarding schema changes (thanks to @jonico)

diff --git a/actions/read.php b/actions/read.php
@@ -30,9 +30,12 @@ function read_secret($secret, &$error = null) {
           try {
             $decrypted_secret = decrypt_v01($secret, $recipients, $decrypt_error, $keyid, $fingerprint);
           } finally {
-            $keys = array_keys($recipients);
-            foreach ($keys as $key) {
-              openssl_pkey_free($recipients[$key]);
+            # prevent deprecation notice in PHP 8.0 and above
+            if (0 > version_compare(PHP_VERSION, "8.0.0")) {
+              $keys = array_keys($recipients);
+              foreach ($keys as $key) {
+                openssl_pkey_free($recipients[$key]);
+              }
             }
 
             zeroize_array($recipients);

diff --git a/index.php b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-  # Shared-Secrets v0.30b1
+  # Shared-Secrets v0.30b2
   #
   # Copyright (c) 2016-2022, SysEleven GmbH
   # All rights reserved.

diff --git a/lib/shared-secrets.exec.php b/lib/shared-secrets.exec.php
@@ -555,7 +555,10 @@ function open_pubkey($string) {
           }
         }
       } finally {
-        openssl_pkey_free($privkey);
+        # prevent deprecation notice in PHP 8.0 and above
+        if (0 > version_compare(PHP_VERSION, "8.0.0")) {
+          openssl_pkey_free($privkey);
+        }
       }
     }