Changeset 870 for trunk/CrypPlugins/MD5


Ignore:
Timestamp:
Nov 19, 2009, 11:12:10 AM (12 years ago)
Author:
pretzsch
Message:

+ MD5 plugin: Refactoring and Documentation

Location:
trunk/CrypPlugins/MD5
Files:
5 added
4 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/MD5/MD5.cs

    r863 r870  
    3333using System.Runtime.Remoting.Contexts;
    3434using Cryptool.MD5.Presentation;
     35using Cryptool.MD5.Algorithm;
    3536
    3637namespace Cryptool.MD5
     
    4748        private byte[] outputData;
    4849        private List<CryptoolStream> listCryptoolStreamsOut = new List<CryptoolStream>();
    49         private PresentableMd5 md5;
     50        private PresentableMD5 md5;
    5051        private PresentationContainer presentationContainer;
    5152
     
    5657        {
    5758            settings = new MD5Settings();
    58             md5 = new PresentableMd5();
     59            md5 = new PresentableMD5();
    5960            presentationContainer = new PresentationContainer(md5);
    6061
  • trunk/CrypPlugins/MD5/MD5.csproj

    r864 r870  
    6262  </ItemGroup>
    6363  <ItemGroup>
    64     <Compile Include="Md5State.cs" />
     64    <Compile Include="Algorithm\MD5StateDescription.cs" />
    6565    <Compile Include="MD5.cs" />
    6666    <Compile Include="MD5Settings.cs" />
    67     <Compile Include="PresentableMd5.cs" />
    68     <Compile Include="PresentableMd5State.cs" />
    69     <Compile Include="Presentation\Converters\ByteArrayToHexStringConverter.cs" />
     67    <Compile Include="Algorithm\PresentableMD5.cs" />
     68    <Compile Include="Algorithm\PresentableMD5State.cs" />
     69    <Compile Include="Presentation\Converters\BytesToStringConverter.cs" />
    7070    <Compile Include="Presentation\PresentationContainer.xaml.cs">
    7171      <DependentUpon>PresentationContainer.xaml</DependentUpon>
  • trunk/CrypPlugins/MD5/Presentation/PresentationContainer.xaml

    r864 r870  
    22    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    33    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    4              xmlns:conv="clr-namespace:Cryptool.MD5.Presentation.Converters">
     4             xmlns:convert="clr-namespace:Cryptool.MD5.Presentation.Converters">
    55    <UserControl.Resources>
    6         <conv:ByteArrayToHexStringConverter x:Key="hexConverter"/>
     6        <convert:BytesToStringConverter x:Key="bytesToStringConverter"/>
    77    </UserControl.Resources>
    88    <Grid>
     
    1313        <Rectangle Height="60" Margin="12,46,12,0" Name="rectangle1" Stroke="Black" VerticalAlignment="Top" />
    1414        <Label Height="28" Margin="12,46,12,0" Name="label1" VerticalAlignment="Top">Data</Label>
    15         <Label Height="28" Margin="12,80,12,0" Name="label2" VerticalAlignment="Top" Content="{Binding CurrentState.Data, Converter={StaticResource hexConverter}}"/>
     15        <Label Height="28" Margin="12,80,12,0" Name="label2" VerticalAlignment="Top" Content="{Binding CurrentState.Data, Converter={StaticResource bytesToStringConverter}}"/>
    1616        <Label Height="28" HorizontalAlignment="Left" Margin="12,114,0,0" Name="label3" VerticalAlignment="Top" Width="120">A</Label>
    1717        <Label Height="28" HorizontalAlignment="Left" Margin="138,114,0,0" Name="label4" VerticalAlignment="Top" Width="120">B</Label>
     
    3737        <Button Height="23" HorizontalAlignment="Right" Margin="0,0,12,12" Name="endOfCompressionButton" VerticalAlignment="Bottom" Width="191" Click="endOfCompressionButton_Click">End of block compression &gt;&gt;&gt;&gt;</Button>
    3838        <Label Height="28" HorizontalAlignment="Left" Margin="15,0,0,70" Name="label23" VerticalAlignment="Bottom" Width="120">H-Bytes:</Label>
    39         <Label Height="28" Margin="141,0,12,70" Name="label24" VerticalAlignment="Bottom" Content="{Binding HashValueBytes, Converter={StaticResource hexConverter}}"/>
     39        <Label Height="28" Margin="141,0,12,70" Name="label24" VerticalAlignment="Bottom" Content="{Binding HashValueBytes, Converter={StaticResource bytesToStringConverter}}"/>
    4040    </Grid>
    4141</UserControl>
  • trunk/CrypPlugins/MD5/Presentation/PresentationContainer.xaml.cs

    r863 r870  
    1212using System.Windows.Navigation;
    1313using System.Windows.Shapes;
     14using Cryptool.MD5.Algorithm;
    1415
    1516namespace Cryptool.MD5.Presentation
     
    2021    public partial class PresentationContainer : UserControl
    2122    {
    22         private PresentableMd5 md5;
     23        private PresentableMD5 md5;
    2324
    24         public PresentationContainer(PresentableMd5 presentableMd5)
     25        public PresentationContainer(PresentableMD5 presentableMd5)
    2526        {
    2627            md5 = presentableMd5;
Note: See TracChangeset for help on using the changeset viewer.