move function

Author: simonLeary42

resources/lib/UnityUser.php

@@ -299,26 +299,12 @@ public function getSSHKeys(): array
         return $result;
     }
 
-    /*
-    key must take the form "KEY_TYPE KEY_DATA OPTIONAL_COMMENT"
-    https://github.com/phpseclib/phpseclib/issues/2117
-    */
-    private static function removeSSHKeyOptionalCommentSuffix(string $key): string
-    {
-        $matches = [];
-        if (preg_match("/^(\S+ \S+)/", $key, $matches)) {
-            return $matches[1];
-        } else {
-            throw new \ValueError("invalid SSH key: $key");
-        }
-    }
-
     /* checks if key exists, ignoring the optional comment suffix */
     public function SSHKeyExists(string $key): bool
     {
-        $keyNoSuffix = self::removeSSHKeyOptionalCommentSuffix($key);
+        $keyNoSuffix = removeSSHKeyOptionalCommentSuffix($key);
         foreach ($this->getSSHKeys() as $foundKey) {
-            $foundKeyNoSuffix = self::removeSSHKeyOptionalCommentSuffix($foundKey);
+            $foundKeyNoSuffix = removeSSHKeyOptionalCommentSuffix($foundKey);
             if ($key === $foundKey || $keyNoSuffix === $foundKeyNoSuffix) {
                 return true;
             }

resources/lib/utils.php

@@ -15,6 +15,19 @@ function ensure(bool $condition, ?string $message = null): void
     }
 }
 
+/*
+key must take the form "KEY_TYPE KEY_DATA OPTIONAL_COMMENT"
+*/
+function removeSSHKeyOptionalCommentSuffix(string $key): string
+{
+    $matches = [];
+    if (preg_match("/^(\S+ \S+)/", $key, $matches)) {
+        return $matches[1];
+    } else {
+        throw new \ValueError("invalid SSH key: $key");
+    }
+}
+
 /**
  *  @return array of length 2: boolean is_valid, string invalid_explanation
  */