Ignore:
Timestamp:
Aug 18, 2009, 5:58:59 PM (12 years ago)
Author:
Matthäus Wander
Message:

Enigma:

  • added plugin into cryptanalysis group
  • changed algorithm setting order (though it does not seem to have worked)
  • updated samples
Location:
trunk/CrypPlugins/Enigma
Files:
2 edited

Legend:

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

    r423 r440  
    217217//Cryptool 2.0 specific includes
    218218using Cryptool.PluginBase;
     219using Cryptool.PluginBase.Analysis;
    219220using Cryptool.PluginBase.Cryptography;
    220221using Cryptool.PluginBase.Miscellaneous;
     
    232233      "Enigma/Images/Enigma.png", "Enigma/Images/encrypt.png", "Enigma/Images/decrypt.png")]
    233234    [EncryptionType(EncryptionType.Classic)]
    234     public class Enigma: IEncryption
     235    public class Enigma: IEncryption, ISpecific
    235236    {
    236237        #region Constants
  • trunk/CrypPlugins/Enigma/EnigmaSettings.cs

    r423 r440  
    250250        private bool analysisUseRotorVIII = true;
    251251
     252        private int keySearchMethod = 0;
    252253        private int maxSearchedPlugs = 10;
    253         private int keySearchMethod = 0;
    254254        private int plugSearchMethod = 2;
    255255
     
    747747        }
    748748
     749        [TaskPane("Rotor/Ring/Key search method", "Which method should be used to assess the best rotor configuration?", "Analysis options", 8, false, DisplayLevel.Beginner, ControlType.ComboBox, new string[] { "Index of coincidence", "log2-bigram", "log2-trigram", "Sinkov unigram", "Sinkov bigram", "Unigram entropy" })]
     750        public int KeySearchMethod
     751        {
     752            get { return this.keySearchMethod; }
     753            set
     754            {
     755                if (value != keySearchMethod)
     756                {
     757                    hasChanges = true;
     758                    keySearchMethod = value;
     759                    OnPropertyChanged("KeySearchMethod");
     760                }
     761            }
     762        }
     763
    749764        [TaskPane("Analyze plugs", "If checked, the analysis tries to detect the correct plug settings. If unchecked, the values from the plugboard are used.",
    750765            "Analysis options", 9, false, DisplayLevel.Beginner, ControlType.CheckBox, "", null)]
     
    779794        }
    780795
    781         public static string[] GetConstArray()
    782         {
    783             return new string[] { "foo", "bar" };
    784         }
    785 
    786         [TaskPane("Rotor/Ring/Key search method", "Which method should be used to assess the best rotor configuration?", "Analysis options", 9, false, DisplayLevel.Experienced, ControlType.ComboBox, new string[] { "Index of coincidence", "log2-bigram", "log2-trigram", "Sinkov unigram", "Sinkov bigram", "Unigram entropy" })]
    787         public int KeySearchMethod
    788         {
    789             get { return this.keySearchMethod; }
    790             set
    791             {
    792                 if (value != keySearchMethod)
    793                 {
    794                     hasChanges = true;
    795                     keySearchMethod = value;
    796                     OnPropertyChanged("KeySearchMethod");
    797                 }
    798             }
    799         }
    800 
    801         [TaskPane("Plug search method", "Which method should be used to assess the best plugboard configuration?", "Analysis options", 9, false, DisplayLevel.Experienced, ControlType.ComboBox, new string[] { "Index of coincidence", "log2-bigram", "log2-trigram", "Sinkov unigram", "Sinkov bigram", "Unigram entropy" })]
     796        [TaskPane("Plug search method", "Which method should be used to assess the best plugboard configuration?", "Analysis options", 9, false, DisplayLevel.Beginner, ControlType.ComboBox, new string[] { "Index of coincidence", "log2-bigram", "log2-trigram", "Sinkov unigram", "Sinkov bigram", "Unigram entropy" })]
    802797        public int PlugSearchMethod
    803798        {
Note: See TracChangeset for help on using the changeset viewer.