Geremia G / Crypto

Fork of François Berder Crypto, fixed AES CBC and small rework

Dependents:   AES_example shaun_larada Smartage

Fork of Crypto by Francois Berder

Diff: cipher/AES.h

Revision:
15:6093fc19aad6
Parent:
8:a090264e9b2d
--- a/cipher/AES.h	Sun May 11 13:36:45 2014 +0000
+++ b/cipher/AES.h	Wed Jan 28 17:15:32 2015 +0000
@@ -15,14 +15,14 @@
     public :
     
         AES(const AES_TYPE type, uint8_t *key);
-        AES(const AES_TYPE type, uint8_t *key, uint8_t *iv);
-                
+        AES(const AES_TYPE type, uint8_t *key, uint8_t *iv, BLOCK_CIPHER_MODE m=CBC_MODE);
+        void keyExpansion(uint8_t *key);
+               
     private :
     
         virtual void encryptBlock(uint8_t *out, uint8_t *in);
         virtual void decryptBlock(uint8_t *out, uint8_t *in);
         
-        void keyExpansion(uint8_t *key);
         uint32_t rotWord(uint32_t w);
         uint32_t invRotWord(uint32_t w);        
         uint32_t subWord(uint32_t w);