Changeset 2334 for trunk/CrypPlugins/AES


Ignore:
Timestamp:
Jan 14, 2011, 12:03:33 AM (11 years ago)
Author:
Matthäus Wander
Message:

removed 1006 occurences of DisplayLevel in 218 files (see #122)

Location:
trunk/CrypPlugins/AES
Files:
2 edited

Legend:

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

    r2061 r2334  
    6868        }
    6969
    70         [PropertyInfo(Direction.InputData, "Input", "Data to be encrypted or decrypted", "", true, false, DisplayLevel.Beginner, QuickWatchFormat.Hex, null)]
     70        [PropertyInfo(Direction.InputData, "Input", "Data to be encrypted or decrypted", "", true, false, QuickWatchFormat.Hex, null)]
    7171        public CryptoolStream InputStream
    7272        {
     
    9090        }
    9191
    92         [PropertyInfo(Direction.InputData, "Key", "The provided key should be 16, 24 or 32 bytes, dependig on the settings. Too short/long keys will be extended/truncated!", "", true, false, DisplayLevel.Beginner, QuickWatchFormat.Hex, null)]
     92        [PropertyInfo(Direction.InputData, "Key", "The provided key should be 16, 24 or 32 bytes, dependig on the settings. Too short/long keys will be extended/truncated!", "", true, false, QuickWatchFormat.Hex, null)]
    9393        public byte[] InputKey
    9494        {
     
    101101        }
    102102
    103         [PropertyInfo(Direction.InputData, "IV", "The initialisation vector (IV) which is used in chaining modes. It always must be the same as the blocksize.", "", false, false, DisplayLevel.Professional, QuickWatchFormat.Hex, null)]
     103        [PropertyInfo(Direction.InputData, "IV", "The initialisation vector (IV) which is used in chaining modes. It always must be the same as the blocksize.", "", false, false, QuickWatchFormat.Hex, null)]
    104104        public byte[] InputIV
    105105        {
     
    112112        }
    113113
    114         [PropertyInfo(Direction.OutputData, "Output stream", "Encrypted or decrypted output data", "", true, false, DisplayLevel.Beginner, QuickWatchFormat.Hex, null)]
     114        [PropertyInfo(Direction.OutputData, "Output stream", "Encrypted or decrypted output data", "", true, false, QuickWatchFormat.Hex, null)]
    115115        public CryptoolStream OutputStream
    116116        {
     
    477477
    478478        private IControlEncryption controlSlave;
    479         [PropertyInfo(Direction.ControlSlave, "AES Slave", "AES Slave", "", DisplayLevel.Experienced)]
     479        [PropertyInfo(Direction.ControlSlave, "AES Slave", "AES Slave", "")]
    480480        public IControlEncryption ControlSlave
    481481        {
  • trunk/CrypPlugins/AES/AESSettings.cs

    r1259 r2334  
    3737        private int padding = 0; ////0="Zeros"=default, 1="None", 2="PKCS7" , 3="ANSIX923", 4="ISO10126"
    3838
    39         [ContextMenu("Cryptographic algorithm", "Select which symmetric cipher you want to use", 1, DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null, "Advanced Encryption Standard (AES)", "Rijndael")]
    40         [TaskPane("Cryptographic algorithm", "Select which symmetric cipher you want to use", "", 0, false, DisplayLevel.Experienced, ControlType.ComboBox, new string[] { "Advanced Encryption Standard (AES)", "Rijndael" })]
     39        [ContextMenu("Cryptographic algorithm", "Select which symmetric cipher you want to use", 1, ContextMenuControlType.ComboBox, null, "Advanced Encryption Standard (AES)", "Rijndael")]
     40        [TaskPane("Cryptographic algorithm", "Select which symmetric cipher you want to use", "", 0, false, ControlType.ComboBox, new string[] { "Advanced Encryption Standard (AES)", "Rijndael" })]
    4141        public int CryptoAlgorithm
    4242        {
     
    6767        }
    6868
    69         [ContextMenu("Action", "Do you want the input data to be encrypted or decrypted?", 2, DisplayLevel.Beginner, ContextMenuControlType.ComboBox, new int[] { 1, 2 }, "Encrypt", "Decrypt")]
    70         [TaskPane("Action", "Do you want the input data to be encrypted or decrypted?", "", 2, false, DisplayLevel.Beginner, ControlType.ComboBox, new string[] { "Encrypt", "Decrypt" })]
     69        [ContextMenu("Action", "Do you want the input data to be encrypted or decrypted?", 2, ContextMenuControlType.ComboBox, new int[] { 1, 2 }, "Encrypt", "Decrypt")]
     70        [TaskPane("Action", "Do you want the input data to be encrypted or decrypted?", "", 2, false, ControlType.ComboBox, new string[] { "Encrypt", "Decrypt" })]
    7171        public int Action
    7272        {
     
    8181
    8282
    83         [ContextMenu("Keysize", "Select the key size. Note that providing a longer key will result in cutting the overlapping bytes, providing a shorter key will result in filling up with zeroes.", 3, DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null, "128 Bits", "192 Bits", "256 Bits")]
    84         [TaskPane("Keysize", "Select the key size. Note that providing a longer key will result in cutting the overlapping bytes, providing a shorter key will result in filling up with zeroes.", "", 3, false, DisplayLevel.Beginner, ControlType.ComboBox, new String[] { "128 Bits", "192 Bits", "256 Bits" })]
     83        [ContextMenu("Keysize", "Select the key size. Note that providing a longer key will result in cutting the overlapping bytes, providing a shorter key will result in filling up with zeroes.", 3, ContextMenuControlType.ComboBox, null, "128 Bits", "192 Bits", "256 Bits")]
     84        [TaskPane("Keysize", "Select the key size. Note that providing a longer key will result in cutting the overlapping bytes, providing a shorter key will result in filling up with zeroes.", "", 3, false, ControlType.ComboBox, new String[] { "128 Bits", "192 Bits", "256 Bits" })]
    8585        public int Keysize
    8686        {
     
    9595
    9696
    97         [ContextMenu("Blocksize", "Select the block size (applies only to Rijndael)", 4, DisplayLevel.Experienced, ContextMenuControlType.ComboBox, null, "128 Bits", "192 Bits", "256 Bits")]
    98         [TaskPane("Blocksize", "Select the block size (applies only to Rijndael)", "", 4, false, DisplayLevel.Experienced, ControlType.ComboBox, new String[] { "128 Bits", "192 Bits", "256 Bits" })]
     97        [ContextMenu("Blocksize", "Select the block size (applies only to Rijndael)", 4, ContextMenuControlType.ComboBox, null, "128 Bits", "192 Bits", "256 Bits")]
     98        [TaskPane("Blocksize", "Select the block size (applies only to Rijndael)", "", 4, false, ControlType.ComboBox, new String[] { "128 Bits", "192 Bits", "256 Bits" })]
    9999        public int Blocksize
    100100        {
     
    113113        }
    114114
    115         [ContextMenu("Chaining mode", "Select the block cipher mode of operation.", 5, DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null, new String[] { "Electronic Code Book (ECB)", "Cipher Block Chaining (CBC)", "Cipher Feedback (CFB)" })]
    116         [TaskPane("Chaining mode", "Select the block cipher mode of operation.", "", 5, false, DisplayLevel.Experienced, ControlType.ComboBox, new String[] { "Electronic Code Book (ECB)", "Cipher Block Chaining (CBC)", "Cipher Feedback (CFB)" })]
     115        [ContextMenu("Chaining mode", "Select the block cipher mode of operation.", 5, ContextMenuControlType.ComboBox, null, new String[] { "Electronic Code Book (ECB)", "Cipher Block Chaining (CBC)", "Cipher Feedback (CFB)" })]
     116        [TaskPane("Chaining mode", "Select the block cipher mode of operation.", "", 5, false, ControlType.ComboBox, new String[] { "Electronic Code Book (ECB)", "Cipher Block Chaining (CBC)", "Cipher Feedback (CFB)" })]
    117117        public int Mode
    118118        {
     
    126126        }
    127127
    128         [ContextMenu("Padding mode", "Select a mode to fill partial data blocks.", 6, DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null, "Zeros", "None", "PKCS7", "ANSIX923", "ISO10126")]
    129         [TaskPane("Padding mode", "Select a mode to fill partial data blocks.", "", 6, false, DisplayLevel.Experienced, ControlType.ComboBox, new String[] { "Zeros", "None", "PKCS7", "ANSIX923", "ISO10126" })]
     128        [ContextMenu("Padding mode", "Select a mode to fill partial data blocks.", 6, ContextMenuControlType.ComboBox, null, "Zeros", "None", "PKCS7", "ANSIX923", "ISO10126")]
     129        [TaskPane("Padding mode", "Select a mode to fill partial data blocks.", "", 6, false, ControlType.ComboBox, new String[] { "Zeros", "None", "PKCS7", "ANSIX923", "ISO10126" })]
    130130        public int Padding
    131131        {
Note: See TracChangeset for help on using the changeset viewer.