/ - Diff - Pithos MS Client - Greek Research and Technology Network's projects

     using System.Linq;
     using System.Net;
     using System.Reflection;
     using System.Security.Cryptography;
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
-...
     using Pithos.Client.WPF.Configuration;
     using Pithos.Client.WPF.Properties;
     using Pithos.Interfaces;
     using Pithos.Network;
     using log4net.Appender;
     using log4net.Core;
     using log4net.Repository.Hierarchy;
-...
                 //var instanceMutex=new Mutex()
                 InitializeLogging();
                 RegisterOpenSSL();
                 //Detect OS, if Major Version is 6+ use RestartManager
                 OperatingSystem os = Environment.OSVersion;
-...
                 InitializeComponent();
+            }
             private static void RegisterOpenSSL()
+            {
                 //Try to instantiate OpenSSL and hash an empty array
                 try
+                {
                     using(var testHasher=new SHA256OpenSSL())
+                    {
                         testHasher.ComputeHash(new byte[0]);
+                    }
                     CryptoConfig.AddAlgorithm(typeof(SHA256OpenSSL), "SHA256");
                     Log.InfoFormat("Registered OpenSSL hash provider");
+                }
                 catch (Exception exc)
+                {
                     Log.WarnFormat("OpenSSL instantiation failed. Falling back to CNG provider.\r\n[{0}]",exc);
+                }
                 //Running on Vista + ?
                 if (Environment.OSVersion.Version.Major >= 6)
+                {
                     CryptoConfig.AddAlgorithm(typeof(SHA256Cng), "SHA256");
                     Log.InfoFormat("Registered CNG hash provider");
+                }
                 else
+                {
                     Log.WarnFormat("Running on XP. Falling back to default hash algorithm.");
+                }
+            }
     /*        private static string[] platformLibraries = {"libeay32.dll","ssleay32.dll"};
             private static Assembly CustomResolve(object sender,ResolveEventArgs args)

             [global::System.Configuration.ApplicationScopedSettingAttribute()]
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
     <ArrayOfServerSettings xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
       <ServerSettings>
     <ServerName>Pithos Production</ServerName>
         <ServerUri>https://pithos.okeanos.grnet.gr</ServerUri>
         <LoginUri>https://pithos.okeanos.grnet.gr/login</LoginUri>
         <LogoutUri>https://accounts.okeanos.grnet.gr/im/logout</LogoutUri>
       </ServerSettings>
       <ServerSettings>
     <ServerName>Pithos Development</ServerName>
         <ServerUri>https://pithos.dev.grnet.gr</ServerUri>
         <LoginUri>https://pithos.dev.grnet.gr/login</LoginUri>
         <LogoutUri>https://pithos.dev.grnet.gr/im/logout</LogoutUri>
       </ServerSettings>
     </ArrayOfServerSettings>")]
             [global::System.Configuration.DefaultSettingValueAttribute(@"
               <ArrayOfServerSettings xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
                 <ServerSettings>
                   <ServerName>Pithos Production</ServerName>
                   <ServerUri>https://pithos.okeanos.grnet.gr</ServerUri>
                   <LoginUri>https://pithos.okeanos.grnet.gr/login</LoginUri>
                   <LogoutUri>https://accounts.okeanos.grnet.gr/im/logout</LogoutUri>
                 </ServerSettings>
                 <ServerSettings>
                   <ServerName>Pithos Development</ServerName>
                   <ServerUri>https://pithos.dev.grnet.gr</ServerUri>
                   <LoginUri>https://pithos.dev.grnet.gr/login</LoginUri>
                   <LogoutUri>https://pithos.dev.grnet.gr/im/logout</LogoutUri>
                 </ServerSettings>
               </ArrayOfServerSettings>
             ")]
             public global::Pithos.Interfaces.ServersCollection Servers {
                 get {
                     return ((global::Pithos.Interfaces.ServersCollection)(this["Servers"]));

           <Value Profile="(Default)">False</Value>
         </Setting>
         <Setting Name="Servers" Type="Pithos.Interfaces.ServersCollection" Scope="Application">
           <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
     &lt;ArrayOfServerSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
       &lt;ServerSettings&gt;
     &lt;ServerName&gt;Pithos Production&lt;/ServerName&gt;
         &lt;ServerUri&gt;https://pithos.okeanos.grnet.gr&lt;/ServerUri&gt;
         &lt;LoginUri&gt;https://pithos.okeanos.grnet.gr/login&lt;/LoginUri&gt;
         &lt;LogoutUri&gt;https://accounts.okeanos.grnet.gr/im/logout&lt;/LogoutUri&gt;
       &lt;/ServerSettings&gt;
       &lt;ServerSettings&gt;
     &lt;ServerName&gt;Pithos Development&lt;/ServerName&gt;
         &lt;ServerUri&gt;https://pithos.dev.grnet.gr&lt;/ServerUri&gt;
         &lt;LoginUri&gt;https://pithos.dev.grnet.gr/login&lt;/LoginUri&gt;
         &lt;LogoutUri&gt;https://pithos.dev.grnet.gr/im/logout&lt;/LogoutUri&gt;
       &lt;/ServerSettings&gt;
     &lt;/ArrayOfServerSettings&gt;</Value>
           <Value Profile="(Default)">
               &lt;ArrayOfServerSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
                 &lt;ServerSettings&gt;
                   &lt;ServerName&gt;Pithos Production&lt;/ServerName&gt;
                   &lt;ServerUri&gt;https://pithos.okeanos.grnet.gr&lt;/ServerUri&gt;
                   &lt;LoginUri&gt;https://pithos.okeanos.grnet.gr/login&lt;/LoginUri&gt;
                   &lt;LogoutUri&gt;https://accounts.okeanos.grnet.gr/im/logout&lt;/LogoutUri&gt;
                 &lt;/ServerSettings&gt;
                 &lt;ServerSettings&gt;
                   &lt;ServerName&gt;Pithos Development&lt;/ServerName&gt;
                   &lt;ServerUri&gt;https://pithos.dev.grnet.gr&lt;/ServerUri&gt;
                   &lt;LoginUri&gt;https://pithos.dev.grnet.gr/login&lt;/LoginUri&gt;
                   &lt;LogoutUri&gt;https://pithos.dev.grnet.gr/im/logout&lt;/LogoutUri&gt;
                 &lt;/ServerSettings&gt;
               &lt;/ArrayOfServerSettings&gt;
             </Value>
         </Setting>
       </Settings>
     </SettingsFile>

           </setting>
           <setting name="Servers" serializeAs="Xml">
             <value>
               <ArrayOfServerSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsd="http://www.w3.org/2001/XMLSchema">
               <ArrayOfServerSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
                 <ServerSettings>
                   <ServerName>Pithos Production</ServerName>
                   <ServerUri>https://pithos.okeanos.grnet.gr</ServerUri>
-...
           </filter>
         </appender>
         <appender name="DumpFileAppender" type="log4net.Appender.RollingFileAppender">
           <file type="log4net.Util.PatternString"  value="%env{LOCALAPPDATA}\GRNET\PITHOS\errorlog.xml" />
           <file type="log4net.Util.PatternString" value="%env{LOCALAPPDATA}\GRNET\PITHOS\errorlog.xml" />
           <appendToFile value="false" />
           <rollingStyle value="Size" />
           <maxSizeRollBackups value="10" />
-...
           <layout type="log4net.Layout.XMLLayout" />
         </appender>
         <appender name="DebugFileAppender" type="log4net.Appender.RollingFileAppender">
           <file type="log4net.Util.PatternString"  value="%env{LOCALAPPDATA}\GRNET\PITHOS\debuglog.xml" />
           <file type="log4net.Util.PatternString" value="%env{LOCALAPPDATA}\GRNET\PITHOS\debuglog.xml" />
           <appendToFile value="true" />
           <rollingStyle value="Size" />
           <maxSizeRollBackups value="10" />
-...
           <layout type="log4net.Layout.XMLLayout" />
         </appender>
         <appender name="NetworkFileAppender" type="log4net.Appender.RollingFileAppender">
           <file type="log4net.Util.PatternString"  value="%env{LOCALAPPDATA}\GRNET\PITHOS\network.log" />
           <file type="log4net.Util.PatternString" value="%env{LOCALAPPDATA}\GRNET\PITHOS\network.log" />
           <appendToFile value="true" />
           <rollingStyle value="Size" />
           <maxSizeRollBackups value="10" />

b/trunk/Pithos.Core/Agents/BlockUpdater.cs
238	238	}
239	239	catch (IOException)
240	240	{
241		if (i>=3)
	241	if (i>=2)
242	242	throw;
243		Thread.Sleep(100);
	243	Thread.Sleep((i+1)*300);
244	244	}
245	245	}
246	246	}

     using System.Diagnostics.Contracts;
     using System.IO;
     using System.Reflection;
     using System.Security.Cryptography;
     using System.ServiceModel.Channels;
     using System.Threading;
     using System.Threading.Tasks;
     using System.Threading.Tasks.Dataflow;
     using OpenSSL.Crypto;
     namespace Pithos.Network
+    {
-...
                 if (size == 0)
+                {
                     var buf = new byte[0];
                     using (var hasher = new MessageDigestContext(MessageDigest.CreateByName(algorithm)))
+                    {
                         hasher.Init();
                         hashes[0] = hasher.Digest(buf);
                     using (var hasher = HashAlgorithm.Create(algorithm))
+                    {
                         hashes[0] = hasher.ComputeHash(buf);
                         return hashes;
+                    }
+                }
-...
                 var actualHashers = parallelism > blocks ? (byte)blocks : parallelism;
                 var buffer = new byte[actualHashers][];
                 var hashers = new MessageDigestContext[actualHashers];
                 var hashers = new HashAlgorithm[actualHashers];
                 var bufferManager = GetBufferManager(blockSize, actualHashers);
                 for (var i = 0; i < actualHashers; i++)
+                {
                     buffer[i] = bufferManager.TakeBuffer(blockSize);// new byte[blockSize];
                     hashers[i] = new MessageDigestContext(MessageDigest.CreateByName(algorithm));
                     hashers[i].Init();
                     hashers[i] = HashAlgorithm.Create(algorithm);
+                }
                 try
+                {
-...
                                                                 var hasher = hashers[idx];
                                                                 byte[] hash;
                                                                 byte[] hash=hasher.ComputeHash(buffer[idx],0,lastByteIndex+1);
     /*
                                                                 if (buffer[idx].Length == lastByteIndex || lastByteIndex==-1)
                                                                     hash = hasher.Digest(buffer[idx]);
                                                                 else
-...
                                                                     Buffer.BlockCopy(buffer[idx],0,buf,0,lastByteIndex+1);
                                                                     hash = hasher.Digest(buf);
+                                                                }
     */

+                }
+            }
+        }
         public class SHA256OpenSSL : SHA256
+        {
             private MessageDigestContext _context;
             public SHA256OpenSSL()
+            {
                 _context = new MessageDigestContext(MessageDigest.CreateByName("SHA256"));
                 _context.Init();
+            }
             public override void Initialize()
+            {
                 _context.Init();
+            }
             protected override void HashCore(byte[] array, int ibStart, int cbSize)
+            {
                 if (array.Length == cbSize)
                     _context.Update(array);
                 else
+                {
                     var block = new byte[cbSize];
                     Buffer.BlockCopy(array, ibStart, block, 0, cbSize);
                     _context.Update(block);
+                }
+            }
             protected override byte[] HashFinal()
+            {
                 return _context.DigestFinal();
+            }
             protected override void Dispose(bool disposing)
+            {
                 base.Dispose(disposing);
                 if (disposing)
+                {
                     if (_context != null)
                         _context.Dispose();
                     _context = null;
+                }
+            }
+        }
+    }

Synnefo » Pithos MS Client

Revision 0e1acc13