From 042ff1cfda2f4832eff4fc7cf161f50aa44fa9bd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 18 Aug 2023 15:26:18 +0200
Subject: mod/ssh-keys-import: drop the version check for ed25519 keys...

... now that we require RouterOS 7.12beta1 anyway.
---
 mod/ssh-keys-import.rsc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'mod')

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 0e82785..023407a 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -20,7 +20,6 @@
   :global GetRandom20CharAlNum;
   :global LogPrintExit2;
   :global MkDir;
-  :global RequiredRouterOS;
   :global WaitForFile;
 
   :if ([ :len $Key ] = 0 || [ :len $User ] = 0) do={
@@ -32,7 +31,7 @@
   }
 
   :local KeyVal [ :toarray [ $CharacterReplace $Key " " "," ] ];
-  :if (!(([ $RequiredRouterOS $0 "7.12beta1" ] = true && $KeyVal->0 = "ssh-ed25519") || $KeyVal->0 = "ssh-rsa")) do={
+  :if (!($KeyVal->0 = "ssh-ed25519" || $KeyVal->0 = "ssh-rsa")) do={
     $LogPrintExit2 warning $0 ("SSH key of type '" . $KeyVal->0 . "' is not supported.") true;
   }
 
@@ -63,7 +62,6 @@
   :global EitherOr;
   :global LogPrintExit2;
   :global ParseKeyValueStore;
-  :global RequiredRouterOS;
   :global SSHKeysImport;
 
   :if ([ :len $FileName ] = 0 || [ :len $User ] = 0) do={
@@ -81,7 +79,7 @@
     :local Line [ :pick $Keys 0 [ :find $Keys "\n" ] ];
     :set Keys [ :pick $Keys ([ :find $Keys "\n" ] + 1) [ :len $Keys ] ];
     :local KeyVal [ :toarray [ $CharacterReplace $Key " " "," ] ];
-    :if (([ $RequiredRouterOS $0 "7.12beta1" ] = true && $KeyVal->0 = "ssh-ed25519") || $KeyVal->0 = "ssh-rsa") do={
+    :if ($KeyVal->0 = "ssh-ed25519" || $KeyVal->0 = "ssh-rsa") do={
       $SSHKeysImport $Line $User;
       :set Continue true;
     }
-- 
cgit v1.2.3-70-g09d2