Merge branch 'master' into ubitworkmaster

1 files changed, 14 insertions, 1 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 667a562..a5d8292 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8542,6 +8542,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_String llXorBase64Strings(string str1, string str2)
         {
+            int padding = 0;
+
             string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
             ScriptSleep(300);
@@ -8585,6 +8587,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // than the decoded length of s1, simply perform a normal
             // decode and XOR
             //
+            /*
             if (data2.Length >= data1.Length)
             {
                 for (int pos = 0 ; pos < data1.Length ; pos++ )
@@ -8592,10 +8595,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 return Convert.ToBase64String(data1);
             }
+            */
 
             // Remove padding
             while (str1.EndsWith("="))
+            {
                 str1 = str1.Substring(0, str1.Length - 1);
+                padding++;
+            }
             while (str2.EndsWith("="))
                 str2 = str2.Substring(0, str2.Length - 1);
             
@@ -8623,7 +8630,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             for (int pos = 0 ; pos < d1.Length ; pos++)
                 output += b64[d1[pos] ^ d2[pos % d2.Length]];
 
-            while (output.Length % 3 > 0)
+            // Here's a funny thing: LL blithely violate the base64
+            // standard pretty much everywhere. Here, padding is
+            // added only if the first input string had it, rather
+            // than when the data actually needs it. This can result
+            // in invalid base64 being returned. Go figure.
+
+            while (padding-- > 0)
                 output += "=";
 
             return output;