fw-addr-lists: calculate branch after post-processing

This should reduce the number of addresses in list, and also fix
addresses with host part set (like 2001:470:1:fb5::2a0/64, which should
be 2001:470:1:fb5::/64 really).

fw-addr-lists.rsc

@@ -127,7 +127,7 @@
             :local Slash [ :find $Address "/" ];
             :if ([ :typeof $Slash ] = "num") do={
               :set Net [ :toip6 [ :pick $Address 0 $Slash ] ]
-              :set Cidr [ $MIN [ :pick $Address ($Slash + 1) [ :len $Address ] ] 64 ];
+              :set Cidr [ $MIN [ :pick $Address $Slash [ :len $Address ] ] 64 ];
             }
             :set Address (([ :toip6 $Net ] & ffff:ffff:ffff:ffff::) . "/" . $Cidr);
             :set Branch [ $GetBranch $Address ];

mod/ssh-keys-import.rsc

@@ -40,9 +40,8 @@
 
   :local FingerPrintMD5 [ :convert from=base64 transform=md5 to=hex ($KeyVal->1) ];
 
-  :local RegEx ("\\bmd5=" . $FingerPrintMD5 . "\\b");
   :if ([ :len [ /user/ssh-keys/find where user=$User \
-       (key-owner~$RegEx or info~$RegEx) ] ] > 0) do={
+       (key-owner~("\\bmd5=" . $FingerPrintMD5 . "\\b") or info~("\\bmd5=" . $FingerPrintMD5 . "\\b")) ] ] > 0) do={
     $LogPrint warning $0 ("The ssh public key (MD5:" . $FingerPrintMD5 . \
       ") is already available for user '" . $User . "'.");
     :return false;