Changeset 1378 for trunk


Ignore:
Timestamp:
May 4, 2010, 1:30:43 PM (12 years ago)
Author:
Paul Lelgemann
Message:

o Fixed solutions and broken plugins, which had missing/broken dependencies
+ Added debug output after connecting about our local peer to CrypP2P
+ Prepared PeerToPeer plugin for later use

Location:
trunk
Files:
4 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypP2P/P2PManager.cs

    r1374 r1378  
    109109        }
    110110
     111        public string UserInfo()
     112        {
     113            string userName;
     114            PeerId userInfo = P2PBase.GetPeerID(out userName);
     115            return userInfo + " (" + userName + ")";
     116        }
     117
    111118        #region DHT operations
    112119        // TODO add error handling, if P2P if not connected
  • trunk/CrypP2P/Worker/ConnectionWorker.cs

    r1374 r1378  
    6666            {
    6767                P2PManager.Instance.GuiLogMessage("Connection to P2P network established.", NotificationLevel.Info);
     68                P2PManager.Instance.GuiLogMessage("P2P user info: " + P2PManager.Instance.UserInfo(), NotificationLevel.Debug);
    6869                newImage.Source = new BitmapImage(new Uri(P2PManager.P2PDisconnectImageURI, UriKind.RelativeOrAbsolute));
    6970            }
  • trunk/CrypPlugins/AES/AES.csproj

    r1368 r1378  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>9.0.21022</ProductVersion>
     6    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{2A81A3B2-ABC0-4850-9C89-3830AD07FD6B}</ProjectGuid>
     
    7676  </PropertyGroup>
    7777  <ItemGroup>
    78     <Reference Include="NativeCryptography, Version=1.0.3758.15482, Culture=neutral, processorArchitecture=x86">
    79       <SpecificVersion>False</SpecificVersion>
    80       <HintPath>..\..\Debug\NativeCryptography.dll</HintPath>
    81     </Reference>
    8278    <Reference Include="PresentationCore">
    8379      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     
    114110      <Project>{25DB2B47-A457-4EC2-960B-395CE07AE093}</Project>
    115111      <Name>CrypPluginBase</Name>
     112    </ProjectReference>
     113    <ProjectReference Include="..\NativeCryptography\NativeCryptography.vcproj">
     114      <Project>{97B06ADB-43E4-4320-9AD8-D167421F0644}</Project>
     115      <Name>NativeCryptography</Name>
    116116    </ProjectReference>
    117117  </ItemGroup>
  • trunk/CrypPlugins/CostFunction/CostFunction.csproj

    r1368 r1378  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>9.0.21022</ProductVersion>
     6    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{3C72FF93-48C2-4929-B3B2-83F165AAE636}</ProjectGuid>
     
    7272  </PropertyGroup>
    7373  <ItemGroup>
    74     <Reference Include="NativeCryptography, Version=1.0.3758.15482, Culture=neutral, processorArchitecture=x86">
    75       <SpecificVersion>False</SpecificVersion>
    76       <HintPath>..\..\Debug\NativeCryptography.dll</HintPath>
    77     </Reference>
    7874    <Reference Include="PresentationCore">
    7975      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     
    107103      <Project>{25DB2B47-A457-4EC2-960B-395CE07AE093}</Project>
    108104      <Name>CrypPluginBase</Name>
     105    </ProjectReference>
     106    <ProjectReference Include="..\NativeCryptography\NativeCryptography.vcproj">
     107      <Project>{97B06ADB-43E4-4320-9AD8-D167421F0644}</Project>
     108      <Name>NativeCryptography</Name>
    109109    </ProjectReference>
    110110  </ItemGroup>
  • trunk/CrypPlugins/DES/DES.csproj

    r1368 r1378  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>9.0.21022</ProductVersion>
     6    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{E3D15A1E-65D0-457A-9894-7F4E36369163}</ProjectGuid>
     
    7676  </PropertyGroup>
    7777  <ItemGroup>
    78     <Reference Include="NativeCryptography, Version=1.0.3758.15482, Culture=neutral, processorArchitecture=x86">
    79       <SpecificVersion>False</SpecificVersion>
    80       <HintPath>..\..\Debug\NativeCryptography.dll</HintPath>
    81     </Reference>
    8278    <Reference Include="PresentationCore">
    8379      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     
    129125      <Name>CubeAttackController</Name>
    130126    </ProjectReference>
     127    <ProjectReference Include="..\NativeCryptography\NativeCryptography.vcproj">
     128      <Project>{97B06ADB-43E4-4320-9AD8-D167421F0644}</Project>
     129      <Name>NativeCryptography</Name>
     130    </ProjectReference>
    131131  </ItemGroup>
    132132  <ItemGroup>
  • trunk/CrypPlugins/NativeCryptography

    • Property svn:ignore set to
      Debug
  • trunk/CrypTool 2.0.sln

    r1314 r1378  
    9090Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKCS5", "CrypPlugins\PKCS5\PKCS5.csproj", "{80200C92-77FC-4508-B520-D51530BE2608}"
    9191EndProject
    92 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B2A0D8D8-D323-47A2-9C45-78EADE3A2297}"
    93         ProjectSection(SolutionItems) = preProject
    94                 CrypTool 2.0.vsmdi = CrypTool 2.0.vsmdi
    95         EndProjectSection
    96 EndProject
    9792Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTestMethods", "DevTestMethods\DevTestMethods.csproj", "{F4CCBE43-F19E-49A1-982E-B66919F5D701}"
    9893EndProject
     
    216211EndProject
    217212Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MD5Collider", "CrypPlugins\MD5Collider\MD5Collider.csproj", "{F5DDFE63-0904-4523-AA30-11FF5E91C362}"
     213EndProject
     214Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeerToPeer", "CrypPlugins\PeerToPeer\PeerToPeer.csproj", "{12829116-8FAD-4D09-A0AA-D75D88F07626}"
     215EndProject
     216Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypP2P", "CrypP2P\CrypP2P.csproj", "{7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}"
    218217EndProject
    219218Global
     
    22422241                {F5DDFE63-0904-4523-AA30-11FF5E91C362}.Release|x86.ActiveCfg = Release|x86
    22432242                {F5DDFE63-0904-4523-AA30-11FF5E91C362}.Release|x86.Build.0 = Release|x86
     2243                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|.NET.ActiveCfg = Debug|Any CPU
     2244                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2245                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2246                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     2247                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     2248                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|Win32.ActiveCfg = Debug|Any CPU
     2249                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|x64.ActiveCfg = Debug|Any CPU
     2250                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Debug|x86.ActiveCfg = Debug|Any CPU
     2251                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|.NET.ActiveCfg = Release|Any CPU
     2252                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2253                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|Any CPU.Build.0 = Release|Any CPU
     2254                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     2255                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     2256                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|Win32.ActiveCfg = Release|Any CPU
     2257                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|x64.ActiveCfg = Release|Any CPU
     2258                {12829116-8FAD-4D09-A0AA-D75D88F07626}.Release|x86.ActiveCfg = Release|Any CPU
     2259                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|.NET.ActiveCfg = Debug|Any CPU
     2260                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2261                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2262                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     2263                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     2264                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|Win32.ActiveCfg = Debug|Any CPU
     2265                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|x64.ActiveCfg = Debug|Any CPU
     2266                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Debug|x86.ActiveCfg = Debug|Any CPU
     2267                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|.NET.ActiveCfg = Release|Any CPU
     2268                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2269                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|Any CPU.Build.0 = Release|Any CPU
     2270                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     2271                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     2272                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|Win32.ActiveCfg = Release|Any CPU
     2273                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|x64.ActiveCfg = Release|Any CPU
     2274                {7D3E4C88-7EA8-45EA-AC1E-FC8ED8EDDB7A}.Release|x86.ActiveCfg = Release|Any CPU
    22442275        EndGlobalSection
    22452276        GlobalSection(SolutionProperties) = preSolution
     
    22572288                {B52F4D1D-1AB4-4E9B-B056-BE006A732BBD} = {775BB529-52BD-4B18-A092-E4EA70E53838}
    22582289                {98ABFA8B-D05C-4C28-A0A0-B40733A9B029} = {775BB529-52BD-4B18-A092-E4EA70E53838}
     2290                {12829116-8FAD-4D09-A0AA-D75D88F07626} = {775BB529-52BD-4B18-A092-E4EA70E53838}
    22592291        EndGlobalSection
    22602292EndGlobal
Note: See TracChangeset for help on using the changeset viewer.